Packman Build Service PMBS

Changes of Revision 45

audacious-plugins.changes Changed

audacious-plugins.spec Changed

@@ -1,269 +1,156 @@
 #
 # spec file for package audacious-plugins
 #
-
-# Please submit bugfixes or comments via http://bugs.links2linux.org/
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
+%define aud_plugin_api %(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\\+' %{_includedir}/audacious/plugin.h 2>/dev/null | sed 's!.*_AUD_PLUGIN_VERSION[ ]\\+\$[0-9]\\+\$.*!\\1!')
+
+%bcond_with faad
+%bcond_with lame
+%bcond_with ffmpeg
+%bcond_with mpg123
+
 Name: audacious-plugins
-Version: 3.3.4
+Version: 3.4.2
 Release: 0
-License: GPL-2.0
-Summary: Plugins for Audacious
-Url: http://audacious-media-player.org/
+Summary: Plugins for the Audacious audio player
+License: GPL-2.0+ and LGPL-2.1+ and GPL-3.0 and MIT and BSD-2-Clause
 Group: Productivity/Multimedia/Sound/Players
-Source0: http://distfiles.atheme.org/%{name}-%{version}.tar.bz2
-BuildRequires: fdupes
-BuildRequires: libcue-devel
-BuildRequires: libfaad-devel
-BuildRequires: libffmpeg-devel
-BuildRequires: libmp3lame-devel
-BuildRequires: libmpcdec-devel
+Url: http://audacious-media-player.org/
+Source0: http://distfiles.audacious-media-player.org/audacious-plugins-%{version}.tar.bz2
+Source1: BSD-2-Clause
+Source2: MIT
+Source3: gpl-2.0.txt
+Source4: gpl-3.0.txt
+Source5: lgpl-2.1.txt
+BuildRequires: gcc-c++
 BuildRequires: lirc-devel
-BuildRequires: update-desktop-files
-BuildRequires: pkgconfig(audacious) = %{version}
-BuildRequires: pkgconfig(bluez)
-BuildRequires: pkgconfig(dbus-glib-1)
-BuildRequires: pkgconfig(esound)
-BuildRequires: pkgconfig(flac)
-BuildRequires: pkgconfig(fluidsynth)
-BuildRequires: pkgconfig(gtk+-3.0)
-BuildRequires: pkgconfig(gtkglext-1.0)
-BuildRequires: pkgconfig(jack)
-BuildRequires: pkgconfig(libbinio)
-BuildRequires: pkgconfig(libbs2b)
-BuildRequires: pkgconfig(libcddb)
-BuildRequires: pkgconfig(libcdio)
-BuildRequires: pkgconfig(libcdio_cdda)
-BuildRequires: pkgconfig(libcurl)
-BuildRequires: pkgconfig(libmms)
+BuildRequires: pkgconfig(alsa) >= 1.0.16
+BuildRequires: pkgconfig(audacious) >= 3.3
+BuildRequires: pkgconfig(cairo) >= 1.6
+BuildRequires: pkgconfig(dbus-glib-1) >= 0.60
+BuildRequires: pkgconfig(flac) >= 1.1.3
+BuildRequires: pkgconfig(fluidsynth) >= 1.0.6
+BuildRequires: pkgconfig(glib-2.0) >= 2.16
+BuildRequires: pkgconfig(gmodule-2.0) >= 2.16
+BuildRequires: pkgconfig(gthread-2.0) >= 2.16
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.0.0
+BuildRequires: pkgconfig(jack) >= 1.9.7
+BuildRequires: pkgconfig(libbinio) >= 1.4
+BuildRequires: pkgconfig(libbs2b) >= 3.0.0
+BuildRequires: pkgconfig(libcddb) >= 1.2.1
+BuildRequires: pkgconfig(libcdio) >= 0.70
+BuildRequires: pkgconfig(libcdio_cdda) >= 0.70
+BuildRequires: pkgconfig(libcue)
+BuildRequires: pkgconfig(libcurl) >= 7.9.7
+BuildRequires: pkgconfig(libmms) >= 0.3
 BuildRequires: pkgconfig(libmodplug)
-BuildRequires: pkgconfig(libmpg123)
-BuildRequires: pkgconfig(libmtp)
-BuildRequires: pkgconfig(libnotify)
-BuildRequires: pkgconfig(libprojectM)
-BuildRequires: pkgconfig(libpulse)
-BuildRequires: pkgconfig(libsidplay2)
-BuildRequires: pkgconfig(libusb)
-BuildRequires: pkgconfig(mad)
-BuildRequires: pkgconfig(neon)
-BuildRequires: pkgconfig(sdl)
-BuildRequires: pkgconfig(shout)
-BuildRequires: pkgconfig(smbclient)
-BuildRequires: pkgconfig(sndfile)
-BuildRequires: pkgconfig(taglib)
-BuildRequires: pkgconfig(wavpack)
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-# transport smb was dropped upstream (openSUSE 12.3)
-Obsoletes: %{name}-transport-smb <= 3.2.4
-
-%description
-Core set of plugins for the Audacious audio player.
-The plugins contained in this package only have minimal dependencies
-on other packages (beyond what is required for Audacious).
-
-%package output-pulse
-Summary: Pulseaudio support plugins for Audacious
-Group: Productivity/Multimedia/Sound/Players
-
-%description output-pulse
-Pulseaudio Sound Daemon output support for Audacious.
-
-%package input-adplug
-Summary: AdPlug input support for Audacious
-Group: Productivity/Multimedia/Sound/Players
-
-%description input-adplug
-AdPlug (AdLib files) support plugins for Audacious.
-
-%package input-sid
-Summary: SID (C64 music) input support for Audacious
-Group: Productivity/Multimedia/Sound/Players
-
-%description input-sid
-SID (C64 music files) support plugins for Audacious.
-
-%package input-fluidsynth
-Summary: Fluidsynth input support for Audacious
-Group: Productivity/Multimedia/Sound/Players
-
-%description input-fluidsynth
-Fluidsynth MIDI support plugins for Audacious.
+BuildRequires: pkgconfig(libnotify) >= 0.7
+BuildRequires: pkgconfig(libpulse) >= 0.9.5
+BuildRequires: pkgconfig(libsidplayfp) >= 1.0
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(neon) >= 0.26
+BuildRequires: pkgconfig(ogg) >= 1.0
+BuildRequires: pkgconfig(pango) >= 1.22
+BuildRequires: pkgconfig(samplerate)
+BuildRequires: pkgconfig(sndfile) >= 0.19
+BuildRequires: pkgconfig(soxr)
+BuildRequires: pkgconfig(vorbis) >= 1.0
+BuildRequires: pkgconfig(vorbisenc) >= 1.0
+BuildRequires: pkgconfig(vorbisfile) >= 1.0
+BuildRequires: pkgconfig(wavpack) >= 4.31
+BuildRequires: pkgconfig(zlib)
+%if %{with faad}
+BuildRequires: libfaad-devel
+%endif
+%if %{with lame}
+BuildRequires: libmp3lame-devel
+%endif
+%if %{with ffmpeg}
+BuildRequires: pkgconfig(libavcodec) >= 53.40.0
+BuildRequires: pkgconfig(libavformat) >= 53.5.0
+BuildRequires: pkgconfig(libavutil) >= 50.42.0
+%endif
+%if %{with mpg123}
+BuildRequires: pkgconfig(libmpg123) >= 1.12
+%endif
+Provides: audacious-plugin(Input)%{?_isa} = %{aud_plugin_api}
+Provides: audacious-plugin(Interface)%{?_isa} = %{aud_plugin_api}
+Provides: audacious-plugin(Output)%{?_isa} = %{aud_plugin_api}
+Supplements: audacious(plugin-api)%{?_isa} = %{aud_plugin_api}
 
-%package transport-mms
-Summary: MMS protocol transport support for Audacious
-Group: Productivity/Multimedia/Sound/Players
+%define __provides_exclude_from ^%{_libdir}/audacious/*/.*.so$
 
-%description transport-mms
-MMS (Microsoft Media Streaming) protocol transport support for Audacious.
+%description
+Plugins for the Audacious audio player.
 
-%package transport-http
-Summary: HTTP and WebDAV protocol transport support for Audacious
+%if %{with faad} || %{with ffmpeg} || %{with mpg123}
+%package extra
+Summary: Plugins for the Audacious audio player
+License: GPL-2.0+ and MIT and BSD-2-Clause
 Group: Productivity/Multimedia/Sound/Players
+Provides: audacious-plugin(Input)%{?_isa} = %{aud_plugin_api}
+Supplements: audacious(plugin-api)%{?_isa} = %{aud_plugin_api}
 
-%description transport-http
-HTTP and WebDAV protocol transport support for Audacious, using the
-neon library.
+%description extra
+Plugins for the Audacious audio player.
+%endif
 
 %prep
 %setup -q
+# Make build verbose
+sed -i '\,^.SILENT:,d' buildsys.mk.in
+cp %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
 %build
-export CFLAGS="%{optflags} -fno-strict-aliasing"
-export CXXFLAGS="$CFLAGS"
-
-sed -i -e "s|_mm_setzero_pd|ssegehtnichtaufathlonxp|g" configure
-
-%configure \
- --disable-rpath \
- --enable-debug \
- --disable-filewriter_vorbis \
- --enable-amidiplug \
- --enable-smb \
- --enable-ipv6 \
- --enable-openal \
-%if 0%{?suse_version} <= 1140
- --disable-gtkui \
-%endif
-%if 0%{?suse_version} <= 1210
- --disable-mpris2 \
-%endif
-%if 0%{?suse_version} <= 1220
- --disable-cdaudio \
-%endif
- --enable-waveout
-
-export SUSE_ASNEEDED=0
+%configure
 make %{?_smp_mflags}
 
 %install
-%makeinstall
+%make_install
 %find_lang %{name}
-%fdupes %{buildroot}
-
-%clean
-rm -rf "%{buildroot}"
 
-%files -f "%{name}.lang"
-%defattr(-,root,root)
-%dir %{_libdir}/audacious
-%dir %{_libdir}/audacious/Container
-%{_libdir}/audacious/Container/asx.so
-%{_libdir}/audacious/Container/audpl.so
-%{_libdir}/audacious/Container/cue.so
-%{_libdir}/audacious/Container/m3u.so
-%{_libdir}/audacious/Container/pls.so
-%{_libdir}/audacious/Container/xspf.so
-%dir %{_libdir}/audacious/Effect
-%{_libdir}/audacious/Effect/compressor.so
-%{_libdir}/audacious/Effect/crossfade.so
-%{_libdir}/audacious/Effect/crystalizer.so
-%{_libdir}/audacious/Effect/bs2b.so
-%{_libdir}/audacious/Effect/echo.so
-%{_libdir}/audacious/Effect/resample.so
-%{_libdir}/audacious/Effect/speed-pitch.so
-%{_libdir}/audacious/Effect/stereo.so
-%{_libdir}/audacious/Effect/voice_removal.so
-%{_libdir}/audacious/Effect/ladspa.so
-%{_libdir}/audacious/Effect/mixer.so
-%dir %{_libdir}/audacious/General
-%{_libdir}/audacious/General/alarm.so
-%{_libdir}/audacious/General/albumart.so
-%{_libdir}/audacious/General/aosd.so
-%if 0%{?suse_version} >= 1230 
-# disabled cdaudio-ng
-%{_libdir}/audacious/General/cd-menu-items.so
-%endif
-%{_libdir}/audacious/General/gnomeshortcuts.so
-%if 0%{?suse_version} > 1140
-%{_libdir}/audacious/General/gtkui.so
+%files -f %{name}.lang
+%defattr(0644,root,root,0755)
+%doc BSD-2-Clause MIT gpl-2.0.txt gpl-3.0.txt lgpl-2.1.txt
+%{_libdir}/audacious/
+%if %{with faad}
+%exclude %{_libdir}/audacious/Input/aac.so
 %endif
-%{_libdir}/audacious/General/hotkey.so
-%{_libdir}/audacious/General/lirc.so
-%{_libdir}/audacious/General/lyricwiki.so
-%if 0%{?suse_version} > 1210
-# only with glib2 >= 2.30
-%{_libdir}/audacious/General/mpris2.so
+%if %{with ffmpeg}
+%exclude %{_libdir}/audacious/Input/ffaudio.so
 %endif
-%if 0%{?suse_version} > 1140
-%{_libdir}/audacious/General/notify.so
+%if %{with mpg123}
+%exclude %{_libdir}/audacious/Input/madplug.so
 %endif
-%{_libdir}/audacious/General/scrobbler.so
-%{_libdir}/audacious/General/search-tool.so
-%{_libdir}/audacious/General/song_change.so
-%{_libdir}/audacious/General/statusicon.so
-%{_libdir}/audacious/General/skins.so
+%{_datadir}/audacious/
+
+%if %{with faad} || %{with ffmpeg} || %{with mpg123}
+%files extra
+%defattr(0644,root,root,0755)
+%doc gpl-2.0.txt BSD-2-Clause MIT
+%if %{with faad}
 %{_libdir}/audacious/Input/aac.so
-%{_libdir}/audacious/Input/amidi-plug.so
-%dir %{_libdir}/audacious/Input/amidi-plug
-%{_libdir}/audacious/Input/amidi-plug/ap-alsa.so
-%if 0%{?suse_version} >= 1230 
-# disabled cdaudio-ng
-%{_libdir}/audacious/Input/cdaudio-ng.so
 %endif
-%{_libdir}/audacious/Input/console.so
+%if %{with ffmpeg}
 %{_libdir}/audacious/Input/ffaudio.so
-%{_libdir}/audacious/Input/flacng.so
+%endif
+%if %{with mpg123}
 %{_libdir}/audacious/Input/madplug.so
-%{_libdir}/audacious/Input/metronom.so
-%{_libdir}/audacious/Input/modplug.so
-%{_libdir}/audacious/Input/sndfile.so
-%{_libdir}/audacious/Input/tonegen.so
-%{_libdir}/audacious/Input/vorbis.so
-%{_libdir}/audacious/Input/vtx.so
-%{_libdir}/audacious/Input/wavpack.so
-%{_libdir}/audacious/Input/psf2.so
-%{_libdir}/audacious/Input/xsf.so
-%dir %{_libdir}/audacious/Output
-%{_libdir}/audacious/Output/alsa.so
-%{_libdir}/audacious/Output/filewriter.so
-%{_libdir}/audacious/Output/sdlout.so
-%if 0%{?suse_version} >= 1210
-%{_libdir}/audacious/Output/jackout.so
 %endif
-%dir %{_libdir}/audacious/Transport
-%{_libdir}/audacious/Transport/gio.so
-%{_libdir}/audacious/Transport/unix-io.so
-%dir %{_libdir}/audacious/Visualization
-%{_libdir}/audacious/Visualization/cairo-spectrum.so
-%{_libdir}/audacious/Visualization/blur_scope.so
-%dir %{_datadir}/audacious/
-%dir %{_datadir}/audacious/Skins
-%{_datadir}/audacious/Skins/Classic/
-%{_datadir}/audacious/Skins/Classic1.3/
-%{_datadir}/audacious/Skins/Default/
-%{_datadir}/audacious/Skins/Ivory/
-%{_datadir}/audacious/Skins/Osmosis/
-%{_datadir}/audacious/Skins/Refugee/
-%{_datadir}/audacious/Skins/TinyPlayer/
-%dir %{_datadir}/audacious/ui
-%{_datadir}/audacious/ui/*.ui
-
-%files output-pulse
-%defattr(-,root,root)
-%dir %{_libdir}/audacious/Output
-%{_libdir}/audacious/Output/pulse_audio.so
-
-%files input-adplug
-%defattr(-,root,root)
-%{_libdir}/audacious/Input/adplug.so
-
-%files input-sid
-%defattr(-,root,root)
-%{_libdir}/audacious/Input/sid.so
-
-%files input-fluidsynth
-%defattr(-,root,root)
-%dir %{_libdir}/audacious/Input
-%{_libdir}/audacious/Input/amidi-plug/ap-fluidsynth.so
-
-%files transport-mms
-%defattr(-,root,root)
-%{_libdir}/audacious/Transport/mms.so
-
-%files transport-http
-%defattr(-,root,root)
-%dir %{_libdir}/audacious/Transport
-%{_libdir}/audacious/Transport/neon.so
+%endif
 
 %changelog

BSD-2-Clause Added

@@ -0,0 +1,10 @@
+Copyright (c) <YEAR>, <OWNER>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY {{THE COPYRIGHT HOLDERS AND CONTRIBUTORS}} "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL {{THE COPYRIGHT HOLDER OR CONTRIBUTORS}} BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

MIT Added

@@ -0,0 +1,15 @@
+MIT License
+
+Copyright (c) <year> <copyright holders>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

audacious-plugins-3.3.4.tar.bz2/.hgignore Deleted

audacious-plugins-3.3.4.tar.bz2/aclocal.m4 Deleted

@@ -1,3097 +0,0 @@
-# generated automatically by aclocal 1.13.1 -*- Autoconf -*-
-
-# Copyright (C) 1996-2012 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.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
-# gettext.m4 serial 66 (gettext-0.18.2)
-dnl Copyright (C) 1995-2012 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
-
-dnl Macro to add for using GNU gettext.
-
-dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
-dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
-dnl default (if it is not specified or empty) is 'no-libtool'.
-dnl INTLSYMBOL should be 'external' for packages with no intl directory,
-dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory.
-dnl If INTLSYMBOL is 'use-libtool', then a libtool library
-dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
-dnl depending on --{enable,disable}-{shared,static} and on the presence of
-dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library
-dnl $(top_builddir)/intl/libintl.a will be created.
-dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
-dnl implementations (in libc or libintl) without the ngettext() function
-dnl will be ignored. If NEEDSYMBOL is specified and is
-dnl 'need-formatstring-macros', then GNU gettext implementations that don't
-dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
-dnl INTLDIR is used to find the intl libraries. If empty,
-dnl the value '$(top_builddir)/intl/' is used.
-dnl
-dnl The result of the configuration is one of three cases:
-dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
-dnl and used.
-dnl Catalog format: GNU --> install in $(datadir)
-dnl Catalog extension: .mo after installation, .gmo in source tree
-dnl 2) GNU gettext has been found in the system's C library.
-dnl Catalog format: GNU --> install in $(datadir)
-dnl Catalog extension: .mo after installation, .gmo in source tree
-dnl 3) No internationalization, always use English msgid.
-dnl Catalog format: none
-dnl Catalog extension: none
-dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
-dnl The use of .gmo is historical (it was needed to avoid overwriting the
-dnl GNU format catalogs when building on a platform with an X/Open gettext),
-dnl but we keep it in order not to force irrelevant filename changes on the
-dnl maintainers.
-dnl
-AC_DEFUN([AM_GNU_GETTEXT],
-[
- dnl Argument checking.
- ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
- [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
-])])])])])
- ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
- [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
- ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
- [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
-])])])])
- define([gt_included_intl],
- ifelse([$1], [external],
- ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
- [yes]))
- define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
- gt_NEEDS_INIT
- AM_GNU_GETTEXT_NEED([$2])
-
- AC_REQUIRE([AM_PO_SUBDIRS])dnl
- ifelse(gt_included_intl, yes, [
- AC_REQUIRE([AM_INTL_SUBDIR])dnl
- ])
-
- dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
-
- dnl Sometimes libintl requires libiconv, so first search for libiconv.
- dnl Ideally we would do this search only after the
- dnl if test "$USE_NLS" = "yes"; then
- dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
- dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
- dnl the configure script would need to contain the same shell code
- dnl again, outside any 'if'. There are two solutions:
- dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
- dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
- dnl Since AC_PROVIDE_IFELSE is only in autoconf >= 2.52 and not
- dnl documented, we avoid it.
- ifelse(gt_included_intl, yes, , [
- AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
- ])
-
- dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
- gt_INTL_MACOSX
-
- dnl Set USE_NLS.
- AC_REQUIRE([AM_NLS])
-
- ifelse(gt_included_intl, yes, [
- BUILD_INCLUDED_LIBINTL=no
- USE_INCLUDED_LIBINTL=no
- ])
- LIBINTL=
- LTLIBINTL=
- POSUB=
-
- dnl Add a version number to the cache macros.
- case " $gt_needs " in
- *" need-formatstring-macros "*) gt_api_version=3 ;;
- *" need-ngettext "*) gt_api_version=2 ;;
- *) gt_api_version=1 ;;
- esac
- gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
- gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
-
- dnl If we use NLS figure out what method
- if test "$USE_NLS" = "yes"; then
- gt_use_preinstalled_gnugettext=no
- ifelse(gt_included_intl, yes, [
- AC_MSG_CHECKING([whether included gettext is requested])
- AC_ARG_WITH([included-gettext],
- [ --with-included-gettext use the GNU gettext library included here],
- nls_cv_force_use_gnu_gettext=$withval,
- nls_cv_force_use_gnu_gettext=no)
- AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
-
- nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
- if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
- ])
- dnl User does not insist on using GNU NLS library. Figure out what
- dnl to use. If GNU gettext is available we use this. Else we have
- dnl to fall back to GNU NLS library.
-
- if test $gt_api_version -ge 3; then
- gt_revision_test_code='
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
-#endif
-changequote(,)dnl
-typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
-changequote([,])dnl
-'
- else
- gt_revision_test_code=
- fi
- if test $gt_api_version -ge 2; then
- gt_expression_test_code=' + * ngettext ("", "", 0)'
- else
- gt_expression_test_code=
- fi
-
- AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
- [AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern int *_nl_domain_bindings;
- ]],
- [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
- ]])],
- [eval "$gt_func_gnugettext_libc=yes"],
- [eval "$gt_func_gnugettext_libc=no"])])
-
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
- dnl Sometimes libintl requires libiconv, so first search for libiconv.
- ifelse(gt_included_intl, yes, , [
- AM_ICONV_LINK
- ])
- dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
- dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
- dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
- dnl even if libiconv doesn't exist.
- AC_LIB_LINKFLAGS_BODY([intl])
- AC_CACHE_CHECK([for GNU gettext in libintl],
- [$gt_func_gnugettext_libintl],
- [gt_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $INCINTL"
- gt_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBINTL"
- dnl Now see whether libintl exists and does not depend on libiconv.
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
- ]],
- [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
- ]])],
- [eval "$gt_func_gnugettext_libintl=yes"],
- [eval "$gt_func_gnugettext_libintl=no"])
- dnl Now see whether libintl exists and depends on libiconv.
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
- LIBS="$LIBS $LIBICONV"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <libintl.h>
-$gt_revision_test_code
-extern int _nl_msg_cat_cntr;
-extern
-#ifdef __cplusplus
-"C"
-#endif
-const char *_nl_expand_alias (const char *);
- ]],
- [[
-bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
- ]])],
- [LIBINTL="$LIBINTL $LIBICONV"
- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
- eval "$gt_func_gnugettext_libintl=yes"
- ])
- fi
- CPPFLAGS="$gt_save_CPPFLAGS"
- LIBS="$gt_save_LIBS"])
- fi
-
- dnl If an already present or preinstalled GNU gettext() is found,
- dnl use it. But if this macro is used in GNU gettext, and GNU
- dnl gettext is already preinstalled in libintl, we update this
- dnl libintl. (Cf. the install rule in intl/Makefile.in.)
- if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
- || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
- && test "$PACKAGE" != gettext-runtime \
- && test "$PACKAGE" != gettext-tools; }; then
- gt_use_preinstalled_gnugettext=yes
- else
- dnl Reset the values set by searching for libintl.
- LIBINTL=
- LTLIBINTL=
- INCINTL=
- fi
-
- ifelse(gt_included_intl, yes, [
- if test "$gt_use_preinstalled_gnugettext" != "yes"; then
- dnl GNU gettext is not found in the C library.
- dnl Fall back on included GNU gettext library.
- nls_cv_use_gnu_gettext=yes
- fi
- fi
-
- if test "$nls_cv_use_gnu_gettext" = "yes"; then
- dnl Mark actions used to generate GNU NLS library.
- BUILD_INCLUDED_LIBINTL=yes
- USE_INCLUDED_LIBINTL=yes
- LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV $LIBTHREAD"
- LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV $LTLIBTHREAD"
- LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
- fi
-
- CATOBJEXT=
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
- dnl Mark actions to use GNU gettext tools.
- CATOBJEXT=.gmo
- fi
- ])
-
- if test -n "$INTL_MACOSX_LIBS"; then
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
- dnl Some extra flags are needed during linking.
- LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
- LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
- fi
- fi
-
- if test "$gt_use_preinstalled_gnugettext" = "yes" \
- || test "$nls_cv_use_gnu_gettext" = "yes"; then
- AC_DEFINE([ENABLE_NLS], [1],
- [Define to 1 if translation of program messages to the user's native language
- is requested.])
- else
- USE_NLS=no
- fi
- fi
-
- AC_MSG_CHECKING([whether to use NLS])
- AC_MSG_RESULT([$USE_NLS])
- if test "$USE_NLS" = "yes"; then
- AC_MSG_CHECKING([where the gettext function comes from])
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
- gt_source="external libintl"
- else
- gt_source="libc"
- fi
- else
- gt_source="included intl directory"
- fi
- AC_MSG_RESULT([$gt_source])
- fi
-
- if test "$USE_NLS" = "yes"; then
-
- if test "$gt_use_preinstalled_gnugettext" = "yes"; then
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
- AC_MSG_CHECKING([how to link with libintl])
- AC_MSG_RESULT([$LIBINTL])
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
- fi
-
- dnl For backward compatibility. Some packages may be using this.
- AC_DEFINE([HAVE_GETTEXT], [1],
- [Define if the GNU gettext() function is already present or preinstalled.])
- AC_DEFINE([HAVE_DCGETTEXT], [1],
- [Define if the GNU dcgettext() function is already present or preinstalled.])
- fi
-
- dnl We need to process the po/ directory.
- POSUB=po
- fi
-
- ifelse(gt_included_intl, yes, [
- dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
- dnl to 'yes' because some of the testsuite requires it.
- if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
- BUILD_INCLUDED_LIBINTL=yes
- fi
-
- dnl Make all variables we use known to autoconf.
- AC_SUBST([BUILD_INCLUDED_LIBINTL])
- AC_SUBST([USE_INCLUDED_LIBINTL])
- AC_SUBST([CATOBJEXT])
-
- dnl For backward compatibility. Some configure.ins may be using this.
- nls_cv_header_intl=
- nls_cv_header_libgt=
-
- dnl For backward compatibility. Some Makefiles may be using this.
- DATADIRNAME=share
- AC_SUBST([DATADIRNAME])
-
- dnl For backward compatibility. Some Makefiles may be using this.
- INSTOBJEXT=.mo
- AC_SUBST([INSTOBJEXT])
-
- dnl For backward compatibility. Some Makefiles may be using this.
- GENCAT=gencat
- AC_SUBST([GENCAT])
-
- dnl For backward compatibility. Some Makefiles may be using this.
- INTLOBJS=
- if test "$USE_INCLUDED_LIBINTL" = yes; then
- INTLOBJS="\$(GETTOBJS)"
- fi
- AC_SUBST([INTLOBJS])
-
- dnl Enable libtool support if the surrounding package wishes it.
- INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
- AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
- ])
-
- dnl For backward compatibility. Some Makefiles may be using this.
- INTLLIBS="$LIBINTL"
- AC_SUBST([INTLLIBS])
-
- dnl Make all documented variables known to autoconf.
- AC_SUBST([LIBINTL])
- AC_SUBST([LTLIBINTL])
- AC_SUBST([POSUB])
-])
-
-
-dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
-m4_define([gt_NEEDS_INIT],
-[
- m4_divert_text([DEFAULTS], [gt_needs=])
- m4_define([gt_NEEDS_INIT], [])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
-AC_DEFUN([AM_GNU_GETTEXT_NEED],
-[
- m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
-])
-
-
-dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
-AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
-
-# iconv.m4 serial 18 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2012 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
-[
- dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
-
- dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
- dnl accordingly.
- AC_LIB_LINKFLAGS_BODY([iconv])
-])
-
-AC_DEFUN([AM_ICONV_LINK],
-[
- dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
- dnl those with the standalone portable GNU libiconv installed).
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
-
- dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
- dnl accordingly.
- AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
-
- dnl Add $INCICONV to CPPFLAGS before performing the following checks,
- dnl because if the user has installed libiconv and not disabled its use
- dnl via --without-libiconv-prefix, he wants to use it. The first
- dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
- am_save_CPPFLAGS="$CPPFLAGS"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
-
- AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
- am_cv_func_iconv="no, consider installing GNU libiconv"
- am_cv_lib_iconv=no
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <stdlib.h>
-#include <iconv.h>
- ]],
- [[iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);]])],
- [am_cv_func_iconv=yes])
- if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
- LIBS="$LIBS $LIBICONV"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <stdlib.h>
-#include <iconv.h>
- ]],
- [[iconv_t cd = iconv_open("","");
- iconv(cd,NULL,NULL,NULL,NULL);
- iconv_close(cd);]])],
- [am_cv_lib_iconv=yes]
- [am_cv_func_iconv=yes])
- LIBS="$am_save_LIBS"
- fi
- ])
- if test "$am_cv_func_iconv" = yes; then
- AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
- dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
- dnl Solaris 10.
- am_save_LIBS="$LIBS"
- if test $am_cv_lib_iconv = yes; then
- LIBS="$LIBS $LIBICONV"
- fi
- AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
-#include <iconv.h>
-#include <string.h>
-int main ()
-{
- int result = 0;
- /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
- returns. */
- {
- iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
- if (cd_utf8_to_88591 != (iconv_t)(-1))
- {
- static const char input[] = "\342\202\254"; /* EURO SIGN */
- char buf[10];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_utf8_to_88591,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if (res == 0)
- result |= 1;
- iconv_close (cd_utf8_to_88591);
- }
- }
- /* Test against Solaris 10 bug: Failures are not distinguishable from
- successful returns. */
- {
- iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
- if (cd_ascii_to_88591 != (iconv_t)(-1))
- {
- static const char input[] = "\263";
- char buf[10];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_ascii_to_88591,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if (res == 0)
- result |= 2;
- iconv_close (cd_ascii_to_88591);
- }
- }
- /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
- {
- iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
- if (cd_88591_to_utf8 != (iconv_t)(-1))
- {
- static const char input[] = "\304";
- static char buf[2] = { (char)0xDE, (char)0xAD };
- const char *inptr = input;
- size_t inbytesleft = 1;
- char *outptr = buf;
- size_t outbytesleft = 1;
- size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
- result |= 4;
- iconv_close (cd_88591_to_utf8);
- }
- }
-#if 0 /* This bug could be worked around by the caller. */
- /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
- {
- iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
- if (cd_88591_to_utf8 != (iconv_t)(-1))
- {
- static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
- char buf[50];
- const char *inptr = input;
- size_t inbytesleft = strlen (input);
- char *outptr = buf;
- size_t outbytesleft = sizeof (buf);
- size_t res = iconv (cd_88591_to_utf8,
- (char **) &inptr, &inbytesleft,
- &outptr, &outbytesleft);
- if ((int)res > 0)
- result |= 8;
- iconv_close (cd_88591_to_utf8);
- }
- }
-#endif
- /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
- provided. */
- if (/* Try standardized names. */
- iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
- /* Try IRIX, OSF/1 names. */
- && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
- /* Try AIX names. */
- && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
- /* Try HP-UX names. */
- && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
- result |= 16;
- return result;
-}]])],
- [am_cv_func_iconv_works=yes],
- [am_cv_func_iconv_works=no],
- [
-changequote(,)dnl
- case "$host_os" in
- aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
- *) am_cv_func_iconv_works="guessing yes" ;;
- esac
-changequote([,])dnl
- ])
- LIBS="$am_save_LIBS"
- ])
- case "$am_cv_func_iconv_works" in
- *no) am_func_iconv=no am_cv_lib_iconv=no ;;
- *) am_func_iconv=yes ;;
- esac
- else
- am_func_iconv=no am_cv_lib_iconv=no
- fi
- if test "$am_func_iconv" = yes; then
- AC_DEFINE([HAVE_ICONV], [1],
- [Define if you have the iconv() function and it works.])
- fi
- if test "$am_cv_lib_iconv" = yes; then
- AC_MSG_CHECKING([how to link with libiconv])
- AC_MSG_RESULT([$LIBICONV])
- else
- dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
- dnl either.
- CPPFLAGS="$am_save_CPPFLAGS"
- LIBICONV=
- LTLIBICONV=
- fi
- AC_SUBST([LIBICONV])
- AC_SUBST([LTLIBICONV])
-])
-
-dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
-dnl avoid warnings like
-dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
-dnl This is tricky because of the way 'aclocal' is implemented:
-dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
-dnl Otherwise aclocal's initial scan pass would miss the macro definition.
-dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
-dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
-dnl warnings.
-m4_define([gl_iconv_AC_DEFUN],
- m4_version_prereq([2.64],
- [[AC_DEFUN_ONCE(
- [$1], [$2])]],
- [m4_ifdef([gl_00GNULIB],
- [[AC_DEFUN_ONCE(
- [$1], [$2])]],
- [[AC_DEFUN(
- [$1], [$2])]])]))
-gl_iconv_AC_DEFUN([AM_ICONV],
-[
- AM_ICONV_LINK
- if test "$am_cv_func_iconv" = yes; then
- AC_MSG_CHECKING([for iconv declaration])
- AC_CACHE_VAL([am_cv_proto_iconv], [
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[
-#include <stdlib.h>
-#include <iconv.h>
-extern
-#ifdef __cplusplus
-"C"
-#endif
-#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-#else
-size_t iconv();
-#endif
- ]],
- [[]])],
- [am_cv_proto_iconv_arg1=""],
- [am_cv_proto_iconv_arg1="const"])
- am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
- am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
- AC_MSG_RESULT([
- $am_cv_proto_iconv])
- AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
- [Define as const if the declaration of iconv() needs const.])
- dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
- m4_ifdef([gl_ICONV_H_DEFAULTS],
- [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
- if test -n "$am_cv_proto_iconv_arg1"; then
- ICONV_CONST="const"
- fi
- ])
- fi
-])
-
-# intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2012 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Checks for special options needed on Mac OS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
- dnl Check for API introduced in Mac OS X 10.2.
- AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
- [gt_cv_func_CFPreferencesCopyAppValue],
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <CoreFoundation/CFPreferences.h>]],
- [[CFPreferencesCopyAppValue(NULL, NULL)]])],
- [gt_cv_func_CFPreferencesCopyAppValue=yes],
- [gt_cv_func_CFPreferencesCopyAppValue=no])
- LIBS="$gt_save_LIBS"])
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
- AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
- [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
- fi
- dnl Check for API introduced in Mac OS X 10.3.
- AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <CoreFoundation/CFLocale.h>]],
- [[CFLocaleCopyCurrent();]])],
- [gt_cv_func_CFLocaleCopyCurrent=yes],
- [gt_cv_func_CFLocaleCopyCurrent=no])
- LIBS="$gt_save_LIBS"])
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
- AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
- [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
- fi
- INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then
- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
- fi
- AC_SUBST([INTL_MACOSX_LIBS])
-])
-
-# lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2012 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl Subroutines of libtool.m4,
-dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
-dnl collision with libtool.m4.
-
-dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
-AC_DEFUN([AC_LIB_PROG_LD_GNU],
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
-[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
- acl_cv_prog_gnu_ld=yes
- ;;
-*)
- acl_cv_prog_gnu_ld=no
- ;;
-esac])
-with_gnu_ld=$acl_cv_prog_gnu_ld
-])
-
-dnl From libtool-2.4. Sets the variable LD.
-AC_DEFUN([AC_LIB_PROG_LD],
-[AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-
-AC_ARG_WITH([gnu-ld],
- [AS_HELP_STRING([--with-gnu-ld],
- [assume the C compiler uses GNU ld [default=no]])],
- [test "$withval" = no || with_gnu_ld=yes],
- [with_gnu_ld=no])dnl
-
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
- # contains only /bin. Note that ksh looks also at the FPATH variable,
- # so we have to set that as well for the test.
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- || PATH_SEPARATOR=';'
- }
-fi
-
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- AC_MSG_CHECKING([for ld used by $CC])
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
- *)
- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
- esac
- case $ac_prog in
- # Accept absolute paths.
- [[\\/]]* | ?:[[\\/]]*)
- re_direlt='/[[^/]][[^/]]*/\.\./'
- # Canonicalize the pathname of ld
- ac_prog=`echo "$ac_prog"| sed 's%\\\\%/%g'`
- while echo "$ac_prog" | grep "$re_direlt" > /dev/null 2>&1; do
- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
- done
- test -z "$LD" && LD="$ac_prog"
- ;;
- "")
- # If it fails, then pretend we aren't using GCC.
- ac_prog=ld
- ;;
- *)
- # If it is relative, then search for the first ld in PATH.
- with_gnu_ld=unknown
- ;;
- esac
-elif test "$with_gnu_ld" = yes; then
- AC_MSG_CHECKING([for GNU ld])
-else
- AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL([acl_cv_path_LD],
-[if test -z "$LD"; then
- acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in $PATH; do
- IFS="$acl_save_ifs"
- test -z "$ac_dir" && ac_dir=.
- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- acl_cv_path_LD="$ac_dir/$ac_prog"
- # Check to see if the program is GNU ld. I'd rather use --version,
- # but apparently some variants of GNU ld only accept -v.
- # Break only if it was the GNU/non-GNU ld that we prefer.
- case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
- ;;
- *)
- test "$with_gnu_ld" != yes && break
- ;;
- esac
- fi
- done
- IFS="$acl_save_ifs"
-else
- acl_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
- AC_MSG_RESULT([$LD])
-else
- AC_MSG_RESULT([no])
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_LIB_PROG_LD_GNU
-])
-
-# lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2012 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-AC_PREREQ([2.54])
-
-dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
-dnl augments the CPPFLAGS variable.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS],
-[
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
- pushdef([Name],[m4_translit([$1],[./+-], [____])])
- pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
- AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
- AC_LIB_LINKFLAGS_BODY([$1], [$2])
- ac_cv_lib[]Name[]_libs="$LIB[]NAME"
- ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
- ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
- ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
- ])
- LIB[]NAME="$ac_cv_lib[]Name[]_libs"
- LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
- INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
- LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
- AC_SUBST([LIB]NAME)
- AC_SUBST([LTLIB]NAME)
- AC_SUBST([LIB]NAME[_PREFIX])
- dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
- dnl results of this search when this library appears as a dependency.
- HAVE_LIB[]NAME=yes
- popdef([NAME])
- popdef([Name])
-])
-
-dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
-dnl searches for libname and the libraries corresponding to explicit and
-dnl implicit dependencies, together with the specified include files and
-dnl the ability to compile and link the specified testcode. The missing-message
-dnl defaults to 'no' and may contain additional hints for the user.
-dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
-dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
-dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
-dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
-dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
-dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
-[
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- AC_REQUIRE([AC_LIB_RPATH])
- pushdef([Name],[m4_translit([$1],[./+-], [____])])
- pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
-
- dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
- dnl accordingly.
- AC_LIB_LINKFLAGS_BODY([$1], [$2])
-
- dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
- dnl because if the user has installed lib[]Name and not disabled its use
- dnl via --without-lib[]Name-prefix, he wants to use it.
- ac_save_CPPFLAGS="$CPPFLAGS"
- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
-
- AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
- ac_save_LIBS="$LIBS"
- dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
- dnl because these -l options might require -L options that are present in
- dnl LIBS. -l options benefit only from the -L options listed before it.
- dnl Otherwise, add it to the front of LIBS, because it may be a static
- dnl library that depends on another static library that is present in LIBS.
- dnl Static libraries benefit only from the static libraries listed after
- dnl it.
- case " $LIB[]NAME" in
- *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
- *) LIBS="$LIB[]NAME $LIBS" ;;
- esac
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM([[$3]], [[$4]])],
- [ac_cv_lib[]Name=yes],
- [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
- LIBS="$ac_save_LIBS"
- ])
- if test "$ac_cv_lib[]Name" = yes; then
- HAVE_LIB[]NAME=yes
- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
- AC_MSG_CHECKING([how to link with lib[]$1])
- AC_MSG_RESULT([$LIB[]NAME])
- else
- HAVE_LIB[]NAME=no
- dnl If $LIB[]NAME didn't lead to a usable library, we don't need
- dnl $INC[]NAME either.
- CPPFLAGS="$ac_save_CPPFLAGS"
- LIB[]NAME=
- LTLIB[]NAME=
- LIB[]NAME[]_PREFIX=
- fi
- AC_SUBST([HAVE_LIB]NAME)
- AC_SUBST([LIB]NAME)
- AC_SUBST([LTLIB]NAME)
- AC_SUBST([LIB]NAME[_PREFIX])
- popdef([NAME])
- popdef([Name])
-])
-
-dnl Determine the platform dependent parameters needed to use rpath:
-dnl acl_libext,
-dnl acl_shlibext,
-dnl acl_libname_spec,
-dnl acl_library_names_spec,
-dnl acl_hardcode_libdir_flag_spec,
-dnl acl_hardcode_libdir_separator,
-dnl acl_hardcode_direct,
-dnl acl_hardcode_minus_L.
-AC_DEFUN([AC_LIB_RPATH],
-[
- dnl Tell automake >= 1.10 to complain if config.rpath is missing.
- m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
- AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
- AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
- AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
- AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
- AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
- . ./conftest.sh
- rm -f ./conftest.sh
- acl_cv_rpath=done
- ])
- wl="$acl_cv_wl"
- acl_libext="$acl_cv_libext"
- acl_shlibext="$acl_cv_shlibext"
- acl_libname_spec="$acl_cv_libname_spec"
- acl_library_names_spec="$acl_cv_library_names_spec"
- acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
- acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
- acl_hardcode_direct="$acl_cv_hardcode_direct"
- acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
- dnl Determine whether the user wants rpath handling at all.
- AC_ARG_ENABLE([rpath],
- [ --disable-rpath do not hardcode runtime library paths],
- :, enable_rpath=yes)
-])
-
-dnl AC_LIB_FROMPACKAGE(name, package)
-dnl declares that libname comes from the given package. The configure file
-dnl will then not have a --with-libname-prefix option but a
-dnl --with-package-prefix option. Several libraries can come from the same
-dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
-dnl macro call that searches for libname.
-AC_DEFUN([AC_LIB_FROMPACKAGE],
-[
- pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
- define([acl_frompackage_]NAME, [$2])
- popdef([NAME])
- pushdef([PACK],[$2])
- pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
- define([acl_libsinpackage_]PACKUP,
- m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
- popdef([PACKUP])
- popdef([PACK])
-])
-
-dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
-dnl the libraries corresponding to explicit and implicit dependencies.
-dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
-dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
-dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
-AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
-[
- AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
- pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
- pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
- pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
- [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
- pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
- dnl Autoconf >= 2.61 supports dots in --with options.
- pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[m4_translit(PACK,[.],[_])],PACK)])
- dnl By default, look in $includedir and $libdir.
- use_additional=yes
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- AC_ARG_WITH(P_A_C_K[-prefix],
-[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
- --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
-[
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
- if test "$acl_libdirstem2" != "$acl_libdirstem" \
- && ! test -d "$withval/$acl_libdirstem"; then
- additional_libdir="$withval/$acl_libdirstem2"
- fi
- fi
- fi
-])
- dnl Search the library and its dependencies in $additional_libdir and
- dnl $LDFLAGS. Using breadth-first-seach.
- LIB[]NAME=
- LTLIB[]NAME=
- INC[]NAME=
- LIB[]NAME[]_PREFIX=
- dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
- dnl computed. So it has to be reset here.
- HAVE_LIB[]NAME=
- rpathdirs=
- ltrpathdirs=
- names_already_handled=
- names_next_round='$1 $2'
- while test -n "$names_next_round"; do
- names_this_round="$names_next_round"
- names_next_round=
- for name in $names_this_round; do
- already_handled=
- for n in $names_already_handled; do
- if test "$n" = "$name"; then
- already_handled=yes
- break
- fi
- done
- if test -z "$already_handled"; then
- names_already_handled="$names_already_handled $name"
- dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
- dnl or AC_LIB_HAVE_LINKFLAGS call.
- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
- eval value=\"\$HAVE_LIB$uppername\"
- if test -n "$value"; then
- if test "$value" = yes; then
- eval value=\"\$LIB$uppername\"
- test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
- eval value=\"\$LTLIB$uppername\"
- test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
- else
- dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
- dnl that this library doesn't exist. So just drop it.
- :
- fi
- else
- dnl Search the library lib$name in $additional_libdir and $LDFLAGS
- dnl and the already constructed $LIBNAME/$LTLIBNAME.
- found_dir=
- found_la=
- found_so=
- found_a=
- eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
- if test -n "$acl_shlibext"; then
- shrext=".$acl_shlibext" # typically: shrext=.so
- else
- shrext=
- fi
- if test $use_additional = yes; then
- dir="$additional_libdir"
- dnl The same code as in the loop below:
- dnl First look for a shared library.
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- dnl Then look for a static library.
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- fi
- if test "X$found_dir" = "X"; then
- for x in $LDFLAGS $LTLIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
- dnl First look for a shared library.
- if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext"
- else
- if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
- ver=`(cd "$dir" && \
- for f in "$libname$shrext".*; do echo "$f"; done \
- | sed -e "s,^$libname$shrext\\\\.,," \
- | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
- | sed 1q ) 2>/dev/null`
- if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
- found_dir="$dir"
- found_so="$dir/$libname$shrext.$ver"
- fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
- found_dir="$dir"
- found_so="$dir/$f"
- break
- fi
- done
- fi
- fi
- fi
- dnl Then look for a static library.
- if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
- found_dir="$dir"
- found_a="$dir/$libname.$acl_libext"
- fi
- fi
- if test "X$found_dir" != "X"; then
- if test -f "$dir/$libname.la"; then
- found_la="$dir/$libname.la"
- fi
- fi
- ;;
- esac
- if test "X$found_dir" != "X"; then
- break
- fi
- done
- fi
- if test "X$found_dir" != "X"; then
- dnl Found the library.
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
- if test "X$found_so" != "X"; then
- dnl Linking with a shared library. We attempt to hardcode its
- dnl directory into the executable's runpath, unless it's the
- dnl standard /usr/lib.
- if test "$enable_rpath" = no \
- || test "X$found_dir" = "X/usr/$acl_libdirstem" \
- || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
- dnl No hardcoding is needed.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- dnl Potentially add DIR to ltrpathdirs.
- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $found_dir"
- fi
- dnl The hardcoding into $LIBNAME is system dependent.
- if test "$acl_hardcode_direct" = yes; then
- dnl Using DIR/libNAME.so during linking hardcodes DIR into the
- dnl resulting binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- dnl Use an explicit option to hardcode DIR into the resulting
- dnl binary.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $found_dir"
- fi
- else
- dnl Rely on "-L$found_dir".
- dnl But don't add it if it's already contained in the LDFLAGS
- dnl or the already constructed $LIBNAME
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$found_dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
- fi
- if test "$acl_hardcode_minus_L" != no; then
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
- else
- dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
- dnl here, because this doesn't fit in flags passed to the
- dnl compiler. So give up. No hardcoding. This affects only
- dnl very old systems.
- dnl FIXME: Not sure whether we should use
- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
- dnl here.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- fi
- fi
- fi
- fi
- else
- if test "X$found_a" != "X"; then
- dnl Linking with a static library.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
- else
- dnl We shouldn't come here, but anyway it's good to have a
- dnl fallback.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
- fi
- fi
- dnl Assume the include files are nearby.
- additional_includedir=
- case "$found_dir" in
- */$acl_libdirstem | */$acl_libdirstem/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
- if test "$name" = '$1'; then
- LIB[]NAME[]_PREFIX="$basedir"
- fi
- additional_includedir="$basedir/include"
- ;;
- */$acl_libdirstem2 | */$acl_libdirstem2/)
- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
- if test "$name" = '$1'; then
- LIB[]NAME[]_PREFIX="$basedir"
- fi
- additional_includedir="$basedir/include"
- ;;
- esac
- if test "X$additional_includedir" != "X"; then
- dnl Potentially add $additional_includedir to $INCNAME.
- dnl But don't add it
- dnl 1. if it's the standard /usr/include,
- dnl 2. if it's /usr/local/include and we are using GCC on Linux,
- dnl 3. if it's already present in $CPPFLAGS or the already
- dnl constructed $INCNAME,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- for x in $CPPFLAGS $INC[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- dnl Really add $additional_includedir to $INCNAME.
- INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- fi
- dnl Look for dependencies.
- if test -n "$found_la"; then
- dnl Read the .la file. It defines the variables
- dnl dlname, library_names, old_library, dependency_libs, current,
- dnl age, revision, installed, dlopen, dlpreopen, libdir.
- save_libdir="$libdir"
- case "$found_la" in
- */* | *\\*) . "$found_la" ;;
- *) . "./$found_la" ;;
- esac
- libdir="$save_libdir"
- dnl We use only dependency_libs.
- for dep in $dependency_libs; do
- case "$dep" in
- -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
- dnl But don't add it
- dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
- dnl 3. if it's already present in $LDFLAGS or the already
- dnl constructed $LIBNAME,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
- && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
- haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
- || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- haveit=
- for x in $LDFLAGS $LIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LIBNAME.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
- fi
- fi
- haveit=
- for x in $LDFLAGS $LTLIB[]NAME; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LTLIBNAME.
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- ;;
- -R*)
- dir=`echo "X$dep" | sed -e 's/^X-R//'`
- if test "$enable_rpath" != no; then
- dnl Potentially add DIR to rpathdirs.
- dnl The rpathdirs will be appended to $LIBNAME at the end.
- haveit=
- for x in $rpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- rpathdirs="$rpathdirs $dir"
- fi
- dnl Potentially add DIR to ltrpathdirs.
- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
- haveit=
- for x in $ltrpathdirs; do
- if test "X$x" = "X$dir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- ltrpathdirs="$ltrpathdirs $dir"
- fi
- fi
- ;;
- -l*)
- dnl Handle this in the next round.
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
- ;;
- *.la)
- dnl Handle this in the next round. Throw away the .la's
- dnl directory; it is already contained in a preceding -L
- dnl option.
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
- ;;
- *)
- dnl Most likely an immediate library name.
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
- ;;
- esac
- done
- fi
- else
- dnl Didn't find the library; assume it is in the system directories
- dnl known to the linker and runtime loader. (All the system
- dnl directories known to the linker should also be known to the
- dnl runtime loader, otherwise the system is severely misconfigured.)
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
- fi
- fi
- fi
- done
- done
- if test "X$rpathdirs" != "X"; then
- if test -n "$acl_hardcode_libdir_separator"; then
- dnl Weird platform: only the last -rpath option counts, the user must
- dnl pass all path elements in one option. We can arrange that for a
- dnl single library, but not when more than one $LIBNAMEs are used.
- alldirs=
- for found_dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
- done
- dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
- else
- dnl The -rpath options are cumulative.
- for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$found_dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
- done
- fi
- fi
- if test "X$ltrpathdirs" != "X"; then
- dnl When using libtool, the option that works for both libraries and
- dnl executables is -R. The -R options are cumulative.
- for found_dir in $ltrpathdirs; do
- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
- done
- fi
- popdef([P_A_C_K])
- popdef([PACKLIBS])
- popdef([PACKUP])
- popdef([PACK])
- popdef([NAME])
-])
-
-dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
-dnl unless already present in VAR.
-dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
-dnl contains two or three consecutive elements that belong together.
-AC_DEFUN([AC_LIB_APPENDTOVAR],
-[
- for element in [$2]; do
- haveit=
- for x in $[$1]; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X$element"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- [$1]="${[$1]}${[$1]:+ }$element"
- fi
- done
-])
-
-dnl For those cases where a variable contains several -L and -l options
-dnl referring to unknown libraries and directories, this macro determines the
-dnl necessary additional linker options for the runtime path.
-dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
-dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
-dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
-dnl otherwise linking without libtool is assumed.
-AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
-[
- AC_REQUIRE([AC_LIB_RPATH])
- AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
- $1=
- if test "$enable_rpath" != no; then
- if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
- dnl Use an explicit option to hardcode directories into the resulting
- dnl binary.
- rpathdirs=
- next=
- for opt in $2; do
- if test -n "$next"; then
- dir="$next"
- dnl No need to hardcode the standard /usr/lib.
- if test "X$dir" != "X/usr/$acl_libdirstem" \
- && test "X$dir" != "X/usr/$acl_libdirstem2"; then
- rpathdirs="$rpathdirs $dir"
- fi
- next=
- else
- case $opt in
- -L) next=yes ;;
- -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
- dnl No need to hardcode the standard /usr/lib.
- if test "X$dir" != "X/usr/$acl_libdirstem" \
- && test "X$dir" != "X/usr/$acl_libdirstem2"; then
- rpathdirs="$rpathdirs $dir"
- fi
- next= ;;
- *) next= ;;
- esac
- fi
- done
- if test "X$rpathdirs" != "X"; then
- if test -n ""$3""; then
- dnl libtool is used for linking. Use -R options.
- for dir in $rpathdirs; do
- $1="${$1}${$1:+ }-R$dir"
- done
- else
- dnl The linker is used for linking directly.
- if test -n "$acl_hardcode_libdir_separator"; then
- dnl Weird platform: only the last -rpath option counts, the user
- dnl must pass all path elements in one option.
- alldirs=
- for dir in $rpathdirs; do
- alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
- done
- acl_save_libdir="$libdir"
- libdir="$alldirs"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- $1="$flag"
- else
- dnl The -rpath options are cumulative.
- for dir in $rpathdirs; do
- acl_save_libdir="$libdir"
- libdir="$dir"
- eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
- $1="${$1}${$1:+ }$flag"
- done
- fi
- fi
- fi
- fi
- fi
- AC_SUBST([$1])
-])
-
-# lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2012 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl From Bruno Haible.
-
-dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
-dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
-dnl require excessive bracketing.
-ifdef([AC_HELP_STRING],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
-
-dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
-dnl to access previously installed libraries. The basic assumption is that
-dnl a user will want packages to use other packages he previously installed
-dnl with the same --prefix option.
-dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
-dnl libraries, but is otherwise very convenient.
-AC_DEFUN([AC_LIB_PREFIX],
-[
- AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
- AC_REQUIRE([AC_PROG_CC])
- AC_REQUIRE([AC_CANONICAL_HOST])
- AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
- AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
- dnl By default, look in $includedir and $libdir.
- use_additional=yes
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- AC_LIB_ARG_WITH([lib-prefix],
-[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
- --without-lib-prefix don't search for libraries in includedir and libdir],
-[
- if test "X$withval" = "Xno"; then
- use_additional=no
- else
- if test "X$withval" = "X"; then
- AC_LIB_WITH_FINAL_PREFIX([
- eval additional_includedir=\"$includedir\"
- eval additional_libdir=\"$libdir\"
- ])
- else
- additional_includedir="$withval/include"
- additional_libdir="$withval/$acl_libdirstem"
- fi
- fi
-])
- if test $use_additional = yes; then
- dnl Potentially add $additional_includedir to $CPPFLAGS.
- dnl But don't add it
- dnl 1. if it's the standard /usr/include,
- dnl 2. if it's already present in $CPPFLAGS,
- dnl 3. if it's /usr/local/include and we are using GCC on Linux,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_includedir" != "X/usr/include"; then
- haveit=
- for x in $CPPFLAGS; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-I$additional_includedir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_includedir" = "X/usr/local/include"; then
- if test -n "$GCC"; then
- case $host_os in
- linux* | gnu* | k*bsd*-gnu) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- if test -d "$additional_includedir"; then
- dnl Really add $additional_includedir to $CPPFLAGS.
- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
- fi
- fi
- fi
- fi
- dnl Potentially add $additional_libdir to $LDFLAGS.
- dnl But don't add it
- dnl 1. if it's the standard /usr/lib,
- dnl 2. if it's already present in $LDFLAGS,
- dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
- dnl 4. if it doesn't exist as a directory.
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
- haveit=
- for x in $LDFLAGS; do
- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
- if test "X$x" = "X-L$additional_libdir"; then
- haveit=yes
- break
- fi
- done
- if test -z "$haveit"; then
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
- if test -n "$GCC"; then
- case $host_os in
- linux*) haveit=yes;;
- esac
- fi
- fi
- if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- dnl Really add $additional_libdir to $LDFLAGS.
- LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
- fi
- fi
- fi
- fi
- fi
-])
-
-dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
-dnl acl_final_exec_prefix, containing the values to which $prefix and
-dnl $exec_prefix will expand at the end of the configure script.
-AC_DEFUN([AC_LIB_PREPARE_PREFIX],
-[
- dnl Unfortunately, prefix and exec_prefix get only finally determined
- dnl at the end of configure.
- if test "X$prefix" = "XNONE"; then
- acl_final_prefix="$ac_default_prefix"
- else
- acl_final_prefix="$prefix"
- fi
- if test "X$exec_prefix" = "XNONE"; then
- acl_final_exec_prefix='${prefix}'
- else
- acl_final_exec_prefix="$exec_prefix"
- fi
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
- prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
-dnl variables prefix and exec_prefix bound to the values they will have
-dnl at the end of the configure script.
-AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
-[
- acl_save_prefix="$prefix"
- prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
- exec_prefix="$acl_final_exec_prefix"
- $1
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
-])
-
-dnl AC_LIB_PREPARE_MULTILIB creates
-dnl - a variable acl_libdirstem, containing the basename of the libdir, either
-dnl "lib" or "lib64" or "lib/64",
-dnl - a variable acl_libdirstem2, as a secondary possible value for
-dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
-dnl "lib/amd64".
-AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
-[
- dnl There is no formal standard regarding lib and lib64.
- dnl On glibc systems, the current practice is that on a system supporting
- dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
- dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
- dnl the compiler's default mode by looking at the compiler's library search
- dnl path. If at least one of its elements ends in /lib64 or points to a
- dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
- dnl Otherwise we use the default, namely "lib".
- dnl On Solaris systems, the current practice is that on a system supporting
- dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
- dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
- dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
- AC_REQUIRE([AC_CANONICAL_HOST])
- acl_libdirstem=lib
- acl_libdirstem2=
- case "$host_os" in
- solaris*)
- dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
- dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
- dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
- dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
- dnl symlink is missing, so we set acl_libdirstem2 too.
- AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
- [AC_EGREP_CPP([sixtyfour bits], [
-#ifdef _LP64
-sixtyfour bits
-#endif
- ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
- ])
- if test $gl_cv_solaris_64bit = yes; then
- acl_libdirstem=lib/64
- case "$host_cpu" in
- sparc*) acl_libdirstem2=lib/sparcv9 ;;
- i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
- esac
- fi
- ;;
- *)
- searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
- if test -n "$searchpath"; then
- acl_save_IFS="${IFS= 	}"; IFS=":"
- for searchdir in $searchpath; do
- if test -d "$searchdir"; then
- case "$searchdir" in
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
- */../ | */.. )
- # Better ignore directories of this form. They are misleading.
- ;;
- *) searchdir=`cd "$searchdir" && pwd`
- case "$searchdir" in
- */lib64 ) acl_libdirstem=lib64 ;;
- esac ;;
- esac
- fi
- done
- IFS="$acl_save_IFS"
- fi
- ;;
- esac
- test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
-])
-
-# nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2012 Free Software Foundation,
-dnl Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
- AC_MSG_CHECKING([whether NLS is requested])
- dnl Default is enabled NLS
- AC_ARG_ENABLE([nls],
- [ --disable-nls do not use Native Language Support],
- USE_NLS=$enableval, USE_NLS=yes)
- AC_MSG_RESULT([$USE_NLS])
- AC_SUBST([USE_NLS])
-])
-
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_default([$2], [:])
-m4_ifvaln([$3], [else
- $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes ],
-		 [pkg_failed=yes])
- else
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
- 	AC_MSG_RESULT([no])
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
-	 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
- else 
-	 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
-	m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
- ])
-elif test $pkg_failed = untried; then
- 	AC_MSG_RESULT([no])
-	m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
- ])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
-	$3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-
-# PKG_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable pkgconfigdir as the location where a module
-# should install pkg-config .pc files. By default the directory is
-# $libdir/pkgconfig, but the default can be changed by passing
-# DIRECTORY. The user can override through the --with-pkgconfigdir
-# parameter.
-AC_DEFUN([PKG_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
-m4_pushdef([pkg_description],
- [pkg-config installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([pkgconfigdir],
- [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
- [with_pkgconfigdir=]pkg_default)
-AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_INSTALLDIR
-
-
-# PKG_NOARCH_INSTALLDIR(DIRECTORY)
-# -------------------------
-# Substitutes the variable noarch_pkgconfigdir as the location where a
-# module should install arch-independent pkg-config .pc files. By
-# default the directory is $datadir/pkgconfig, but the default can be
-# changed by passing DIRECTORY. The user can override through the
-# --with-noarch-pkgconfigdir parameter.
-AC_DEFUN([PKG_NOARCH_INSTALLDIR],
-[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
-m4_pushdef([pkg_description],
- [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
-AC_ARG_WITH([noarch-pkgconfigdir],
- [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
- [with_noarch_pkgconfigdir=]pkg_default)
-AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
-m4_popdef([pkg_default])
-m4_popdef([pkg_description])
-]) dnl PKG_NOARCH_INSTALLDIR
-
-
-# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
-# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-# -------------------------------------------
-# Retrieves the value of the pkg-config variable for the given module.
-AC_DEFUN([PKG_CHECK_VAR],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
-
-_PKG_CONFIG([$1], [variable="][$3]["], [$2])
-AS_VAR_COPY([$1], [pkg_cv_][$1])
-
-AS_VAR_IF([$1], [""], [$5], [$4])dnl
-])# PKG_CHECK_VAR
-
-# po.m4 serial 20 (gettext-0.18.2)
-dnl Copyright (C) 1995-2012 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
-
-AC_PREREQ([2.60])
-
-dnl Checks for all prerequisites of the po subdirectory.
-AC_DEFUN([AM_PO_SUBDIRS],
-[
- AC_REQUIRE([AC_PROG_MAKE_SET])dnl
- AC_REQUIRE([AC_PROG_INSTALL])dnl
- AC_REQUIRE([AC_PROG_MKDIR_P])dnl
- AC_REQUIRE([AM_NLS])dnl
-
- dnl Release version of the gettext macros. This is used to ensure that
- dnl the gettext macros and po/Makefile.in.in are in sync.
- AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
-
- dnl Perform the following tests also if --disable-nls has been given,
- dnl because they are needed for "make dist" to work.
-
- dnl Search for GNU msgfmt in the PATH.
- dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
- dnl The second test excludes FreeBSD msgfmt.
- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
- [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
- :)
- AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
-
- dnl Test whether it is GNU msgfmt >= 0.15.
-changequote(,)dnl
- case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;;
- *) MSGFMT_015=$MSGFMT ;;
- esac
-changequote([,])dnl
- AC_SUBST([MSGFMT_015])
-changequote(,)dnl
- case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
- *) GMSGFMT_015=$GMSGFMT ;;
- esac
-changequote([,])dnl
- AC_SUBST([GMSGFMT_015])
-
- dnl Search for GNU xgettext 0.12 or newer in the PATH.
- dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
- dnl The second test excludes FreeBSD xgettext.
- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
- [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
- (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
- :)
- dnl Remove leftover from FreeBSD xgettext call.
- rm -f messages.po
-
- dnl Test whether it is GNU xgettext >= 0.15.
-changequote(,)dnl
- case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
- *) XGETTEXT_015=$XGETTEXT ;;
- esac
-changequote([,])dnl
- AC_SUBST([XGETTEXT_015])
-
- dnl Search for GNU msgmerge 0.11 or newer in the PATH.
- AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
- [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
-
- dnl Installation directories.
- dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
- dnl have to define it here, so that it can be used in po/Makefile.
- test -n "$localedir" || localedir='${datadir}/locale'
- AC_SUBST([localedir])
-
- dnl Support for AM_XGETTEXT_OPTION.
- test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
- AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
-
- AC_CONFIG_COMMANDS([po-directories], [[
- for ac_file in $CONFIG_FILES; do
- # Support "outfile[:infile[:infile...]]"
- case "$ac_file" in
- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
- esac
- # PO directories have a Makefile.in generated from Makefile.in.in.
- case "$ac_file" in */Makefile.in)
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
- # Treat a directory as a PO directory if and only if it has a
- # POTFILES.in file. This allows packages to have multiple PO
- # directories under different names or in different locations.
- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
- rm -f "$ac_dir/POTFILES"
- test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
- gt_tab=`printf '\t'`
- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/$.*$ \\\\/\1/" > "$ac_dir/POTFILES"
- POMAKEFILEDEPS="POTFILES.in"
- # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
- # on $ac_dir but don't depend on user-specified configuration
- # parameters.
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
- # The LINGUAS file contains the set of available languages.
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
- fi
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
- else
- # The set of available languages was given in configure.in.
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
- fi
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
- case "$ac_given_srcdir" in
- .) srcdirpre= ;;
- *) srcdirpre='$(srcdir)/' ;;
- esac
- POFILES=
- UPDATEPOFILES=
- DUMMYPOFILES=
- GMOFILES=
- for lang in $ALL_LINGUAS; do
- POFILES="$POFILES $srcdirpre$lang.po"
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- done
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
- # environment variable.
- INST_LINGUAS=
- if test -n "$ALL_LINGUAS"; then
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "$LINGUAS"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- INST_LINGUAS="$INST_LINGUAS $presentlang"
- fi
- done
- fi
- CATALOGS=
- if test -n "$INST_LINGUAS"; then
- for lang in $INST_LINGUAS; do
- CATALOGS="$CATALOGS $lang.gmo"
- done
- fi
- test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
- for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
- if test -f "$f"; then
- case "$f" in
- *.orig | *.bak | *~) ;;
- *) cat "$f" >> "$ac_dir/Makefile" ;;
- esac
- fi
- done
- fi
- ;;
- esac
- done]],
- [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
- # from automake < 1.5.
- eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
- # Capture the value of LINGUAS because we need it to compute CATALOGS.
- LINGUAS="${LINGUAS-%UNSET%}"
- ])
-])
-
-dnl Postprocesses a Makefile in a directory containing PO files.
-AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
-[
- # When this code is run, in config.status, two variables have already been
- # set:
- # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
- # - LINGUAS is the value of the environment variable LINGUAS at configure
- # time.
-
-changequote(,)dnl
- # Adjust a relative srcdir.
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
- ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
- # In autoconf-2.13 it is called $ac_given_srcdir.
- # In autoconf-2.50 it is called $srcdir.
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
- case "$ac_given_srcdir" in
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
- /*) top_srcdir="$ac_given_srcdir" ;;
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
- esac
-
- # Find a way to echo strings without interpreting backslash.
- if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
- gt_echo='echo'
- else
- if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
- gt_echo='printf %s\n'
- else
- echo_func () {
- cat <<EOT
-$*
-EOT
- }
- gt_echo='echo_func'
- fi
- fi
-
- # A sed script that extracts the value of VARIABLE from a Makefile.
- tab=`printf '\t'`
- sed_x_variable='
-# Test if the hold space is empty.
-x
-s/P/P/
-x
-ta
-# Yes it was empty. Look if we have the expected variable definition.
-/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
- # Seen the first line of the variable definition.
- s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
- ba
-}
-bd
-:a
-# Here we are processing a line from the variable definition.
-# Remove comment, more precisely replace it with a space.
-s/#.*$/ /
-# See if the line ends in a backslash.
-tb
-:b
-s/\\$//
-# Print the line, without the trailing backslash.
-p
-tc
-# There was no trailing backslash. The end of the variable definition is
-# reached. Clear the hold space.
-s/^.*$//
-x
-bd
-:c
-# A trailing backslash means that the variable definition continues in the
-# next line. Put a nonempty string into the hold space to indicate this.
-s/^.*$/P/
-x
-:d
-'
-changequote([,])dnl
-
- # Set POTFILES to the value of the Makefile variable POTFILES.
- sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
- POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
- # Compute POTFILES_DEPS as
- # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
- POTFILES_DEPS=
- for file in $POTFILES; do
- POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
- done
- POMAKEFILEDEPS=""
-
- if test -n "$OBSOLETE_ALL_LINGUAS"; then
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
- fi
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
- # The LINGUAS file contains the set of available languages.
- ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
- POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
- else
- # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
- sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
- ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
- fi
- # Hide the ALL_LINGUAS assignment from automake < 1.5.
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
- # Compute POFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
- # Compute UPDATEPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
- # Compute DUMMYPOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
- # Compute GMOFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
- # Compute PROPERTIESFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).properties)
- # Compute CLASSFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(top_srcdir)/$(DOMAIN)_$(lang).class)
- # Compute QMFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
- # Compute MSGFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
- # Compute RESOURCESDLLFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
- case "$ac_given_srcdir" in
- .) srcdirpre= ;;
- *) srcdirpre='$(srcdir)/' ;;
- esac
- POFILES=
- UPDATEPOFILES=
- DUMMYPOFILES=
- GMOFILES=
- PROPERTIESFILES=
- CLASSFILES=
- QMFILES=
- MSGFILES=
- RESOURCESDLLFILES=
- for lang in $ALL_LINGUAS; do
- POFILES="$POFILES $srcdirpre$lang.po"
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- PROPERTIESFILES="$PROPERTIESFILES \$(top_srcdir)/\$(DOMAIN)_$lang.properties"
- CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
- QMFILES="$QMFILES $srcdirpre$lang.qm"
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
- RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
- done
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
- # environment variable.
- INST_LINGUAS=
- if test -n "$ALL_LINGUAS"; then
- for presentlang in $ALL_LINGUAS; do
- useit=no
- if test "%UNSET%" != "$LINGUAS"; then
- desiredlanguages="$LINGUAS"
- else
- desiredlanguages="$ALL_LINGUAS"
- fi
- for desiredlang in $desiredlanguages; do
- # Use the presentlang catalog if desiredlang is
- # a. equal to presentlang, or
- # b. a variant of presentlang (because in this case,
- # presentlang can be used as a fallback for messages
- # which are not translated in the desiredlang catalog).
- case "$desiredlang" in
- "$presentlang"*) useit=yes;;
- esac
- done
- if test $useit = yes; then
- INST_LINGUAS="$INST_LINGUAS $presentlang"
- fi
- done
- fi
- CATALOGS=
- JAVACATALOGS=
- QTCATALOGS=
- TCLCATALOGS=
- CSHARPCATALOGS=
- if test -n "$INST_LINGUAS"; then
- for lang in $INST_LINGUAS; do
- CATALOGS="$CATALOGS $lang.gmo"
- JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
- QTCATALOGS="$QTCATALOGS $lang.qm"
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
- CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
- done
- fi
-
- sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
- tab=`printf '\t'`
- if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
- # Add dependencies that cannot be formulated as a simple suffix rule.
- for lang in $ALL_LINGUAS; do
- frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
- cat >> "$ac_file.tmp" <<EOF
-$frobbedlang.msg: $lang.po
-${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
-${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
- done
- fi
- if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
- # Add dependencies that cannot be formulated as a simple suffix rule.
- for lang in $ALL_LINGUAS; do
- frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
- cat >> "$ac_file.tmp" <<EOF
-$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
-${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
-${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
-EOF
- done
- fi
- if test -n "$POMAKEFILEDEPS"; then
- cat >> "$ac_file.tmp" <<EOF
-Makefile: $POMAKEFILEDEPS
-EOF
- fi
- mv "$ac_file.tmp" "$ac_file"
-])
-
-dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
-AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
-[
- XGETTEXT_EXTRA_OPTIONS=
-])
-
-dnl Registers an option to be passed to xgettext in the po subdirectory.
-AC_DEFUN([AM_XGETTEXT_OPTION],
-[
- AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
- XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
-])
-
-# progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2012 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
-
-AC_PREREQ([2.50])
-
-# Search path for a program which passes the given test.
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN([AM_PATH_PROG_WITH_TEST],
-[
-# Prepare PATH_SEPARATOR.
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
- # contains only /bin. Note that ksh looks also at the FPATH variable,
- # so we have to set that as well for the test.
- PATH_SEPARATOR=:
- (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
- || PATH_SEPARATOR=';'
- }
-fi
-
-# Find out how to test for executable files. Don't use a zero-byte file,
-# as systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- ac_executable_p="test -x"
-else
- ac_executable_p="test -f"
-fi
-rm -f conf$$.file
-
-# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL([ac_cv_path_$1],
-[case "[$]$1" in
- [[\\/]]* | ?:[[\\/]]*)
- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
- ;;
- *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
- for ac_dir in ifelse([$5], , $PATH, [$5]); do
- IFS="$ac_save_IFS"
- test -z "$ac_dir" && ac_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
- echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
- if [$3]; then
- ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
- break 2
- fi
- fi
- done
- done
- IFS="$ac_save_IFS"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
- ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
- AC_MSG_RESULT([$][$1])
-else
- AC_MSG_RESULT([no])
-fi
-AC_SUBST([$1])dnl
-])
-
-# Figure out how to run the assembler. -*- Autoconf -*-
-
-# 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_AS
-# ----------
-AC_DEFUN([AM_PROG_AS],
-[# By default we simply use the C compiler to build assembly code.
-AC_REQUIRE([AC_PROG_CC])
-test "${CCAS+set}" = set || CCAS=$CC
-test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS
-AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)])
-AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)])
-_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl
-])
-
-# AM_CONDITIONAL -*- Autoconf -*-
-
-# 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.
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[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
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-m4_define([_AM_COND_VALUE_$1], [$2])dnl
-if $2; then
- $1_TRUE=
- $1_FALSE='#'
-else
- $1_TRUE='#'
- $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
- AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-# 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.
-
-
-# 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
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# 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
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-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],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named 'D' -- because '-MD' means "put the output
- # in D".
- rm -rf conftest.dir
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_$1_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n ['s/^#*$[a-zA-Z0-9]*$)$/\1/p'] < ./depcomp`
- fi
- am__universal=false
- m4_case([$1], [CC],
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac],
- [CXX],
- [case " $depcc " in #(
- *\ -arch\ *\ -arch\ *) am__universal=true ;;
- esac])
-
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > 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 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"
- # 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.
- am__obj=sub/conftest.${OBJEXT-o}
- am__minus_obj="-o $am__obj"
- case $depmode in
- gcc)
- # This depmode causes a compiler race in universal mode.
- test "$am__universal" = false || continue
- ;;
- nosideeffect)
- # After this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested.
- if test "x$enable_dependency_tracking" = xyes; then
-	continue
- else
-	break
- fi
- ;;
- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
- # This compiler won't grok '-c -o', but also, the minuso test has
- # not run yet. These depmodes are late enough in the game, and
- # so weak that their functioning should not be impacted.
- am__obj=conftest.${OBJEXT-o}
- am__minus_obj=
- ;;
- none) break ;;
- esac
- if depmode=$depmode \
- source=sub/conftest.c object=$am__obj \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_$1_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# 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
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE([dependency-tracking], [dnl
-AS_HELP_STRING(
- [--enable-dependency-tracking],
- [do not reject slow dependency extractors])
-AS_HELP_STRING(
- [--disable-dependency-tracking],
- [speeds up one-time build])])
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
- am__nodep='_no'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-AC_SUBST([am__nodep])dnl
-_AM_SUBST_NOTMAKE([am__nodep])dnl
-])
-
-# Generate code to set up dependency tracking. -*- Autoconf -*-
-
-# Copyright (C) 1999-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_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[{
- # 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
- *\'*) eval set x "$CONFIG_FILES" ;;
- *) set x $CONFIG_FILES ;;
- esac
- shift
- for mf
- do
- # 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
- # 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.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
- fi
- # Extract the definition of DEPDIR, am__include, and am__quote
- # 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
- am__quote=`sed -n 's/^am__quote = //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'`; do
- # Make sure the directory exists.
- test -f "$dirpart/$file" && continue
- fdir=`AS_DIRNAME(["$file"])`
- AS_MKDIR_P([$dirpart/$fdir])
- # echo "creating $dirpart/$file"
- echo '# dummy' > "$dirpart/$file"
- done
- done
-}
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# 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
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# 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.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot. For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
- am__leading_dot=.
-else
- am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	 -*- Autoconf -*-
-
-# 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_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo this is the am__doit target
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# 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
- am__quote=
- _am_result=GNU
- ;;
-esac
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- case `$am_make -s -f confmf 2> /dev/null` in #(
- *the\ am__doit\ target*)
- am__include=.include
- am__quote="\""
- _am_result=BSD
- ;;
- esac
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Helper functions for option handling. -*- Autoconf -*-
-
-# 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_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# --------------------
-# Set option NAME. Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# 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.
-
-# _AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-# This macro is traced by Automake.
-AC_DEFUN([_AM_SUBST_NOTMAKE])
-
-# AM_SUBST_NOTMAKE(VARIABLE)
-# --------------------------
-# Public sister of _AM_SUBST_NOTMAKE.
-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-
-m4_include([m4/buildsys.m4])
-m4_include([m4/sid.m4])
-m4_include([m4/sidplay.m4])
-m4_include([acinclude.m4])

audacious-plugins-3.3.4.tar.bz2/m4/sid.m4 Deleted

@@ -1,71 +0,0 @@
-
-AC_DEFUN([AM_PATH_SIDPLAY],
-[
-XS_ARG_WITH([sidplay1], [libSIDPlay1], [XS_PATH_LIBSIDPLAY1])
-if test "x$xs_have_sidplay1" = "xyes"; then
-	AC_DEFINE([HAVE_SIDPLAY1])
-fi
-
-XS_ARG_WITH([sidplay2], [libSIDPlay2], [XS_PATH_LIBSIDPLAY2])
-if test "x$xs_have_sidplay2" = "xyes"; then
-	AC_DEFINE([HAVE_SIDPLAY2])
-	AC_LANG_PUSH([C++])
-
-	XS_BUILDERS_CHECK
- xs_builders_available="no"
-	XS_BUILDERS_FIND([reSID], [resid-builder], [resid.h], [ReSIDBuilder])
-	XS_BUILDERS_FIND([HardSID], [hardsid-builder], [hardsid.h], [HardSIDBuilder])
-	if test "x$xs_builders_available" = "xno"; then
-		AC_MSG_WARN([No builder modules were found in the sidbuilders directory!]);
-		xs_have_sidplay2=no
-	fi
-fi
-
-if test "x$xs_have_sidplay2" = "xyes"; then
-	dnl *** Check for new COMI API
-	AC_MSG_CHECKING([libSIDPlay2 API style])
-	tmp_CPPFLAGS="$CPPFLAGS"
-	if test -d "$xs_sidplay2_includes"; then
-		CPPFLAGS="$CPPFLAGS -I${xs_sidplay2_includes}"
-	fi
-	AC_EGREP_HEADER([::Iid], [sidplay/sidplay2.h],
-		[xs_have_sidplay2_api="yes"],
-		[
-		AC_EGREP_HEADER([SIDIID], [sidplay/sidplay2.h],
-			[xs_have_sidplay2_api="yes"],
-			[xs_have_sidplay2_api="(old style API)"])
-		]
-	)
-	if test "x$xs_have_sidplay2_api" = "xyes"; then
-	AC_LINK_IFELSE([
-		AC_LANG_PROGRAM(
-		[#include <sidplay/sidunknown.h>],
-		[ISidUnknown *i;])
-	], [
-		xs_have_sidplay2_api="(new COMI style API)"
-		AC_DEFINE([HAVE_SIDPLAY2_COMI], [1], [Define if using new libSIDPlay2 with COM-style API.])
-	],[
-		xs_have_sidplay2_api="(broken version!)"
-	])
-	fi
-	AC_MSG_RESULT([$xs_have_sidplay2_api])
-
-	AC_LANG_POP([C++])
-
-	dnl *** Check for distortion patch
-	AC_MSG_CHECKING([libSIDPlay2+reSID distortion patch])
-	AC_EGREP_HEADER([minimumfetresistance], [sidplay/sidtypes.h], [
-		xs_have_distortion="yes"
-		AC_DEFINE([HAVE_SIDPLAY2_DISTORTION], [1], [Define if using libSIDPlay+reSID with Antti Lankila's distortion patches.])
-	],[
-		xs_have_distortion="no"
-	])
-	AC_MSG_RESULT([$xs_have_distortion])
-	CPPFLAGS="$tmp_CPPFLAGS"
-fi
-
-if test "x$xs_have_sidplay1" = "xyes" || test "x$xs_have_sidplay2" = "xyes"; then
-	m4_ifvaln([$1], [$1], [:])
-	m4_ifvaln([$2], [else $2])
-fi
-])

audacious-plugins-3.3.4.tar.bz2/m4/sidplay.m4 Deleted

@@ -1,385 +0,0 @@
-dnl *** These m4-macros are originally based on XSIDPLAY v1.6.5's acinclude.m4
-dnl *** (C) Copyright 2002 Michael Schwendt, licensed under GNU GPL v2.
-dnl ***
-dnl *** Updated for new autotools, plus namespace, added portability
-dnl *** fixes and other minor changes by Matti 'ccr' Hamalainen
-dnl *** (C) Copyright 2003-2008 Tecnic Software productions (TNSP)
-
-AC_DEFUN([XS_FIND_FILE],
-[
- $1=""
- for i in $3; do
- for j in $2; do
- if test -r "$i/$j"; then
- $1="$i"
- break 2
- fi
- done
- done
-])
-
-
-AC_DEFUN([XS_TRY_LIBRARY],
-[
-# xs_try_library ( $1:$2:$3:$4:$5:$6 )
- AC_LANG_ASSERT([C++])
- m4_ifvaln([$2], [xs_cxxflags_save="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $2"])dnl
- m4_ifvaln([$3], [xs_ldflags_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS $3"])dnl
- m4_ifvaln([$4], [xs_libs_save="$LIBS"
- LIBS="$LIBS -l$4"])dnl
- AC_LINK_IFELSE(
- [
- AC_LANG_PROGRAM(
- [#include <$5>],
- [$6]
- )],
- [xs_$1_works="yes"],
- [xs_$1_works="no"]
- )
- m4_ifvaln([$2], [CXXFLAGS="$xs_cxxflags_save"])dnl
- m4_ifvaln([$3], [LDFLAGS="$xs_ldflags_save"])dnl
- m4_ifvaln([$4], [LIBS="$xs_libs_save"])dnl
-])
-
-
-AC_DEFUN([XS_LIB_RESULT],
-[
-# xs_lib_result ( $1:$2:$3 )
- define([Name], [translit([$1], [a-z], [A-Z])])dnl
- if test "x$xs_have_$1" = "xyes"; then
- if test "x$xs_$1_cxxflags" != "x" || test "x$xs_$1_ldflags" != "x"; then
- AC_MSG_RESULT([$xs_$1_cxxflags $2 $xs_$1_ldflags $3])
- else
- AC_MSG_RESULT([yes])
- fi
-
- Name[]_LIBS="$xs_$1_ldflags $2"
- Name[]_CFLAGS="$xs_$1_cxxflags $3"
- AC_SUBST(Name[]_LIBS)dnl
- AC_SUBST(Name[]_CFLAGS)dnl
- else
- AC_MSG_RESULT([no])
- fi
-])
-
-
-AC_DEFUN([XS_PROG_PKGCONFIG],
-[
- AC_PATH_PROG([PKG_CONFIG], [pkg-config])dnl
-])
-
-
-AC_DEFUN([XS_ARG_WITH], [dnl
-# xs_arg_with ( $1:$2:$3 )
- define([Name], [translit([$1], [a-z], [A-Z])])dnl
- define([roflCopter], [Enable $2 with install-PREFIX])dnl
- AH_TEMPLATE(HAVE_[]Name, [Define if you have and want to use $2])dnl
- AC_ARG_WITH([$1],
- [AS_HELP_STRING([--with-$1=PREFIX], roflCopter)], [dnl
- if test "x$withval" = "xyes"; then
- xs_use_$1="yes"
- xs_$1_library=""
- xs_$1_includes=""
- else
- if test "x$withval" = "xno"; then
- xs_use_$1="no"
- else
- xs_use_$1="yes"
- xs_$1_includes="$withval/include"
- xs_$1_library="$withval/lib"
- fi
- fi
- ],[dnl
- xs_use_$1="try"
- xs_$1_library=""
- xs_$1_includes=""
- ])dnl
- define([roflCopter], [Where the $2 headers are located])dnl
- AC_ARG_WITH([$1-inc],
- [AS_HELP_STRING([--with-$1-inc=DIR], roflCopter)],
- [xs_$1_includes="$withval"])dnl
- define([roflCopter], [Where the $2 library is installed])dnl
- AC_ARG_WITH([$1-lib],
- [AS_HELP_STRING([--with-$1-lib=DIR], roflCopter)],
- [xs_$1_library="$withval"])dnl
-
- dnl Okay, handle this
- xs_have_$1="no"
- if test "x$xs_use_$1" = "xtry"; then
- $3
- elif test "x$xs_use_$1" = "xyes"; then
- $3
- if test "x$xs_have_$1" = "xno"; then
- AC_MSG_ERROR([$2 library and/or headers were not found!])
- fi
- fi
-])
-
-
-dnl -------------------------------------------------------------------------
-dnl Try to find SIDPLAY library and header files.
-dnl $xs_have_sidplay1 will be "yes" or "no"
-dnl @SIDPLAY1_LIBS@ will be substituted with linker parameters
-dnl @SIDPLAY1_INCLUDES@ will be substituted with compiler parameters
-dnl -------------------------------------------------------------------------
-
-AC_DEFUN([XS_PATH_LIBSIDPLAY1],
-[
- AC_MSG_CHECKING([for working SIDPlay1 library and headers])
-
- AC_LANG_PUSH([C++])
- 
- dnl Use include path given by user (if any).
- if test "x$xs_sidplay1_includes" != "x"; then
- xs_sidplay1_cxxflags="-I$xs_sidplay1_includes"
- else
- xs_sidplay1_cxxflags=""
- fi
-
- dnl Use library path given by user (if any).
- if test "x$xs_sidplay1_library" != "x"; then
- xs_sidplay1_ldflags="-L$xs_sidplay1_library"
- else
- xs_sidplay1_ldflags=""
- fi
-
- AC_CACHE_VAL([xs_cv_have_sidplay1],
- [
- dnl Run test compilation with either standard search path
- dnl or user-defined paths.
- XS_TRY_LIBSIDPLAY1
- if test "x$xs_sidplay1_works" = "xyes"; then
- xs_cv_have_sidplay1="xs_have_sidplay1=yes \
- xs_sidplay1_cxxflags=\"$xs_sidplay1_cxxflags\" \
- xs_sidplay1_ldflags=\"$xs_sidplay1_ldflags\" "
- else
- XS_FIND_LIBSIDPLAY1 
- fi
- ])
- eval "$xs_cv_have_sidplay1"
- XS_LIB_RESULT([sidplay1], [-lsidplay], [])
- AC_LANG_POP([C++])
-])
-
-dnl Functions used by XS_PATH_LIBSIDPLAY1.
-
-AC_DEFUN([XS_FIND_LIBSIDPLAY1],
-[
- dnl Search common locations where header files might be stored.
- XS_FIND_FILE([xs_sidplay1_includes], [sidplay/sidtune.h],
- [$xs_sidplay1_includes /usr/include /usr/local/include /usr/lib/sidplay/include /usr/local/lib/sidplay/include /opt/sfw/include /opt/csw/include])
-
- dnl Search common locations where library might be stored.
- XS_FIND_FILE([xs_sidplay1_library],
- [libsidplay.a libsidplay.so libsidplay.so.1 libsidplay.so.1.36 libsidplay.so.1.37],
- [$xs_sidplay1_library /usr/lib /usr/lib/sidplay /usr/local/lib/sidplay /opt/sfw/lib /opt/csw/lib])
-
- if test "x$xs_sidplay1_includes" = "x" || test "x$xs_sidplay1_library" = "x"; then
- xs_cv_have_sidplay1="xs_have_sidplay1=no \
- xs_sidplay1_ldflags=\"\" xs_sidplay1_cxxflags=\"\" "
- else
- dnl Test compilation with found paths.
- xs_sidplay1_ldflags="-L$xs_sidplay1_library"
- xs_sidplay1_cxxflags="-I$xs_sidplay1_includes"
- XS_TRY_LIBSIDPLAY1
- xs_cv_have_sidplay1="xs_have_sidplay1=$xs_sidplay1_works \
- xs_sidplay1_ldflags=\"$xs_sidplay1_ldflags\" \
- xs_sidplay1_cxxflags=\"$xs_sidplay1_cxxflags\" "
- fi
-])
-
-AC_DEFUN([XS_TRY_LIBSIDPLAY1],[
- XS_TRY_LIBRARY([sidplay1], [$xs_sidplay1_cxxflags], [$xs_sidplay1_ldflags],
- [sidplay], [sidplay/sidtune.h], [sidTune* myTest = new sidTune(0);])
-])
-
-
-dnl -------------------------------------------------------------------------
-dnl Try to find SIDPLAY2 library and header files.
-dnl $xs_have_sidplay2 will be "yes" or "no"
-dnl @SIDPLAY_LIBS@ will be substituted with linker parameters
-dnl @SIDPLAY_INCLUDES@ will be substituted with compiler parameters
-dnl -------------------------------------------------------------------------
-AC_DEFUN([XS_PATH_LIBSIDPLAY2],
-[
- AC_MSG_CHECKING([for working SIDPlay2 library and headers])
-
- AC_LANG_PUSH([C++])
- 
- AC_REQUIRE([XS_PROG_PKGCONFIG])
- if test "x$PKG_CONFIG" != "x" && $PKG_CONFIG --atleast-version m4_ifval([$1], [$1], [2.1.0]) libsidplay2; then
- xs_pkgcfg_knows="yes"
- else
- xs_pkgcfg_knows="no"
- fi
-
- dnl Derive sidbuilders path from libsidplay2 root.
- if test "x$xs_sidplay2_library" != "x"; then
- xs_sidplay2_builders="$xs_sidplay2_library/sidplay/builders"
- elif test "x$xs_pkgcfg_knows" = "xyes" ; then
- xs_sidplay2_builders=`$PKG_CONFIG --variable=builders libsidplay2`
- fi
-
- AC_CACHE_VAL([xs_cv_have_sidplay2],
- [
- dnl Run test compilation with either standard search path
- dnl or user-defined paths.
- xs_sidplay2_ldflags="-lsidplay2"
- XS_TRY_LIBSIDPLAY2
- if test "x$xs_sidplay2_works" = "xyes"; then
- xs_cv_have_sidplay2="xs_have_sidplay2=yes \
- xs_sidplay2_cxxflags=\"$xs_sidplay2_cxxflags\" \
- xs_sidplay2_ldflags=\"$xs_sidplay2_ldflags\" \
- xs_sidplay2_builders=\"$xs_sidplay2_builders\" "
- else
- XS_FIND_LIBSIDPLAY2
- fi
- ])
- eval "$xs_cv_have_sidplay2"
- XS_LIB_RESULT([sidplay2], [], [])
- AC_LANG_POP([C++])
-])
-
-
-dnl Functions used by XS_PATH_LIBSIDPLAY2.
-AC_DEFUN([XS_FIND_LIBSIDPLAY2],
-[
- dnl See whether user didn't provide paths.
- if test "x$xs_sidplay2_includes" = "x"; then
- if test "x$xs_pkgcfg_knows" = "xyes" ; then
- xs_sidplay2_includes=`$PKG_CONFIG --variable=includedir libsidplay2`
- xs_sidplay2_cxxflags=`$PKG_CONFIG --cflags libsidplay2`
- else
- dnl Search common locations where header files might be stored.
- XS_FIND_FILE([xs_sidplay2_includes], [sidplay/sidplay2.h],
- [$xs_sidplay2_includes $xs_sidplay2_includes/include /usr/include /usr/local/include /usr/lib/sidplay/include /usr/local/lib/sidplay/include /opt/sfw/include /opt/csw/include])
- xs_sidplay2_cxxflags="-I$xs_sidplay2_includes"
- fi
- else
- xs_sidplay2_cxxflags="-I$xs_sidplay2_includes"
- fi
- if test "x$xs_sidplay2_library" = "x"; then
- if test "x$xs_pkgcfg_knows" = "xyes" ; then
- xs_sidplay2_library=`$PKG_CONFIG --variable=libdir libsidplay2`
- xs_sidplay2_ldflags=`$PKG_CONFIG --libs libsidplay2`
- xs_sidplay2_builders=`$PKG_CONFIG --variable=builders libsidplay2`
- else
- dnl Search common locations where library might be stored.
- XS_FIND_FILE([xs_sidplay2_library], [libsidplay2.la],
- [$xs_sidplay2_library $xs_sidplay2_library/lib $xs_sidplay2_library/src /usr/lib /usr/lib/sidplay /usr/local/lib/sidplay /opt/sfw/lib /opt/csw/lib])
- xs_sidplay2_ldflags="-L$xs_sidplay2_library -lsidplay2"
- xs_sidplay2_builders="$xs_sidplay2_library/sidplay/builders"
- fi
- else
- xs_sidplay2_ldflags="-L$xs_sidplay2_library -lsidplay2"
- fi
- if test "x$xs_sidplay2_includes" = "x" || test "x$xs_sidplay2_library" = "x"; then
- xs_cv_have_sidplay2="xs_have_sidplay2=no \
- xs_sidplay2_ldflags=\"\" xs_sidplay2_cxxflags=\"\" \
- xs_sidplay2_builders=\"\" "
- else
- dnl Test compilation with found paths.
- xs_sidplay2_ldflags="-L$xs_sidplay2_library -lsidplay2"
- xs_sidplay2_cxxflags="-I$xs_sidplay2_includes"
- XS_TRY_LIBSIDPLAY2
- xs_cv_have_sidplay2="xs_have_sidplay2=$xs_sidplay2_works \
- xs_sidplay2_ldflags=\"$xs_sidplay2_ldflags\" \
- xs_sidplay2_cxxflags=\"$xs_sidplay2_cxxflags\" \
- xs_sidplay2_builders=\"$xs_sidplay2_builders\" "
- fi
-])
-
-
-AC_DEFUN([XS_TRY_LIBSIDPLAY2],
-[
- XS_TRY_LIBRARY([sidplay2],
- [$xs_sidplay2_cxxflags -DHAVE_UNIX], [$xs_sidplay2_ldflags],
- [sidplay2], [sidplay/sidplay2.h], [sidplay2 *myEngine;])
-])
-
-
-dnl -------------------------------------------------------------------------
-dnl Find libsidplay2 builders (sidbuilders) dir.
-dnl @BUILDERS_CFLAGS@
-dnl @BUILDERS_LDFLAGS@
-dnl -------------------------------------------------------------------------
-AC_DEFUN([XS_BUILDERS_CHECK],
-[
- AC_MSG_CHECKING([for SIDPlay2 builders directory])
- AC_LANG_ASSERT([C++])
- AC_REQUIRE([XS_PATH_LIBSIDPLAY2])
-
- dnl Sidbuilder headers are included with "builders" prefix.
- builders_includedir="$xs_sidplay2_includes"
- builders_libdir="$xs_sidplay2_builders"
-
- dnl If libsidplay2 is in standard library search path, we need
- dnl to get an argument whether /usr, /usr/local, etc. Else we
- dnl can only use ${libdir}/sidplay/builders, but then are
- dnl unable to check whether files exist as long as ${exec_prefix}
- dnl is not defined in the configure script. So, this is a bit
- dnl ugly, but a satisfactory fallback default for those who
- dnl define ${prefix} and ${exec_prefix}.
- if test "x$builders_libdir" = "x"; then
- eval "builders_libdir=$libdir/sidplay/builders"
- fi
-
- AC_ARG_WITH([sidbuilders],
- [AS_HELP_STRING([--with-sidbuilders=DIR], [What the SIDPlay2 builders install PREFIX is])],
- [builders_includedir="$withval/include"
- builders_libdir="$withval/lib/sidplay/builders"])
-
- AC_ARG_WITH([builders-inc],
- [AS_HELP_STRING([--with-builders-inc=DIR], [Where the SIDPlay2 builders headers are located])],
- [builders_includedir="$withval"])
-
- AC_ARG_WITH([builders-lib],
- [AS_HELP_STRING([--with-builders-lib=DIR], [Where the SIDPlay2 builders libraries are installed])],
- [builders_libdir="$withval"])
- 
- if test "x$builders_includedir" != "x"; then
- BUILDERS_CFLAGS="-I$builders_includedir"
- fi
-
- if test "x$builders_libdir" != "x"; then
- BUILDERS_LDFLAGS="-L$builders_libdir"
- fi
-
- if test -d "$builders_libdir"; then
- xs_have_sidbuilders_dir="yes"
- AC_MSG_RESULT([$builders_libdir])
- else
- xs_have_sidbuilders_dir="no"
- AC_MSG_RESULT([$xs_have_sidbuilders_dir])
- AC_MSG_ERROR([$builders_libdir not found!
-Check --help on how to specify SIDPlay2 and/or builders library and
-header path, or set --exec-prefix to the same prefix as your installation
-of libsidplay2.
- ])
- fi
-
- AC_SUBST([BUILDERS_CFLAGS])
- AC_SUBST([BUILDERS_LDFLAGS])
-])
-
-
-dnl -------------------------------------------------------------------------
-dnl Test for working builders
-dnl -------------------------------------------------------------------------
-AC_DEFUN([XS_BUILDERS_FIND], [dnl
- define([Name], [translit([$1], [a-z], [A-Z])])dnl
- AH_TEMPLATE(HAVE_[]Name[]_BUILDER, [Define if you have $1 for libSIDPlay 2])
- AC_MSG_CHECKING([for $1 builder module])
- XS_TRY_LIBRARY([builders], [$BUILDERS_CFLAGS], [$BUILDERS_LDFLAGS],
- [$2], [sidplay/builders/$3], [$4 *sid;])
- if test "x$xs_builders_works" = "xyes"; then
- xs_builders_available="yes"
- xs_builders="$1 $xs_builders"
- AC_DEFINE(HAVE_[]Name[]_BUILDER)
- BUILDERS_LIBS="$BUILDERS_LIBS -l$2"
- fi
- AC_MSG_RESULT([$xs_builders_works])
- AC_SUBST([BUILDERS_LIBS])
-])

audacious-plugins-3.3.4.tar.bz2/src/aac/aac_utils.c Deleted

@@ -1,117 +0,0 @@
-/*
- *
- * utils for AAC informations
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define ADTS_HEADER_SIZE 8
-#define SEEK_TABLE_CHUNK 60
-#define MPEG4_TYPE 0
-#define MPEG2_TYPE 1
-
-// Read ADTS header, the file descriptor must be at
-// the begining of the aac frame not at the id3tag
-
-int getAacInfo (FILE * fd)
-{
- unsigned char header[ADTS_HEADER_SIZE];
- unsigned int id;
- unsigned long originPosition;
-
- originPosition = ftell (fd);
- if (fread (header, 1, ADTS_HEADER_SIZE, fd) != ADTS_HEADER_SIZE)
- {
- fseek (fd, originPosition, SEEK_SET);
- return (-1);
- }
- if (!((header[0] == 0xFF) && ((header[1] & 0xF6) == 0xF0)))
- {
- printf ("Bad header\n");
- return (-1);
- }
- id = header[1] & 0x08;
- if (id == 0)
- { //MPEG-4 AAC
- fseek (fd, originPosition, SEEK_SET);
- return (MPEG4_TYPE);
- }
- else
- {
- fseek (fd, originPosition, SEEK_SET);
- return (MPEG2_TYPE);
- }
- fseek (fd, originPosition, SEEK_SET);
- return (-1);
-}
-
-// as AAC is VBR we need to check all ADTS header
-// to enable seeking...
-// there is no other solution
-void checkADTSForSeeking (FILE * fd,
- unsigned long **seekTable, unsigned long *seekTableLength)
-{
- unsigned long originPosition;
- unsigned long position;
- unsigned int frameCount, frameLength, frameInsec;
- unsigned int /* id = 0, */ seconds = 0;
- char header[ADTS_HEADER_SIZE];
-
- originPosition = ftell (fd);
-
- for (frameCount = 0, frameInsec = 0;; frameCount++, frameInsec++)
- {
- position = ftell (fd);
- if (fread (header, 1, ADTS_HEADER_SIZE, fd) != ADTS_HEADER_SIZE)
- {
- break;
- }
-
- if (! strncmp (header, "ID3", 3))
- break;
-
- if (!frameCount)
- {
- /* id = header[1] & 0x08; */
- if (((*seekTable) =
- malloc (SEEK_TABLE_CHUNK * sizeof (unsigned long))) == 0)
- {
- printf ("malloc error\n");
- return;
- }
- (*seekTableLength) = SEEK_TABLE_CHUNK;
- }
-
- //if(id==0){//MPEG-4
- //frameLength = ((unsigned int)header[4]<<5)|((unsigned int)header[5]>>3);
- //}else{//MPEG-2
- frameLength =
- (((unsigned int) header[3] & 0x3) << 11) | ((unsigned int) header[4] <<
- 3) | (header[5] >> 5);
- //}
- if (frameInsec == 43)
- { //???
- frameInsec = 0;
- }
- if (frameInsec == 0)
- {
- if (seconds == (*seekTableLength))
- {
- (*seekTable) =
- realloc ((*seekTable),
- (seconds + SEEK_TABLE_CHUNK) * sizeof (unsigned long));
- (*seekTableLength) = seconds + SEEK_TABLE_CHUNK;
- }
- (*seekTable)[seconds] = position;
- seconds++;
- }
- if (fseek (fd, frameLength - ADTS_HEADER_SIZE, SEEK_CUR) == -1)
- {
- break;
- }
- }
- (*seekTableLength) = seconds;
- fseek (fd, originPosition, SEEK_SET);
-}

audacious-plugins-3.3.4.tar.bz2/src/aac/m4a.xpm Deleted

@@ -1,958 +0,0 @@
-/* XPM */
-static char * m4a_xpm[] = {
-"48 52 903 2",
-" 	c None",
-". 	c #000000",
-"+ 	c #010100",
-"@ 	c #020201",
-"# 	c #030201",
-"$ 	c #232323",
-"% 	c #1F1F1F",
-"& 	c #DADADA",
-"* 	c #FFFFFF",
-"= 	c #F6F6F6",
-"- 	c #CFCFCF",
-"; 	c #707070",
-"> 	c #FFFFFE",
-", 	c #FEFEFE",
-"' 	c #FBFBFB",
-") 	c #EDEDED",
-"! 	c #C0C0C0",
-"~ 	c #FFFEFE",
-"{ 	c #F8F5F2",
-"] 	c #EBE7E1",
-"^ 	c #ECEDE8",
-"/ 	c #ECEFEA",
-"( 	c #E6E9E4",
-"_ 	c #CED0CE",
-": 	c #BCBFBC",
-"< 	c #F0F0EF",
-"[ 	c #FEFEFD",
-"} 	c #F7F7F7",
-"| 	c #D7D7D7",
-"1 	c #F1F1F1",
-"2 	c #B7B7B7",
-"3 	c #EAEDEA",
-"4 	c #8EA299",
-"5 	c #697D70",
-"6 	c #546459",
-"7 	c #404D44",
-"8 	c #2C352F",
-"9 	c #4E5649",
-"0 	c #D6D8D3",
-"a 	c #D2D2D2",
-"b 	c #AEAEAE",
-"c 	c #070707",
-"d 	c #FCFCFB",
-"e 	c #6D7C75",
-"f 	c #5A5D4C",
-"g 	c #6B735F",
-"h 	c #6E7B63",
-"i 	c #5B6052",
-"j 	c #4A5042",
-"k 	c #CED0CB",
-"l 	c #FEFDFD",
-"m 	c #FDFDFD",
-"n 	c #B8B8B8",
-"o 	c #DCDCDC",
-"p 	c #A4A4A3",
-"q 	c #0E0E0E",
-"r 	c #8A928F",
-"s 	c #6A7F68",
-"t 	c #4D564E",
-"u 	c #4E5950",
-"v 	c #585E57",
-"w 	c #333530",
-"x 	c #9D9C9B",
-"y 	c #FCFDFE",
-"z 	c #FDFEFE",
-"A 	c #FDFDFE",
-"B 	c #F5F5F4",
-"C 	c #B5B5B5",
-"D 	c #F9F9F9",
-"E 	c #FCFCFC",
-"F 	c #CBCBCB",
-"G 	c #A5A5A5",
-"H 	c #CECDCB",
-"I 	c #788976",
-"J 	c #C6BDBB",
-"K 	c #E2E2E2",
-"L 	c #E2E0DF",
-"M 	c #656A65",
-"N 	c #4A4B49",
-"O 	c #EAEDF1",
-"P 	c #CED5DD",
-"Q 	c #DBE0E9",
-"R 	c #DDE1E9",
-"S 	c #D3D7DD",
-"T 	c #D9DCE1",
-"U 	c #F4F4F4",
-"V 	c #ACACAC",
-"W 	c #ECECEC",
-"X 	c #C3C3C3",
-"Y 	c #C2C2C2",
-"Z 	c #C9C9C8",
-"` 	c #A8A8A8",
-" .	c #F6F8F6",
-"..	c #A7ADA5",
-"+.	c #6D7F71",
-"@.	c #ECECE9",
-"#.	c #FDFDFC",
-"$.	c #939C9A",
-"%.	c #1B2321",
-"&.	c #FCFBFA",
-"*.	c #F2F6F9",
-"=.	c #B4BFCC",
-"-.	c #7E8A9B",
-";.	c #515B6F",
-">.	c #50596A",
-",.	c #737D8D",
-"'.	c #BEC6CE",
-").	c #C4CBD5",
-"!.	c #BFC5D1",
-"~.	c #F1F2F4",
-"{.	c #F4F4F3",
-"].	c #ABABAB",
-"^.	c #515151",
-"/.	c #474747",
-"(.	c #464645",
-"_.	c #464646",
-":.	c #5D5D5C",
-"<.	c #A9A9A9",
-"[.	c #FAFAF9",
-"}.	c #EDEFF0",
-"|.	c #F1F5F5",
-"1.	c #636E62",
-"2.	c #636E5F",
-"3.	c #D4D5D3",
-"4.	c #FBF7F4",
-"5.	c #9BA595",
-"6.	c #657366",
-"7.	c #001514",
-"8.	c #FCFAF8",
-"9.	c #FDFCFC",
-"0.	c #FBF9F7",
-"a.	c #E3E6EA",
-"b.	c #9DACBF",
-"c.	c #515A6D",
-"d.	c #111828",
-"e.	c #131B29",
-"f.	c #0F1A2B",
-"g.	c #081125",
-"h.	c #0D1328",
-"i.	c #C2C9D1",
-"j.	c #C5CBD4",
-"k.	c #A6AEBB",
-"l.	c #F6F6F7",
-"m.	c #FAFAFA",
-"n.	c #F2F2F2",
-"o.	c #F3F3F3",
-"p.	c #AAAAAA",
-"q.	c #A0A09F",
-"r.	c #8A8A8A",
-"s.	c #7A7A7A",
-"t.	c #6C6C6C",
-"u.	c #454545",
-"v.	c #ABB3AF",
-"w.	c #A8B6A3",
-"x.	c #D0DBD0",
-"y.	c #F2F3F0",
-"z.	c #DEE1E0",
-"A.	c #66736A",
-"B.	c #354336",
-"C.	c #556254",
-"D.	c #C5C7C6",
-"E.	c #F2EDEA",
-"F.	c #CADAD9",
-"G.	c #9BA893",
-"H.	c #1B3128",
-"I.	c #FCF4EF",
-"J.	c #FDFBF9",
-"K.	c #DDDFE4",
-"L.	c #97A3B4",
-"M.	c #374152",
-"N.	c #0D131C",
-"O.	c #1C2026",
-"P.	c #262C3A",
-"Q.	c #242E43",
-"R.	c #202D41",
-"S.	c #172538",
-"T.	c #121523",
-"U.	c #BABCC3",
-"V.	c #9DA6B5",
-"W.	c #BABEC4",
-"X.	c #F8F8F7",
-"Y.	c #E7E7E7",
-"Z.	c #C6C6C5",
-"`.	c #BABAB9",
-" +	c #E7E9E9",
-".+	c #63736C",
-"++	c #464945",
-"@+	c #5F7361",
-"#+	c #CED4C3",
-"$+	c #DBDEDA",
-"%+	c #979999",
-"&+	c #404342",
-"*+	c #606E6B",
-"=+	c #E5E5E3",
-"-+	c #4B5F52",
-";+	c #455845",
-">+	c #2D362F",
-",+	c #FCFAF9",
-"'+	c #E4E4E7",
-")+	c #97A8B9",
-"!+	c #343C4A",
-"~+	c #13181E",
-"{+	c #1B2027",
-"]+	c #1D232B",
-"^+	c #1F2632",
-"/+	c #212A3C",
-"(+	c #242F45",
-"_+	c #2A374D",
-":+	c #121C2F",
-"<+	c #525A67",
-"[+	c #D9DDE5",
-"}+	c #737C8C",
-"|+	c #EAEBEB",
-"1+	c #F7F7F6",
-"2+	c #F6F6F5",
-"3+	c #F5F5F5",
-"4+	c #EDEDEB",
-"5+	c #FBFBFA",
-"6+	c #6C8175",
-"7+	c #778673",
-"8+	c #121613",
-"9+	c #4C504A",
-"0+	c #8FA695",
-"a+	c #E2DCD8",
-"b+	c #E5E6E7",
-"c+	c #FBFAF9",
-"d+	c #CAC6C1",
-"e+	c #847F79",
-"f+	c #FCFAFA",
-"g+	c #ECE9E9",
-"h+	c #A6B1C4",
-"i+	c #232B37",
-"j+	c #12171E",
-"k+	c #191F27",
-"l+	c #1D222B",
-"m+	c #1E242B",
-"n+	c #1E252F",
-"o+	c #202937",
-"p+	c #232F44",
-"q+	c #283853",
-"r+	c #253046",
-"s+	c #0A1526",
-"t+	c #D5D7DB",
-"u+	c #727D90",
-"v+	c #CFD0D2",
-"w+	c #B1B1B1",
-"x+	c #99A597",
-"y+	c #7B9173",
-"z+	c #65705D",
-"A+	c #1F201B",
-"B+	c #58655E",
-"C+	c #F3F2F1",
-"D+	c #AAB3C1",
-"E+	c #525C6D",
-"F+	c #0A0F17",
-"G+	c #1C2129",
-"H+	c #1E242A",
-"I+	c #1E242C",
-"J+	c #1F232D",
-"K+	c #232E41",
-"L+	c #2B3855",
-"M+	c #2C3B57",
-"N+	c #070D1F",
-"O+	c #A3ABB6",
-"P+	c #828EA0",
-"Q+	c #B9BCC2",
-"R+	c #F3F3F2",
-"S+	c #F1EFEC",
-"T+	c #72886D",
-"U+	c #4E5849",
-"V+	c #748268",
-"W+	c #808080",
-"X+	c #D6D9DE",
-"Y+	c #5E6A7A",
-"Z+	c #121621",
-"`+	c #161D26",
-" @	c #1D242C",
-".@	c #1F242B",
-"+@	c #1E2427",
-"@@	c #212C3F",
-"#@	c #283552",
-"$@	c #2F405D",
-"%@	c #0E162B",
-"&@	c #59657B",
-"*@	c #8A98AA",
-"=@	c #AFB4BC",
-"-@	c #F2F2F1",
-";@	c #7D9074",
-">@	c #494949",
-",@	c #676D65",
-"'@	c #C8CBC7",
-")@	c #818B9B",
-"!@	c #1B232F",
-"~@	c #0F151F",
-"{@	c #1B212B",
-"]@	c #1E232D",
-"^@	c #20252C",
-"/@	c #24272C",
-"(@	c #1F2429",
-"_@	c #1C2228",
-":@	c #1F2A3C",
-"<@	c #1F2A40",
-"[@	c #25344E",
-"}@	c #314464",
-"|@	c #15223A",
-"1@	c #34445E",
-"2@	c #939FB3",
-"3@	c #ACB2BC",
-"4@	c #F1F1F0",
-"5@	c #ECEEEB",
-"6@	c #B8BCB7",
-"7@	c #647C65",
-"8@	c #797E78",
-"9@	c #C4C3C2",
-"0@	c #919191",
-"a@	c #DCE3EA",
-"b@	c #242C3D",
-"c@	c #0B101C",
-"d@	c #1A212A",
-"e@	c #1F242C",
-"f@	c #21252C",
-"g@	c #222629",
-"h@	c #1C232A",
-"i@	c #212B3D",
-"j@	c #33415B",
-"k@	c #27344B",
-"l@	c #212F47",
-"m@	c #374A68",
-"n@	c #1A2840",
-"o@	c #34445F",
-"p@	c #96A3B5",
-"q@	c #B3B7C0",
-"r@	c #F2F2F0",
-"s@	c #F0F0F0",
-"t@	c #E2E7E2",
-"u@	c #939E92",
-"v@	c #50644E",
-"w@	c #3D443E",
-"x@	c #D4D2CF",
-"y@	c #7F8898",
-"z@	c #020A14",
-"A@	c #171E28",
-"B@	c #1C222A",
-"C@	c #1E232B",
-"D@	c #1F242D",
-"E@	c #1F2228",
-"F@	c #1D2328",
-"G@	c #283449",
-"H@	c #4A5C7B",
-"I@	c #697D98",
-"J@	c #4D5D79",
-"K@	c #1F2D45",
-"L@	c #394A6B",
-"M@	c #1B2943",
-"N@	c #425371",
-"O@	c #95A3B5",
-"P@	c #B8BDC2",
-"Q@	c #EFEFEE",
-"R@	c #EFEFED",
-"S@	c #EDEEED",
-"T@	c #EFF0F0",
-"U@	c #F7FCF3",
-"V@	c #313F30",
-"W@	c #1C2120",
-"X@	c #C9CBC9",
-"Y@	c #F9F9F8",
-"Z@	c #E9EEF2",
-"`@	c #3C4352",
-" #	c #0C111D",
-".#	c #1E232E",
-"+#	c #1D212A",
-"@#	c #20242C",
-"##	c #1B1D20",
-"$#	c #263043",
-"%#	c #576886",
-"&#	c #8396B1",
-"*#	c #7A8FAD",
-"=#	c #677B99",
-"-#	c #28374F",
-";#	c #384A69",
-">#	c #182642",
-",#	c #5D708F",
-"'#	c #828FA3",
-")#	c #C5C7CB",
-"!#	c #F1F1EF",
-"~#	c #EEEEED",
-"{#	c #EEEEEC",
-"]#	c #9DA7A4",
-"^#	c #2A3B34",
-"/#	c #222725",
-"(#	c #80807E",
-"_#	c #EFEEEC",
-":#	c #F1F0EF",
-"<#	c #F4F3F2",
-"[#	c #F8F8F8",
-"}#	c #A8AFBB",
-"|#	c #0D1522",
-"1#	c #1A212E",
-"2#	c #1D232C",
-"3#	c #21252D",
-"4#	c #1E2327",
-"5#	c #171B20",
-"6#	c #637593",
-"7#	c #95A6BE",
-"8#	c #6D7F9C",
-"9#	c #617395",
-"0#	c #5A6E8B",
-"a#	c #2A354A",
-"b#	c #3D4E6D",
-"c#	c #1C2A46",
-"d#	c #748DAB",
-"e#	c #6D798A",
-"f#	c #DEDFE0",
-"g#	c #EEEEEE",
-"h#	c #EDEDEC",
-"i#	c #ECEAE7",
-"j#	c #ADB1B0",
-"k#	c #B5B9BA",
-"l#	c #F1F0F0",
-"m#	c #F9F8F8",
-"n#	c #F7F5F4",
-"o#	c #A7AAA4",
-"p#	c #B7BAB4",
-"q#	c #F7F6F6",
-"r#	c #ECEFF1",
-"s#	c #747F8E",
-"t#	c #0A121E",
-"u#	c #232C3A",
-"v#	c #1D232E",
-"w#	c #222932",
-"x#	c #1B1D21",
-"y#	c #1C273E",
-"z#	c #C1CFE1",
-"A#	c #8FA1B7",
-"B#	c #6D81A0",
-"C#	c #596D93",
-"D#	c #455674",
-"E#	c #293343",
-"F#	c #4A5C7D",
-"G#	c #304060",
-"H#	c #7690B8",
-"I#	c #5D6878",
-"J#	c #BBC0CC",
-"K#	c #ECECEB",
-"L#	c #F6F4F3",
-"M#	c #F4F1EF",
-"N#	c #F7F5F3",
-"O#	c #F9F8F7",
-"P#	c #BBBDB9",
-"Q#	c #4D5852",
-"R#	c #71746D",
-"S#	c #F0EAE7",
-"T#	c #DBDEE3",
-"U#	c #3E495B",
-"V#	c #1C2435",
-"W#	c #273041",
-"X#	c #283040",
-"Y#	c #293141",
-"Z#	c #262B38",
-"`#	c #1D212D",
-" $	c #4A5B77",
-".$	c #CFDBEB",
-"+$	c #7A8FAC",
-"@$	c #6C83A5",
-"#$	c #4D6389",
-"$$	c #35445E",
-"%$	c #404D60",
-"&$	c #506586",
-"*$	c #4F6687",
-"=$	c #6983AB",
-"-$	c #343E50",
-";$	c #4D5F7A",
-">$	c #B8C0CC",
-",$	c #F7F6F5",
-"'$	c #D2D6D3",
-")$	c #6C866F",
-"!$	c #5A715E",
-"~$	c #566758",
-"{$	c #B5C1B4",
-"]$	c #B2BAC8",
-"^$	c #273245",
-"/$	c #29354A",
-"($	c #323D53",
-"_$	c #364258",
-":$	c #333F52",
-"<$	c #343F52",
-"[$	c #28354A",
-"}$	c #6D7B92",
-"|$	c #ACBDD2",
-"1$	c #5B7297",
-"2$	c #495F87",
-"3$	c #3A4D6B",
-"4$	c #252F44",
-"5$	c #8292AC",
-"6$	c #586E94",
-"7$	c #6782A9",
-"8$	c #37404D",
-"9$	c #394860",
-"0$	c #475977",
-"a$	c #6E7E99",
-"b$	c #EBEBEA",
-"c$	c #BEC3BE",
-"d$	c #CFD1CE",
-"e$	c #F4F2F0",
-"f$	c #7D8F84",
-"g$	c #6A8667",
-"h$	c #D5D8D4",
-"i$	c #6B6B6B",
-"j$	c #9E9E9F",
-"k$	c #7A8EA8",
-"l$	c #2B374D",
-"m$	c #313E56",
-"n$	c #34425B",
-"o$	c #36425A",
-"p$	c #354257",
-"q$	c #39465D",
-"r$	c #3B4963",
-"s$	c #64738B",
-"t$	c #768CAD",
-"u$	c #354C72",
-"v$	c #2E3D5B",
-"w$	c #1D273A",
-"x$	c #3D4655",
-"y$	c #A7BACE",
-"z$	c #607799",
-"A$	c #617494",
-"B$	c #191B1B",
-"C$	c #445675",
-"D$	c #3A4A65",
-"E$	c #6C7A91",
-"F$	c #ECECEA",
-"G$	c #EAEAE9",
-"H$	c #EAEAE8",
-"I$	c #F7F6F4",
-"J$	c #B5B9B6",
-"K$	c #D7DCD9",
-"L$	c #7B8982",
-"M$	c #A9AEAD",
-"N$	c #517257",
-"O$	c #839284",
-"P$	c #DEDEDD",
-"Q$	c #D8D9D9",
-"R$	c #F3F2EE",
-"S$	c #51698C",
-"T$	c #313F55",
-"U$	c #35435B",
-"V$	c #36445A",
-"W$	c #35425C",
-"X$	c #37465D",
-"Y$	c #3D4A62",
-"Z$	c #516079",
-"`$	c #47536A",
-" %	c #354561",
-".%	c #212F46",
-"+%	c #0F1624",
-"@%	c #1A2231",
-"#%	c #99A5B7",
-"$%	c #97A8C3",
-"%%	c #6A7DA0",
-"&%	c #394559",
-"*%	c #1C1D26",
-"=%	c #35435C",
-"-%	c #344159",
-";%	c #8E96A2",
-">%	c #E9E9E8",
-",%	c #E9E9E7",
-"'%	c #F6F5F5",
-")%	c #70827F",
-"!%	c #C6D0C3",
-"~%	c #445344",
-"{%	c #637161",
-"]%	c #4B6C4C",
-"^%	c #CAC8C8",
-"/%	c #3D5271",
-"(%	c #3A4863",
-"_%	c #384862",
-":%	c #3E4C65",
-"<%	c #424D67",
-"[%	c #45536C",
-"}%	c #4D5A74",
-"|%	c #66768F",
-"1%	c #76869D",
-"2%	c #2A3243",
-"3%	c #151A27",
-"4%	c #252C3A",
-"5%	c #B2BBCE",
-"6%	c #C3D0E3",
-"7%	c #7B8CA9",
-"8%	c #51627E",
-"9%	c #171C22",
-"0%	c #141920",
-"a%	c #242C3A",
-"b%	c #3F4B60",
-"c%	c #BDC0C6",
-"d%	c #EBEBE9",
-"e%	c #D1D7D3",
-"f%	c #4F5753",
-"g%	c #27322D",
-"h%	c #57655B",
-"i%	c #7E8B86",
-"j%	c #F0EFED",
-"k%	c #3E516C",
-"l%	c #3F4E68",
-"m%	c #3C4A64",
-"n%	c #4C5A74",
-"o%	c #55637C",
-"p%	c #5A6881",
-"q%	c #707D95",
-"r%	c #8493A6",
-"s%	c #BFC8D8",
-"t%	c #D8E4F0",
-"u%	c #CCD5E4",
-"v%	c #E2E8F1",
-"w%	c #D2DAE9",
-"x%	c #8D9DB7",
-"y%	c #526380",
-"z%	c #323E53",
-"A%	c #080B11",
-"B%	c #0E1217",
-"C%	c #272E3A",
-"D%	c #747D8A",
-"E%	c #D6D7D8",
-"F%	c #E8E8E7",
-"G%	c #E8E8E6",
-"H%	c #D2D2D0",
-"I%	c #B3B7B4",
-"J%	c #BFC1BF",
-"K%	c #EBE8E7",
-"L%	c #5A718E",
-"M%	c #3F4C65",
-"N%	c #38475F",
-"O%	c #68768E",
-"P%	c #6E7C92",
-"Q%	c #78879B",
-"R%	c #959FB1",
-"S%	c #AAB4C1",
-"T%	c #C4CBD8",
-"U%	c #D7DCE6",
-"V%	c #D3D9E1",
-"W%	c #CCD3DC",
-"X%	c #8C9CB4",
-"Y%	c #52627B",
-"Z%	c #38475E",
-"`%	c #080E1A",
-" &	c #060910",
-".&	c #0E0F14",
-"+&	c #4F5869",
-"@&	c #B6B8BC",
-"#&	c #DDDDDC",
-"$&	c #E2E2E1",
-"%&	c #E5E5E4",
-"&&	c #E6E6E5",
-"*&	c #F2F1F1",
-"=&	c #F2F1F0",
-"-&	c #93A8C2",
-";&	c #2F3E56",
-">&	c #6C7A93",
-",&	c #939EAE",
-"'&	c #A9B3C0",
-")&	c #BDC3CB",
-"!&	c #C8CCD2",
-"~&	c #CDCFD5",
-"{&	c #CBD2DB",
-"]&	c #C7CFDC",
-"^&	c #A4B2C7",
-"/&	c #4C576D",
-"(&	c #262C3C",
-"_&	c #252D3B",
-":&	c #232C3D",
-"<&	c #323B4B",
-"[&	c #464B5A",
-"}&	c #959697",
-"|&	c #BDBDBC",
-"1&	c #C9C9C9",
-"2&	c #D6D6D5",
-"3&	c #E2E2E0",
-"4&	c #E7E7E6",
-"5&	c #E6E6E4",
-"6&	c #C8D6E7",
-"7&	c #515D76",
-"8&	c #33415A",
-"9&	c #66728A",
-"0&	c #C0C7D2",
-"a&	c #CACED7",
-"b&	c #CCCDD2",
-"c&	c #CBCED1",
-"d&	c #C8CED3",
-"e&	c #C2CDDB",
-"f&	c #A2B1C5",
-"g&	c #586377",
-"h&	c #181F27",
-"i&	c #363B40",
-"j&	c #575857",
-"k&	c #626261",
-"l&	c #656463",
-"m&	c #787877",
-"n&	c #929291",
-"o&	c #9F9F9D",
-"p&	c #B0B0AE",
-"q&	c #C3C3C2",
-"r&	c #D1D1D0",
-"s&	c #DCDCDB",
-"t&	c #DFE4EB",
-"u&	c #5F708B",
-"v&	c #717E92",
-"w&	c #4F5E78",
-"x&	c #8391A4",
-"y&	c #A9B4C2",
-"z&	c #B1BBC5",
-"A&	c #BAC3CE",
-"B&	c #D5DDE8",
-"C&	c #9EA7B9",
-"D&	c #444D63",
-"E&	c #1F242F",
-"F&	c #2D2F33",
-"G&	c #424242",
-"H&	c #4D4D4D",
-"I&	c #515150",
-"J&	c #575756",
-"K&	c #60605F",
-"L&	c #747473",
-"M&	c #838381",
-"N&	c #989897",
-"O&	c #B3B3B2",
-"P&	c #C6C6C4",
-"Q&	c #D3D3D2",
-"R&	c #F0EFEE",
-"S&	c #D0D1D3",
-"T&	c #959FB4",
-"U&	c #5B697E",
-"V&	c #9DA7B7",
-"W&	c #D8DEE4",
-"X&	c #D4DAE1",
-"Y&	c #DBE1E5",
-"Z&	c #DBDDE3",
-"`&	c #818894",
-" *	c #1E293A",
-".*	c #1B222B",
-"+*	c #222425",
-"@*	c #313131",
-"#*	c #343434",
-"$*	c #363635",
-"%*	c #3A3A3A",
-"&*	c #40403F",
-"**	c #484847",
-"=*	c #585858",
-"-*	c #6B6B6A",
-";*	c #838382",
-">*	c #A5A5A3",
-",*	c #BCBCBA",
-"'*	c #CFCFCE",
-")*	c #EFEFEF",
-"!*	c #E3E3E2",
-"~*	c #D9D9D8",
-"{*	c #BCBCBB",
-"]*	c #9DA0A4",
-"^*	c #616678",
-"/*	c #2F3A4F",
-"(*	c #2C3649",
-"_*	c #394250",
-":*	c #111923",
-"<*	c #010613",
-"[*	c #0A0F16",
-"}*	c #1F2225",
-"|*	c #262628",
-"1*	c #282828",
-"2*	c #292828",
-"3*	c #292929",
-"4*	c #2D2D2C",
-"5*	c #2F2F2F",
-"6*	c #343433",
-"7*	c #3D3D3C",
-"8*	c #5C5C5C",
-"9*	c #A1A1A0",
-"0*	c #B9B9B8",
-"a*	c #CECECC",
-"b*	c #E4E4E2",
-"c*	c #D7D7D5",
-"d*	c #989896",
-"e*	c #717174",
-"f*	c #464B51",
-"g*	c #2F353C",
-"h*	c #23272C",
-"i*	c #222529",
-"j*	c #25272A",
-"k*	c #2E2F31",
-"l*	c #313030",
-"m*	c #313130",
-"n*	c #333332",
-"o*	c #363636",
-"p*	c #3C3C3C",
-"q*	c #545454",
-"r*	c #686867",
-"s*	c #848483",
-"t*	c #A8A8A7",
-"u*	c #C0C0BE",
-"v*	c #D3D3D1",
-"w*	c #D9D9D7",
-"x*	c #C0C0BF",
-"y*	c #A3A3A2",
-"z*	c #888886",
-"A*	c #6E6D6C",
-"B*	c #5F6061",
-"C*	c #585859",
-"D*	c #A3A3A1",
-"E*	c #A2A2A0",
-"F*	c #A2A1A0",
-"G*	c #A2A2A1",
-"H*	c #A3A2A1",
-"I*	c #A4A3A2",
-"J*	c #A4A4A2",
-"K*	c #A6A6A4",
-"L*	c #A9A8A6",
-"M*	c #ABAAA8",
-"N*	c #AFAEAB",
-"O*	c #B3B1AE",
-"P*	c #B5B4B1",
-"Q*	c #B8B6B2",
-"R*	c #BAB8B4",
-"S*	c #6E6B62",
-"T*	c #DEDEDC",
-"U*	c #D1D1CF",
-"V*	c #BFBFBE",
-"W*	c #AFAFAF",
-"X*	c #9F9F9F",
-"Y*	c #919190",
-"Z*	c #302E28",
-"`*	c #2E2C27",
-" =	c #2D2B26",
-".=	c #312F29",
-"+=	c #33312B",
-"@=	c #36332D",
-"#=	c #38362F",
-"$=	c #3C3932",
-"%=	c #403D35",
-"&=	c #46423A",
-"*=	c #4D4940",
-"==	c #514D44",
-"-=	c #535046",
-";=	c #565248",
-">=	c #23211D",
-",=	c #EBEAE9",
-"'=	c #DADAD9",
-")=	c #C9C9C7",
-"!=	c #B2B0AD",
-"~=	c #423F37",
-"{=	c #E3E2E1",
-"]=	c #4E4B44",
-"^=	c #403D36",
-"/=	c #413E37",
-"(=	c #908E8A",
-"_=	c #424039",
-":=	c #48443C",
-"<=	c #A09F9A",
-"[=	c #95938C",
-"}=	c #94928C",
-"|=	c #D5D5D4",
-"1=	c #B6B5B1",
-"2=	c #4E4A41",
-"3=	c #D5D4D2",
-"4=	c #514E46",
-"5=	c #5E5B52",
-"6=	c #504C43",
-"7=	c #4C493F",
-"8=	c #827F78",
-"9=	c #EDECEB",
-"0=	c #D9D9D6",
-"a=	c #D9D8D6",
-"b=	c #E7E7E5",
-"c=	c #CCCBC8",
-"d=	c #C4C2BF",
-"e=	c #C4C3BF",
-"f=	c #555147",
-"g=	c #6C6860",
-"h=	c #F0EFEF",
-"i=	c #7C7971",
-"j=	c #747169",
-"k=	c #DEDDDB",
-"l=	c #E1E1DF",
-"m=	c #67635A",
-"n=	c #F5F4F4",
-"o=	c #67645B",
-"p=	c #E2E1E0",
-"q=	c #9B9993",
-"r=	c #B9B7B3",
-"s=	c #69665D",
-"t=	c #716D65",
-"u=	c #B8B7B2",
-"v=	c #8B8881",
-"w=	c #C0BEBA",
-"x=	c #8C8982",
-"y=	c #5D5A50",
-"z=	c #5D594F",
-"A=	c #E4E4E3",
-"B=	c #989690",
-"C=	c #98958F",
-"D=	c #DDDCDA",
-"E=	c #928F89",
-"F=	c #E3E3E1",
-"G=	c #A9A9A7",
-"H=	c #8D8D8D",
-"I=	c #9A9A9A",
-"J=	c #8C8C8C",
-" . . . . . . . . . . . . . + @ # + . . . . . . . . . . . . . . . . . $ % ",
-". & * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * = - ; . ",
-". * * * * * * * * * * * * * * * * * * * > * * , , , , , , , , , , , , ' = ) ! . ",
-". * * * * * * ~ * * { ] ^ / ( _ : < * * * , [ [ , , , , , , , , , , , } | * 1 2 . ",
-". * * * * * * ~ * * 3 4 5 6 7 8 9 0 * , , , , , , , , , , , , , , , , } a * * ) b c ",
-". * * * * * * * * * d e f g h i j k , , , , , l , , , , , , , , , m m = n * m * o p q ",
-". * * * * * * * * * * r s t u v w x , , , , , l , , y z A m m m m m m B C * D E * F G . ",
-". * * * * * * * * * * H I J K L M N , , , , l m z O P Q R S T ' E E E U V W X F n Y Z ` . ",
-". * * * * * * * * m ...+.@., #.$.%., , , , &.*.=.-.;.>.,.'.).!.~.E d {.].^./.(._._.:.<.. ",
-". * * * * [. .m * }.|.1.2.3.4.5.6.7.8.m 9.0.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.! p.q.r.s.t.u.. ",
-". * * , n.v.w.x.y.z.A.B.C.D.E.F.G.H.I.m J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.D ' } } Y.Z.Z `.s.. ",
-". * * , +.+++@+#+$+%+&+*+=+E -+;+>+,+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+} X.1+2+3+3+3+4+<.. ",
-". * * , 5+6+7+8+9+0+1 a+b+c+E d+e+` f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v+= } 3+3+B B o.o.w+. ",
-". * , , 9.x+y+z+A+B+c+E E E E E E d C+D+E+F+G+l+m+H+I+J+K+L+M+N+O+P+Q+B B B U {.o.R+R+C . ",
-". * m m m S+T+U+V+W+X.E E d ' ' ' ' X+Y+Z+`+ @I+.@.@+@^+@@#@$@%@&@*@=@o.U {.R+R+R+-@-@C . ",
-". * m #.E ' ;@>@,@'@5+' ' ' ' 5+5+m.)@!@~@{@]@^@/@(@_@:@<@[@}@|@1@2@3@{.R+R+n.n.-@4@4@C . ",
-". * E ' 5@6@7@8@9@0@} ' 5+5+m.m.m.a@b@c@d@l+e@f@g@h@i@j@k@l@m@n@o@p@q@n.n.-@r@4@4@s@s@C . ",
-". * d [.t@u@v@w@x@{.m.m.m.m.m.[.m.y@z@A@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@-@-@r@s@s@< Q@R@C . ",
-". * ' S@T@U@V@W@X@m.m.[.[.[.D Y@Z@`@ #.#+#@#D@##$#%#&#*#=#-#;#>#,#'#)#4@!#< < Q@~#~#{#C . ",
-". * 5+3+]#^#/#(#_#[.D :#<#D X.[#}#|#1#2#3#f@4#5#6#7#8#9#0#a#b#c#d#e#f#< < g#g#~#{#h#h#C . ",
-". * m.X.i#j#k#l#m#D n#o#p#q#} r#s#t#u#v#w#^@x#y#z#A#B#C#D#E#F#G#H#I#J#|+~#~#{#h#h#W K#C . ",
-". * [.L#M#N#[#O#O#1+P#Q#R#S#1+T#U#V#W#X#Y#Z#`# $.$+$@$#$$$%$&$*$=$-$;$>${#h#4+4+K#K#K#C . ",
-". * D ,$X.Y@[#[#} '$)$!$~${$3+]$^$/$($_$:$<$[$}$|$1$2$3$4$5$6$7$8$9$0$a$4+4+K#K#b$b$b$C . ",
-". * [#[#[#n#c$d$e$f$g$h$i$j${.k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$z$A$B$C$D$E$K#F$b$b$b$G$H$C . ",
-". * X.1+I$J$K$L$M$N$O$< P$Q$R$S$T$U$V$W$X$Y$Z$`$ %.%+%@%#%$%%%&%*%=%-%;%b$b$b$G$>%>%,%C . ",
-". * = = '%)%!%~%{%]%^%o.R+R+{./%(%_%:%<%[%}%|%1%2%3%4%5%6%7%8%9%0%a%b%c%d%>%>%>%,%,%,%C . ",
-". * 2+2+2+e%f%g%h%i%j%R+-@1 -@k%l%m%n%o%p%q%r%s%t%u%v%w%x%y%z%A%B%C%D%E%F%F%>%,%F%F%G%C . ",
-". * 3+U {.{.H%I%J%K%-@4@4@4@4@L%M%N%O%P%Q%R%S%T%U%V%W%X%Y%Z%`% &.&+&@&#&$&%&&&F%G%G%G%C . ",
-". * {.{.R+n.*&=&=&4@4@4@s@< Q@-&M%;&>&,&'&)&!&~&{&]&^&/&(&_&:&<&[&}&|&1&2&#&3&4&4&4&5&C . ",
-". * n.-@-@-@-@4@4@s@< < < ~#b$6&7&8&9&0&a&b&c&d&e&f&g&h&i&j&k&l&m&n&o&p&q&r&s&4&5&5&%&C . ",
-". * -@-@-@4@< < < < < Q@R@G$%&t&u&v&w&x&y&z&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O&P&Q&%&%&%&%&C . ",
-". * 1 4@< < j%R&Q@Q@R@~#h#&&P$S&T&U&V&W&X&Y&Z&`& *.*+*@*#*$*%*&***=*-*;*>*,*'*%&=+=+=+C . ",
-". * < < )*Q@Q@Q@R@~#~#K#G$!*~*{*]*^*/*(*_*:*<*[*}*|*1*2*3*4*5*6*7*>@8*m&9*0*a*=+=+=+b*C . ",
-". * Q@Q@Q@Q@R@~#{#K#K#K#>%!*c*,*d*e*f*g*h*i*j*k*l*m*5*@*@*n*o*p*u.q*r*s*t*u*v*=+=+b*b*C . ",
-". * Q@Q@~#~#{#K#K#K#K#b$>%!*w*x*y*z*A*B*C*D*E*E*E*E*F*E*G*H*I*J*K*L*M*N*O*P*Q*R*R*R*R*R*R*R*R*S*",
-". * ~#~#4+K#K#F$b$b$b$b$H$5&T*U*V*W*X*N&Y*M*Z*Z*`* = =`*Z*.=+=@=#=$=%=&=*===-=;=;=;=;=;=;=;=;=>=",
-". * 4+K#F$,=,=,=b$d%d%G$H$G%b*'=H%)=x*{*0*!=~=* {=]=^=/=(=* * *=_=:=<=* * ;=;=;=[=* * }=;=;=;=>=",
-". * F$b$b$b$d%G$G$G$G$H$H$G%5&3&#&~*|=Q&Q&1=2=* * 3=4=5={.* * 6=7=8=9=* * ;=;=;=0=* * a=;=;=;=>=",
-". * d%d%G$G$G$G$G$H$H$G%G%G%G%b=b=b=b=b=&&R*;=* c=* d=e=c=* * f=g=h=i=* * ;=;=j=* k=l=* j=;=;=>=",
-". * G$G$G$H$H$>%>%F%G%G%G%b=b=b=b=b=5&5&=+R*;=* m={.* n=o=* * ;=p=q=;=* * ;=;=r=< s=t=X.u=;=;=>=",
-". * H$>%>%>%>%F%G%G%4&4&b=b=b=b=5&5&=+=+=+R*;=* ;=v=w=x=;=* * ;=* * * * * * y=B * * * * B z=;=>=",
-". * >%>%>%G%4&4&4&4&b=b=b=&&&&5&=+=+=+=+A=R*;=* ;=;=;=;=;=* * ;=;=;=;=* * ;=B=* 3=;=;=3=* C=;=>=",
-". * ,%4&4&4&4&b=b=b=&&&&&&5&=+=+=+A=A=b*b*R*;=* ;=;=;=;=;=* * ;=;=;=;=* * ;=D=* E=;=;=E=* D=;=>=",
-". * 4&b=b=b=&&&&&&&&5&5&=+A=A=A=b*b*b*b*b*R*;=;=;=;=;=;=;=;=;=;=;=;=;=;=;=;=;=;=;=;=;=;=;=;=;=>=",
-". * b=&&&&&&5&5&5&5&A=A=b*b*b*b*b*b*b*b*b*S*>=>=>=>=>=>=>=>=>=>=>=>=>=>=>=>=>=>=>=>=>=>=>=>=>=>=",
-". * &&5&5&5&5&%&A=b*b*b*b*b*b*b*b*b*b*F=F=F=G=G=p p p y*y*y*y*D*D*D*D*D*D*D*D*D*D*D*D*H=. ",
-". & 5&5&5&=+b*b*b*b*b*b*b*b*b*b*!*F=F=F=F=F=F=F=F=3&3&3&3&l=l=l=l=l=l=l=l=l=l=l=l=l=l=I=. ",
-". Y C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C C I=J=. ",
-" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
-" ",
-" ",
-" "};

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/amidi-plug.h Deleted

@@ -1,70 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2006
-*
-* This program is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the License, or (at your
-* option) any later version.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along
-* with this program; if not, write to the Free Software Foundation, Inc.,
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*/
-
-#ifndef _I_AMIDIPLUG_H
-#define _I_AMIDIPLUG_H 1
-
-#define AMIDIPLUG_STOP	0
-#define AMIDIPLUG_PLAY	1
-#define AMIDIPLUG_PAUSE	2
-#define AMIDIPLUG_ERR	4
-
-#include "i_common.h"
-#include <audacious/plugin.h>
-
-#include "i_vfslayer.h"
-#include "i_backend.h"
-#include "i_configure.h"
-#include "i_midi.h"
-#include "i_fileinfo.h"
-#include "i_utils.h"
-
-gint amidiplug_playing_status = AMIDIPLUG_STOP;
-
-midifile_t midifile;
-
-amidiplug_sequencer_backend_t backend;
-
-amidiplug_cfg_ap_t amidiplug_cfg_ap =
-{
- NULL,		/* ap_seq_backend */
- 0,		/* ap_opts_transpose_value */
- 0,		/* ap_opts_drumshift_value */
- 0,		/* ap_opts_length_precalc */
- 0,		/* ap_opts_comments_extract */
- 0		/* ap_opts_lyrics_extract */
-};
-
-static const gchar * const amidiplug_vfs_extensions[] = {"mid", "midi", "rmi",
- "rmid", NULL};
-
-void amidiplug_skipto( gint );
-static gboolean amidiplug_init (void);
-static void amidiplug_cleanup( void );
-static void amidiplug_aboutbox( void );
-static void amidiplug_configure( void );
-static gint amidiplug_is_our_file_from_vfs( const gchar * , VFSFile * );
-static void amidiplug_stop( InputPlayback * );
-static gint amidiplug_get_time( InputPlayback * );
-static gint amidiplug_get_volume( gint * , gint * );
-static gint amidiplug_set_volume( gint , gint );
-static void amidiplug_file_info_box( const gchar * );
-
-#endif /* !_I_AMIDIPLUG_H */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/backend-alsa/b-alsa-config.h Deleted

@@ -1,35 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2006
-*
-* This program is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the License, or (at your
-* option) any later version.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along
-* with this program; if not, write to the Free Software Foundation, Inc.,
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*/
-
-#ifndef _B_ALSA_CONFIG_H
-#define _B_ALSA_CONFIG_H 1
-
-
-typedef struct
-{
- gchar *	alsa_seq_wports;
- gint		alsa_mixer_card_id;
- gchar *	alsa_mixer_ctl_name;
- gint		alsa_mixer_ctl_id;
-}
-amidiplug_cfg_alsa_t;
-
-
-#endif /* !_B_ALSA_CONFIG_H */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/backend-fluidsynth/b-fluidsynth-config.h Deleted

@@ -1,38 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2006
-*
-* This program is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the License, or (at your
-* option) any later version.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along
-* with this program; if not, write to the Free Software Foundation, Inc.,
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*/
-
-#ifndef _B_FLUIDSYNTH_CONFIG_H
-#define _B_FLUIDSYNTH_CONFIG_H 1
-
-
-typedef struct
-{
- gchar *	fsyn_soundfont_file;
- gint		fsyn_soundfont_load;
- gint		fsyn_synth_samplerate;
- gint		fsyn_synth_gain;
- gint		fsyn_synth_polyphony;
- gint		fsyn_synth_reverb;
- gint		fsyn_synth_chorus;
-}
-amidiplug_cfg_fsyn_t;
-
-
-#endif /* !_B_FLUIDSYNTH_CONFIG_H */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_configure_file.h Deleted

@@ -1,29 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2006
-*
-* This program is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the License, or (at your
-* option) any later version.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along
-* with this program; if not, write to the Free Software Foundation, Inc.,
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*/
-
-#ifndef _I_CONFIGURE_FILE_H
-#define _I_CONFIGURE_FILE_H 1
-
-#include <glib.h>
-
-typedef gchar * (*i_cfg_get_file_cb)( void );
-gchar * i_configure_cfg_get_file( void );
-
-#endif /* !_I_CONFIGURE_FILE_H */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_configure_private.h Deleted

@@ -1,40 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2006
-*
-* This program is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the License, or (at your
-* option) any later version.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along
-* with this program; if not, write to the Free Software Foundation, Inc.,
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*/
-
-#ifndef _I_CONFIGURE_PRIVATE_H
-#define _I_CONFIGURE_PRIVATE_H 1
-
-#include "i_common.h"
-#include "i_backend.h"
-#include "pcfg/i_pcfg.h"
-#include <gtk/gtk.h>
-
-
-typedef struct
-{
- gpointer alsa; /* advanced linux sound architecture */
- gpointer fsyn; /* fluidsynth */
-}
-amidiplug_cfg_backend_t;
-
-
-void i_configure_ev_browse_for_entry( GtkWidget * );
-
-#endif /* !_I_CONFIGURE_PRIVATE_H */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_vfslayer.c Deleted

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_vfslayer.h Deleted

@@ -1,38 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2006
-*
-* This program is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the License, or (at your
-* option) any later version.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along
-* with this program; if not, write to the Free Software Foundation, Inc.,
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*/
-
-
-#ifndef _I_VFSLAYER_H
-#define _I_VFSLAYER_H 1
-
-#include "i_common.h"
-#include <audacious/plugin.h>
-
-
-#define VFS_FOPEN( x , y )		vfs_fopen( x , y )
-#define VFS_FCLOSE( x )			vfs_fclose( x )
-#define VFS_FREAD( x , y , z , w )	vfs_fread( x , y , z , w )
-#define VFS_FSEEK( x , y , z )		vfs_fseek( x , y , z )
-#define VFS_FEOF( x )			vfs_feof( x )
-#define VFS_GETC( x )			vfs_getc( x )
-#define VFS_UNGETC( x , y )		vfs_ungetc( x , y )
-
-
-#endif /* !_I_VFSLAYER_H */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/pcfg Deleted

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/pcfg/Makefile Deleted

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/pcfg/i_pcfg.c Deleted

@@ -1,158 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2006
-*
-* This program is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the License, or (at your
-* option) any later version.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along
-* with this program; if not, write to the Free Software Foundation, Inc.,
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*/
-
-
-#include "i_pcfg.h"
-
-
-pcfg_t * i_pcfg_new( void )
-{
- pcfg_t * configfile = g_key_file_new();
- return configfile;
-}
-
-
-pcfg_t * i_pcfg_new_from_file( gchar * pathfilename )
-{
- pcfg_t * configfile = g_key_file_new();
- if ( g_key_file_load_from_file( configfile , pathfilename , G_KEY_FILE_NONE , NULL ) == FALSE )
- {
- g_key_file_free( configfile );
- configfile = NULL;
- }
- return configfile;
-}
-
-
-void i_pcfg_free( pcfg_t * configfile )
-{
- g_key_file_free( configfile );
- return;
-}
-
-
-gboolean i_pcfg_write_to_file( pcfg_t * configfile , gchar * pathfilename )
-{
- GError * error = NULL;
- gchar *configfile_string = g_key_file_to_data( configfile , NULL , &error );
- if ( error != NULL )
- {
- g_clear_error( &error );
- return FALSE;
- }
- else
- {
- if ( g_file_set_contents( pathfilename , configfile_string , -1 , NULL ) == FALSE )
- {
- g_free( configfile_string );
- return FALSE;
- }
- else
- {
- g_free( configfile_string );
- return TRUE;
- }
- }
-}
-
-
-gboolean i_pcfg_read_string( pcfg_t * configfile ,
- const gchar * group ,
- const gchar * key ,
- gchar ** value ,
- gchar * default_value )
-{
- GError * error = NULL;
- *value = g_key_file_get_string( configfile , group , key , &error );
- if ( error != NULL )
- {
- if ( default_value != NULL )
- *value = g_strdup( default_value );
- g_clear_error( &error );
- return FALSE;
- }
- return TRUE;
-}
-
-
-gboolean i_pcfg_read_integer( pcfg_t * configfile ,
- const gchar * group ,
- const gchar * key ,
- gint * value ,
- gint default_value )
-{
- GError * error = NULL;
- *value = g_key_file_get_integer( configfile , group , key , &error );
- if ( error != NULL )
- {
- *value = default_value;
- g_clear_error( &error );
- return FALSE;
- }
- return TRUE;
-}
-
-
-gboolean i_pcfg_read_boolean( pcfg_t * configfile ,
- const gchar * group ,
- const gchar * key ,
- gboolean * value ,
- gboolean default_value )
-{
- GError * error = NULL;
- *value = g_key_file_get_boolean( configfile , group , key , &error );
- if ( error != NULL )
- {
- *value = default_value;
- g_clear_error( &error );
- return FALSE;
- }
- return TRUE;
-}
-
-
-gboolean i_pcfg_write_string( pcfg_t * configfile ,
- const gchar * group ,
- const gchar * key ,
- gchar * value )
-{
- g_key_file_set_string( configfile , group , key , value );
- return TRUE;
-}
-
-
-gboolean i_pcfg_write_integer( pcfg_t * configfile ,
- const gchar * group ,
- const gchar * key ,
- gint value )
-{
- g_key_file_set_integer( configfile , group , key , value );
- return TRUE;
-}
-
-
-gboolean i_pcfg_write_boolean( pcfg_t * configfile ,
- const gchar * group ,
- const gchar * key ,
- gboolean value )
-{
- g_key_file_set_boolean( configfile , group , key , value );
- return TRUE;
-}

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/pcfg/i_pcfg.h Deleted

@@ -1,39 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2006
-*
-* This program is free software; you can redistribute it and/or modify it
-* under the terms of the GNU General Public License as published by the
-* Free Software Foundation; either version 2 of the License, or (at your
-* option) any later version.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License along
-* with this program; if not, write to the Free Software Foundation, Inc.,
-* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*
-*/
-
-#ifndef _I_PCFG_H
-#define _I_PCFG_H 1
-
-#include <glib.h>
-
-typedef void pcfg_t;
-
-pcfg_t * i_pcfg_new( void );
-pcfg_t * i_pcfg_new_from_file( gchar * );
-void i_pcfg_free( pcfg_t * );
-gboolean i_pcfg_write_to_file( pcfg_t * , gchar * );
-gboolean i_pcfg_read_string( pcfg_t * , const gchar * , const gchar * , gchar ** , gchar * );
-gboolean i_pcfg_read_integer( pcfg_t * , const gchar * , const gchar * , gint * , gint );
-gboolean i_pcfg_read_boolean( pcfg_t * , const gchar * , const gchar * , gboolean * , gboolean );
-gboolean i_pcfg_write_string( pcfg_t * , const gchar * , const gchar * , gchar * );
-gboolean i_pcfg_write_integer( pcfg_t * , const gchar * , const gchar * , gint );
-gboolean i_pcfg_write_boolean( pcfg_t * , const gchar * , const gchar * , gboolean );
-
-#endif /* !_I_PCFG_H */

audacious-plugins-3.3.4.tar.bz2/src/blur_scope/xmms_logo.xpm Deleted

@@ -1,135 +0,0 @@
-/* XPM */
-static char * bscope_xmms_logo_xpm[] = {
-"275 116 16 1",
-".	c #000000",
-"+	c #272727",
-"@	c #404040",
-"#	c #030303",
-"$	c #0F0F0F",
-"%	c #373737",
-"&	c #1B1B1B",
-"*	c #4C4C4C",
-"=	c #070707",
-"-	c #666666",
-";	c #323232",
-">	c #5C5C5C",
-",	c #525252",
-"'	c #747474",
-")	c #585858",
-"!	c #898989",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-".................................................................................................................+@....#@+..................$%+&*=.................................................................................................................................",
-".................................................................................................................**..$.=-@..................$-+%-$.......................$.........................................................................................................",
-"........................................................................................$&=.&&....&$$;+&%+&;;&+;&>>&*,+&%+=&$&&#$+=..&+=...&@'%+%&&;%+&&&&&&%%+;&&&&.$+$$>&=.=+&.=&$&&#$+=.........................................................................................",
-"........................................................................................&-%&-+....,,)''-!!@'';>!%''*!'>%!-&-*--@)-).;>*>=#@''!,>!%@''!@;;;;''')!,&>@&-*%*-*$=>*>;=-*--@)-).........................................................................................",
-".........................................................................................;->@.....*,=@!@*!*'';>!;'';!>;;!>&-@#,,=@-=-%$-++'@@!,>!;%;@!,;;;@!-%;'-$-&@-$.;-..%>$%>.-@#,,=@-.........................................................................................",
-".........................................................................................#>-=.....**.;';*!*'';>!;'';!>;;!>+-;.**.;-&->))+)';@!,>!;%>'!,;;;;-!-;,-*).$--$;-..*-))).-;.**.;-.........................................................................................",
-".........................................................................................+--%.....**.;';*!*''%-!%''%!>%%!>%-%#**.;-$-@..#-!%@!)>!%''*!)%%%%%'!*&--;.#&-*;-..@-$...-;.**.;-.........................................................................................",
-"........................................................................................$-;;-&....**.%'%*!*'!!!!>!!>!!!>!'>!>+**.%-#@-@%%*!''!''!>!!'!'>>>-'!!,;>-$.%+-@;-*+$-)%;#-%.**.%-#........................................................................................",
-"........................................................................................+;##;+....;;.+;%@>@@'!-'-''>'!'-''--*;;;.+;=#+@@;;*--''''--!'''>>>-!!-%%-*..+@;==%@=.$%@&=;+.;;.+;=........................................................................................",
-".......................................................................................................&;;;%>>>>>>>>>>>>>>>,;;=.......#;;;;*>>>>>>>>>>>>>>>>>%%,-$.................................................................................................................",
-".......................................................................................................$;;;;,>>>>>>>>>>>>>>>;;&.......&;;;%>>>>>>>>>>>>>>>>>@;;+$..................................................................................................................",
-".......................................................................................................#;;;;*>>>>>>>>>>>>>>>@;+......$;;;;)>>>>>>>>>>>>>>>>*;;#....................................................................................................................",
-"........................................................................................................+;;;%>>>>>>>>>>>>>>>*;;.....#;;;;@>>>>>>>>>>>>>>>>,;;$.....................................................................................................................",
-"........................................................................................................$;;;;)>>>>>>>>>>>>>>,;;=....&;;;%>>>>>>>>>>>>>>>>)%;&......................................................................................................................",
-"........................................................................................................#;;;;*>>>>>>>>>>>>>>>%;&...$;;;;,>>>>>>>>>>>>>>>>@;+.......................................................................................................................",
-".........................................................................................................&;;;@>>>>>>>>>>>>>>>@;+..#;;;;@>>>>>>>>>>>>>>>>@;+#.......................................................................................................................",
-".........................................................................................................$;;;;)>>>>>>>>>>>>>>,;;#.+;;;%>>>>>>>>>>>>>>>>*;;=........................................................................................................................",
-"..........................................................................................................;;;;*>>>>>>>>>>>>>>>%;$$;;;;,>>>>>>>>>>>>>>>,;;$.........................................................................................................................",
-"..........................................................................................................&;;;@>>>>>>>>>>>>>>>@;+;;;;*>>>>>>>>>>>>>>>)%;&..........................................................................................................................",
-"..........................................................................................................=;;;;)>>>>>>>>>>>>>>,;*;;;%>>>>>>>>>>>>>>>>%;+...........................................................................................................................",
-"...........................................................................................................+;;;*>>>>>>>>>>>>>>>*>%;%)>>>>>>>>>>>>>>>@;+#...........................................................................................................................",
-"...........................................................................................................&;;;%>>>>>>>>>>>>>>>>>*;*>>>>>>>>>>>>>>>@;;=............................................................................................................................",
-"...........................................................................................................=;;;;,>>>>>>>>>>>>>>>>)@>>>>>>>>>>>>>>>*;;$.............................................................................................................................",
-"............................................................................................................+;;;@>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>,;;&..............................................................................................................................",
-"............................................................................................................$;;;%>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>,%;&...............................................................................................................................",
-"............................................................................................................#;;;;,>>>>>>>>>>>>>>>>>>>>>>>>>>>>>)%;+................................................................................................................................",
-".............................................................................................................&;;;@>>>>>>>>>>>>>>>>>>>>>>>>>>>>)%;+#................................................................................................................................",
-".............................................................................................................=;;;;)>>>>>>>>>>>>>>>>>>>>>>>>>>)%;+#.................................................................................................................................",
-"..............................................................................................................+;;;*>>>>>>>>>>>>>>>>>>>>>>>>>>@;;=..................................................................................................................................",
-"..............................................................................................................&;;;%>>>>>>>>>>>>>>>>>>>>>>>>>@;;=...................................................................................................................................",
-"..............................................................................................................#;;;;,>>>>>>>>>>>>>>>>>>>>>>>@;;=....................................................................................................................................",
-"...............................................................................................................+;;;@>>>>>>>>>>>>>>>>>>>>>>>%;$.....................................................................................................................................",
-"..............................................................................................................&;;;;%>>>>>>>>>>>>>>>>>>>>>>>@+......................................................................................................................................",
-".............................................................................................................$;;;;;*>>>'''''>>>-'!'>>>>>>'!>;.....$++++&...&%;$.....&%+=........$+;%%%;+&#.........................................................................................",
-"............................................................................................................=;;;;;@>>>>!!!!!->-!!!!!->>-!!!!-&....&****;..;****+...+****+.....&@*********$.........................................................................................",
-"...........................................................................................................#+;;;;@>>>>>!!!!!>-!!!!!!!>-!!!!!'>=...&****+.;******$.+******;...;***********..........................................................................................",
-"...........................................................................................................+;;;;%)>>>>>!!!!!>!!!!!!!'>!!!!!!'-&...+****&&*******$&*******@..+***%;+++;%@%..........................................................................................",
-"..........................................................................................................&;;;;%,>>>>>-!!!!''!!'!!!!''!!'!!!!'$...%****&**%@****$**@+****%..@***&#......#..........................................................................................",
-".........................................................................................................$;;;;;*>>>>>>'!!!!'!!--!!!!!!!'>!!!!'$...****@%*@.@***@@**$+****+..******@;&$.............................................................................................",
-"........................................................................................................=;;;;;*>>>>>>>!!!!!!!'>'!!!!!!!>-!!!!-&..$*******==*******&.%****$..%**********;=..........................................................................................",
-".......................................................................................................=;;;;;@>>>>>>>>!!!!!!!>>!!!!!!!->'!!!!-+..+******&.&******;..*****#..=@**********@..........................................................................................",
-".......................................................................................................+;;;;%>>>>>>>>-!!!!!!->>!!!!!!'>>'!!!!>;#.;*****;..+*****@=.$****@.....&;@********=.........................................................................................",
-"......................................................................................................+;;;;%)>>>>>>>>'!!!!!'>>-!!!!!!>>>!!!!!>%$.@*****=..%*****&..&****+........=$+%****=.........................................................................................",
-".....................................................................................................&;;;;%,>>>>>>>>>'!!!!!>>)'!!!!!->>>!!!!!>@+=*****+...@****%...+****&..#&........***@..........................................................................................",
-"....................................................................................................$;;;;;,>>>>>>>>>>!!!!!->)@'!!!!'>>>-!!!!'>*;&****@#..=*****$...@****=..&**%+++;%@***&..........................................................................................",
-"...................................................................................................$;;;;;*>>>>>>>>>>>!!!!-*>@%!!!!!->>>'!!!!'->;%****+...&****%....*****=$.;***********+...........................................................................................",
-"..................................................................................................$;;;;;*>>>>>>>>>>>-!!!',@*;%!!!!'>>>>'!!!!!!-@)****=...+****$....******;.@*********%$............................................................................................",
-".................................................................................................=;;;;;@>>>>>>>>>>>>-''-,%;%;%-'''->>>>>'!!''->**+++&....&++++.....$;%%+&=..&+;%%%;&$..............................................................................................",
-"................................................................................................=+;;;;@>>>>>>>>>>>>>>>)%;;$+;;@>>>>>>>>>>>>>>>>>%$.................................................................................................................................",
-"...............................................................................................#+;;;;@>>>>>>>>>>>>>>>>%;;&.&;;;)>>>>>>>>>>>>>>>>@+.................................................................................................................................",
-"...............................................................................................+;;;;%)>>>>>>>>>>>>>>>@;;+..$;;;*>>>>>>>>>>>>>>>>,;$................................................................................................................................",
-"..............................................................................................&;;;;%)>>>>>>>>>>>>>>>,;;;=...;;;@>>>>>>>>>>>>>>>>>@+#.....=#........................................................................................................................",
-".............................................................................................&;;;;%,>>>>>>>>>>>>>>>)%;;$....&;;;)>>>>>>>>>>>>>>>>,;+$=$&+;=........................................................................................................................",
-"............................................................................................&;;;;;,>>>>>>>>>>>>>>>>@;;&.....=;;;@>>>>>>>>>>>>>>>>>,%;;%@*)=........................................................................................................................",
-"...........................................................................................$;;;;;,>>>>>>>>>>>>>>>>@;;+.......+;;%)>>>>>>>>>>>>>>>>>>,)>>>,.........................................................................................................................",
-"..........................................................................................$;;;;;*>>>>>>>>>>>>>>>>*;;+#.......$;;;@>>>>>>>>>>>>>>>>>>>>>>>*.........................................................................................................................",
-".........................................................................................=;;;;;*>>>>>>>>>>>>>>>>,%;;=.........+;;;,>>>>>>>>>>>>>>>>>>>>>>%.........................................................................................................................",
-"........................................................................................=;;;;;*>>>>>>>>>>>>>>>>)%;;=..........$;;;%,>>>>>>>>>>>>>>>>>>,@%&.........................................................................................................................",
-".......................................................................................=;;;;;*>>>>>>>>>>>>>>>>>%;;$............&;;;;@)>>>>>>>>>>>>)*@%;;;$.........................................................................................................................",
-".......................................................................................;;;;@,%;;;;;;;;;;;;;;;;$................&%;;;;%@*,))>'-*@@%;;%*+$#..............&&..........................................................................................................",
-".......................................................................................;;%;-!;;;;;;;;;;;;;;;;$.................)-$+;;;;;;;;!'-;;;;+&+!&................-)................=.........................................................................................",
-".......................................................................................=&)&@'$+===&&=====$+&=#&$.=$=$$#$$$$...&>>..$&+@*%;@!,+&$==-$&!$&#..&&....#$=&#.>,.=&$#$=&$..=&=.=-$........................................................................................",
-".......................................................................................=-',@'>!@.@--@...$')@$->'@+!&*'.--'!&#)>'>....%'''&@!-&...*!>+!,'>.@--@...=!>''=>,.)-'&!)''=$')'$*!>........................................................................................",
-"........................................................................................,>.@'#>,$'++'...+!&.@-.%!;!$@'.>)#!;@-.,>...='+=',$!&....;!.&!&@'$'++'....!;$';>,..=!;!%&!$*>$>%;!.........................................................................................",
-"........................................................................................,>.@'.>,&!->>...#>'&>,.$!%!$@'.>,.!;>,.,>...&!$.,>$!&....;!.&!$@'&!->>....!;.'@>,=*-!;!;&!$>'>>;;!.........................................................................................",
-"........................................................................................,-#*'.>,$'@.=...$#',*'$+'+!&*'.>,.!;,-#,>...$'@.-@$!&....;!=+!$@'$'@.=....!;$'+>,%'.!;!;&!$*'$.=;!=........................................................................................",
-"........................................................................................%!','#->.;'')...@-'+$-''+='!>'#->$!%$'''-....%'->=&!+....&'!@!&*'#;'')....!''>#->&'-!@!%+!&=>''&&'!........................................................................................",
-".........................................................................................$=.......#$#....$=...$#..#$.........#$.......=$..........$$.......#$#....!;$.....==.........$$..$$........................................................................................",
-".................................................................................................................................................................=,+...............................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"...................................................................................................................................................................................................................................................................................",
-"..................................................................................................................................................................................................................................................................................."};

audacious-plugins-3.3.4.tar.bz2/src/console/Gzip_File.cxx Deleted

@@ -1,148 +0,0 @@
-
-#include "Gzip_File.h"
-
-#include "zlib.h"
-
-/* Copyright (C) 2005 Shay Green. Permission is hereby granted, free of
-charge, to any person obtaining a copy of this software module and associated
-documentation files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-to permit persons to whom the Software is furnished to do so, subject to the
-following conditions: The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software. THE
-SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-
-static const char* get_gzip_eof( FILE* file, long* eof )
-{
-	unsigned char buf [4];
-	if ( !fread( buf, 2, 1, file ) )
-		return "Couldn't read from file";
-	
-	if ( buf [0] == 0x1F && buf [1] == 0x8B )
-	{
-		if ( fseek( file, -4, SEEK_END ) )
-			return "Couldn't seek in file";
-		
-		if ( !fread( buf, 4, 1, file ) )
-			return "Couldn't read from file";
-		
-		*eof = buf [3] * 0x1000000L + buf [2] * 0x10000L + buf [1] * 0x100L + buf [0];
-	}
-	else
-	{
-		if ( fseek( file, 0, SEEK_END ) )
-			return "Couldn't seek in file";
-		
-		*eof = ftell( file );
-	}
-	
-	return NULL;
-}
-
-const char* get_gzip_eof( const char* path, long* eof )
-{
-	FILE* file = fopen( path, "rb" );
-	if ( !file )
-		return "Couldn't open file";
-	const char* error = get_gzip_eof( file, eof );
-	fclose( file );
-	return error;
-}
-
-// Gzip_File_Reader
-
-Gzip_File_Reader::Gzip_File_Reader() : file_( NULL )
-{
-}
-
-Gzip_File_Reader::~Gzip_File_Reader()
-{
-	close();
-}
-
-Gzip_File_Reader::error_t Gzip_File_Reader::open( const char* path )
-{
-	error_t error = get_gzip_eof( path, &size_ );
-	if ( error )
-		return error;
-	
-	file_ = gzopen( path, "rb" );
-	if ( !file_ )
-		return "Couldn't open file";
-	
-	return NULL;
-}
-
-long Gzip_File_Reader::size() const
-{
-	return size_;
-}
-
-long Gzip_File_Reader::read_avail( void* p, long s )
-{
-	return (long) gzread( file_, p, s );
-}
-
-long Gzip_File_Reader::tell() const
-{
-	return gztell( file_ );
-}
-
-Gzip_File_Reader::error_t Gzip_File_Reader::seek( long n )
-{
-	if ( gzseek( file_, n, SEEK_SET ) < 0 )
-		return "Error seeking in file";
-	return NULL;
-}
-
-void Gzip_File_Reader::close()
-{
-	if ( file_ )
-	{
-		gzclose( file_ );
-		file_ = NULL;
-	}
-}
-
-// Gzip_File_Writer
-
-Gzip_File_Writer::Gzip_File_Writer() : file_( NULL )
-{
-}
-
-Gzip_File_Writer::~Gzip_File_Writer()
-{
-	close();
-}
-
-Gzip_File_Writer::error_t Gzip_File_Writer::open( const char* path )
-{
-	file_ = gzopen( path, "wb9" );
-	if ( !file_ )
-		return "Couldn't open file for writing";
-	
-	return NULL;
-}
-
-Gzip_File_Writer::error_t Gzip_File_Writer::write( const void* p, long s )
-{
-	long result = (long) gzwrite( file_ , (void*) p, s );
-	if ( result != s )
-		return "Couldn't write to file";
-	return NULL;
-}
-
-void Gzip_File_Writer::close()
-{
-	if ( file_ )
-	{
-		gzclose( file_ );
-		file_ = NULL;
-	}
-}

audacious-plugins-3.3.4.tar.bz2/src/console/Gzip_File.h Deleted

audacious-plugins-3.3.4.tar.bz2/src/console/abstract_file.cxx Deleted

@@ -1,282 +0,0 @@
-
-#include "abstract_file.h"
-
-#include <assert.h>
-#include <string.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-/* Copyright (C) 2005 Shay Green. Permission is hereby granted, free of
-charge, to any person obtaining a copy of this software module and associated
-documentation files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use, copy, modify,
-merge, publish, distribute, sublicense, and/or sell copies of the Software, and
-to permit persons to whom the Software is furnished to do so, subject to the
-following conditions: The above copyright notice and this permission notice
-shall be included in all copies or substantial portions of the Software. THE
-SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-
-// to do: remove?
-#ifndef RAISE_ERROR
-	#define RAISE_ERROR( str ) return str
-#endif
-
-typedef Data_Reader::error_t error_t;
-
-error_t Data_Writer::write( const void*, long ) { return NULL; }
-
-void Data_Writer::satisfy_lame_linker_() { }
-
-error_t Data_Reader::read( void* p, long s )
-{
-	long result = read_avail( p, s );
-	if ( result != s )
-	{
-		if ( result >= 0 && result < s )
-			RAISE_ERROR( "Unexpected end-of-file" );
-		
-		RAISE_ERROR( "Read error" );
-	}
-	
-	return NULL;
-}
-
-error_t Data_Reader::skip( long count )
-{
-	char buf [512];
-	while ( count )
-	{
-		int n = sizeof buf;
-		if ( n > count )
-			n = count;
-		count -= n;
-		RAISE_ERROR( read( buf, n ) );
-	}
-	return NULL;
-}
-
-long File_Reader::remain() const
-{
-	return size() - tell();
-}
-
-error_t File_Reader::skip( long n )
-{
-	assert( n >= 0 );
-	if ( n )
-		RAISE_ERROR( seek( tell() + n ) );
-	
-	return NULL;
-}
-
-
-// Subset_Reader
-
-Subset_Reader::Subset_Reader( Data_Reader* in_, long size ) :
-	in( in_ ),
-	remain_( in_->remain() )
-{
-	if ( remain_ > size )
-		remain_ = size;
-}
-
-long Subset_Reader::remain() const {
-	return remain_;
-}
-
-long Subset_Reader::read_avail( void* p, long s )
-{
-	if ( s > remain_ )
-		s = remain_;
-	remain_ -= s;
-	return in->read_avail( p, s );
-}
-
-// Mem_File_Reader
-
-Mem_File_Reader::Mem_File_Reader( const void* p, long s ) :
-	begin( (const char*) p ),
-	pos( 0 ),
-	size_( s )
-{
-}
-	
-long Mem_File_Reader::size() const {
-	return size_;
-}
-
-long Mem_File_Reader::read_avail( void* p, long s )
-{
-	long r = remain();
-	if ( s > r )
-		s = r;
-	memcpy( p, begin + pos, s );
-	pos += s;
-	return s;
-}
-
-long Mem_File_Reader::tell() const {
-	return pos;
-}
-
-error_t Mem_File_Reader::seek( long n )
-{
-	if ( n > size_ )
-		RAISE_ERROR( "Tried to go past end of file" );
-	pos = n;
-	return NULL;
-}
-
-// Std_File_Reader
-
-Std_File_Reader::Std_File_Reader() : file_( NULL ) {
-}
-
-Std_File_Reader::~Std_File_Reader() {
-	close();
-}
-
-error_t Std_File_Reader::open( const char* path )
-{
-	file_ = vfs_fopen( path, "rb" );
-	if ( !file_ )
-		RAISE_ERROR( "Couldn't open file" );
-	return NULL;
-}
-
-long Std_File_Reader::size() const
-{
-	long pos = tell();
-	vfs_fseek( file_, 0, SEEK_END );
-	long result = tell();
-	vfs_fseek( file_, pos, SEEK_SET );
-	return result;
-}
-
-long Std_File_Reader::read_avail( void* p, long s ) {
-	return (long) vfs_fread( p, 1, s, file_ );
-}
-
-long Std_File_Reader::tell() const {
-	return vfs_ftell( file_ );
-}
-
-error_t Std_File_Reader::seek( long n )
-{
-	if ( vfs_fseek( file_, n, SEEK_SET ) != 0 )
-		RAISE_ERROR( "Error seeking in file" );
-	return NULL;
-}
-
-void Std_File_Reader::close()
-{
-	if ( file_ ) {
-		vfs_fclose( file_ );
-		file_ = NULL;
-	}
-}
-
-// Std_File_Writer
-
-Std_File_Writer::Std_File_Writer() : file_( NULL ) {
-}
-
-Std_File_Writer::~Std_File_Writer() {
-	close();
-}
-
-error_t Std_File_Writer::open( const char* path )
-{
-	file_ = vfs_fopen( path, "wb" );
-	if ( !file_ )
-		RAISE_ERROR( "Couldn't open file for writing" );
-		
-	// to do: increase file buffer size
-	//setvbuf( file_, NULL, _IOFBF, 32 * 1024L );
-	
-	return NULL;
-}
-
-error_t Std_File_Writer::write( const void* p, long s )
-{
-	long result = (long) vfs_fwrite( p, 1, s, file_ );
-	if ( result != s )
-		RAISE_ERROR( "Couldn't write to file" );
-	return NULL;
-}
-
-void Std_File_Writer::close()
-{
-	if ( file_ ) {
-		vfs_fclose( file_ );
-		file_ = NULL;
-	}
-}
-
-// Mem_Writer
-
-Mem_Writer::Mem_Writer( void* p, long s, int b )
-{
-	data_ = (char*) p;
-	size_ = 0;
-	allocated = s;
-	mode = b ? ignore_excess : fixed;
-}
-
-Mem_Writer::Mem_Writer()
-{
-	data_ = NULL;
-	size_ = 0;
-	allocated = 0;
-	mode = expanding;
-}
-
-Mem_Writer::~Mem_Writer()
-{
-	if ( mode == expanding )
-		free( data_ );
-}
-
-error_t Mem_Writer::write( const void* p, long s )
-{
-	long remain = allocated - size_;
-	if ( s > remain )
-	{
-		if ( mode == fixed )
-			RAISE_ERROR( "Tried to write more data than expected" );
-		
-		if ( mode == ignore_excess )
-		{
-			s = remain;
-		}
-		else // expanding
-		{
-			long new_allocated = size_ + s;
-			new_allocated += (new_allocated >> 1) + 2048;
-			void* p = realloc( data_, new_allocated );
-			if ( !p )
-				RAISE_ERROR( "Out of memory" );
-			data_ = (char*) p;
-			allocated = new_allocated;
-		}
-	}
-	
-	assert( size_ + s <= allocated );
-	memcpy( data_ + size_, p, s );
-	size_ += s;
-	
-	return NULL;
-}
-
-// Null_Writer
-
-error_t Null_Writer::write( const void*, long )
-{
-	return NULL;
-}
-

audacious-plugins-3.3.4.tar.bz2/src/console/abstract_file.h Deleted

@@ -1,177 +0,0 @@
-
-// Abstract file access interfaces
-
-#ifndef ABSTRACT_FILE_H
-#define ABSTRACT_FILE_H
-
-#include <stdio.h>
-
-// Supports reading and finding out how many bytes are remaining
-class Data_Reader {
-public:
-	Data_Reader() { }
-	virtual ~Data_Reader() { }
-	
-	// NULL on success, otherwise error string
-	typedef const char* error_t;
-	
-	// Read at most 'n' bytes. Return number of bytes read, zero or negative
-	// if error.
-	virtual long read_avail( void*, long n ) = 0;
-	
-	// Read exactly 'n' bytes (error if fewer are available).
-	virtual error_t read( void*, long );
-	
-	// Number of bytes remaining
-	virtual long remain() const = 0;
-	
-	// Skip forwards by 'n' bytes.
-	virtual error_t skip( long n );
-	
-	// to do: bytes remaining = LONG_MAX when unknown?
-	
-private:
-	// noncopyable
-	Data_Reader( const Data_Reader& );
-	Data_Reader& operator = ( const Data_Reader& );
-};
-
-// Adds seeking operations
-class File_Reader : public Data_Reader {
-public:
-	// Size of file
-	virtual long size() const = 0;
-	
-	// Current position in file
-	virtual long tell() const = 0;
-	
-	// Change position in file
-	virtual error_t seek( long ) = 0;
-	
-	virtual long remain() const;
-	
-	error_t skip( long n );
-};
-
-// Limit access to a subset of data
-class Subset_Reader : public Data_Reader {
-	Data_Reader* in;
-	long remain_;
-public:
-	Subset_Reader( Data_Reader*, long size );
-	long remain() const;
-	long read_avail( void*, long );
-};
-
-// Treat range of memory as a file
-class Mem_File_Reader : public File_Reader {
-	const char* const begin;
-	long pos;
-	const long size_;
-public:
-	Mem_File_Reader( const void*, long size );
-	
-	long size() const;
-	long read_avail( void*, long );
-	
-	long tell() const;
-	error_t seek( long );
-};
-
-// File reader based on C VFSFile*
-class Std_File_Reader : public File_Reader {
-	VFSFile* file_;
-protected:
-	void reset( VFSFile* f ) { file_ = f; }
-	//VFSFile* owned_file;
-public:
-	Std_File_Reader();
-	~Std_File_Reader();
-	
-	error_t open( const char* );
-	
-	VFSFile* file() const { return file_; }
-	
-	// Forward read requests to file. Caller must close file later.
-	//void forward( VFSFile* );
-	
-	long size() const;
-	long read_avail( void*, long );
-	
-	long tell() const;
-	error_t seek( long );
-	
-	void close();
-};
-
-// Supports writing
-class Data_Writer {
-public:
-	Data_Writer() { }
-	virtual ~Data_Writer() { }
-	
-	typedef const char* error_t;
-	
-	// Write 'n' bytes. NULL on success, otherwise error string.
-	virtual error_t write( const void*, long n ) = 0;
-	
-	void satisfy_lame_linker_();
-private:
-	// noncopyable
-	Data_Writer( const Data_Writer& );
-	Data_Writer& operator = ( const Data_Writer& );
-};
-
-class Std_File_Writer : public Data_Writer {
-	VFSFile* file_;
-protected:
-	void reset( VFSFile* f ) { file_ = f; }
-public:
-	Std_File_Writer();
-	~Std_File_Writer();
-	
-	error_t open( const char* );
-	
-	VFSFile* file() const { return file_; }
-	
-	// Forward writes to file. Caller must close file later.
-	//void forward( VFSFile* );
-	
-	error_t write( const void*, long );
-	
-	void close();
-};
-
-// Write data to memory
-class Mem_Writer : public Data_Writer {
-	char* data_;
-	long size_;
-	long allocated;
-	enum { expanding, fixed, ignore_excess } mode;
-public:
-	// Keep all written data in expanding block of memory
-	Mem_Writer();
-	
-	// Write to fixed-size block of memory. If ignore_excess is false, returns
-	// error if more than 'size' data is written, otherwise ignores any excess.
-	Mem_Writer( void*, long size, int ignore_excess = 0 );
-	
-	error_t write( const void*, long );
-	
-	// Pointer to beginning of written data
-	char* data() { return data_; }
-	
-	// Number of bytes written
-	long size() const { return size_; }
-	
-	~Mem_Writer();
-};
-
-// Written data is ignored
-class Null_Writer : public Data_Writer {
-public:
-	error_t write( const void*, long );
-};
-
-#endif
-

audacious-plugins-3.3.4.tar.bz2/src/console/blargg_config.h Deleted

audacious-plugins-3.3.4.tar.bz2/src/mpris2/codegen Deleted

audacious-plugins-3.3.4.tar.bz2/src/mpris2/object-core.c Deleted

@@ -1,1724 +0,0 @@
-/*
- * Generated by gdbus-codegen 2.32.2. DO NOT EDIT.
- *
- * The license of this code is the same as for the source it was derived from.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "object-core.h"
-
-#ifdef G_OS_UNIX
-# include <gio/gunixfdlist.h>
-#endif
-
-typedef struct
-{
- GDBusArgInfo parent_struct;
- gboolean use_gvariant;
-} _ExtendedGDBusArgInfo;
-
-typedef struct
-{
- GDBusMethodInfo parent_struct;
- const gchar *signal_name;
- gboolean pass_fdlist;
-} _ExtendedGDBusMethodInfo;
-
-typedef struct
-{
- GDBusSignalInfo parent_struct;
- const gchar *signal_name;
-} _ExtendedGDBusSignalInfo;
-
-typedef struct
-{
- GDBusPropertyInfo parent_struct;
- const gchar *hyphen_name;
- gboolean use_gvariant;
-} _ExtendedGDBusPropertyInfo;
-
-typedef struct
-{
- GDBusInterfaceInfo parent_struct;
- const gchar *hyphen_name;
-} _ExtendedGDBusInterfaceInfo;
-
-typedef struct
-{
- const _ExtendedGDBusPropertyInfo *info;
- guint prop_id;
- GValue orig_value; /* the value before the change */
-} ChangedProperty;
-
-static void
-_changed_property_free (ChangedProperty *data)
-{
- g_value_unset (&data->orig_value);
- g_free (data);
-}
-
-static gboolean
-_g_strv_equal0 (gchar **a, gchar **b)
-{
- gboolean ret = FALSE;
- guint n;
- if (a == NULL && b == NULL)
- {
- ret = TRUE;
- goto out;
- }
- if (a == NULL || b == NULL)
- goto out;
- if (g_strv_length (a) != g_strv_length (b))
- goto out;
- for (n = 0; a[n] != NULL; n++)
- if (g_strcmp0 (a[n], b[n]) != 0)
- goto out;
- ret = TRUE;
-out:
- return ret;
-}
-
-static gboolean
-_g_variant_equal0 (GVariant *a, GVariant *b)
-{
- gboolean ret = FALSE;
- if (a == NULL && b == NULL)
- {
- ret = TRUE;
- goto out;
- }
- if (a == NULL || b == NULL)
- goto out;
- ret = g_variant_equal (a, b);
-out:
- return ret;
-}
-
-G_GNUC_UNUSED static gboolean
-_g_value_equal (const GValue *a, const GValue *b)
-{
- gboolean ret = FALSE;
- g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));
- switch (G_VALUE_TYPE (a))
- {
- case G_TYPE_BOOLEAN:
- ret = (g_value_get_boolean (a) == g_value_get_boolean (b));
- break;
- case G_TYPE_UCHAR:
- ret = (g_value_get_uchar (a) == g_value_get_uchar (b));
- break;
- case G_TYPE_INT:
- ret = (g_value_get_int (a) == g_value_get_int (b));
- break;
- case G_TYPE_UINT:
- ret = (g_value_get_uint (a) == g_value_get_uint (b));
- break;
- case G_TYPE_INT64:
- ret = (g_value_get_int64 (a) == g_value_get_int64 (b));
- break;
- case G_TYPE_UINT64:
- ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));
- break;
- case G_TYPE_DOUBLE:
- ret = (g_value_get_double (a) == g_value_get_double (b));
- break;
- case G_TYPE_STRING:
- ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);
- break;
- case G_TYPE_VARIANT:
- ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));
- break;
- default:
- if (G_VALUE_TYPE (a) == G_TYPE_STRV)
- ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));
- else
- g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));
- break;
- }
- return ret;
-}
-
-/* ------------------------------------------------------------------------
- * Code for interface org.mpris.MediaPlayer2
- * ------------------------------------------------------------------------
- */
-
-/**
- * SECTION:MprisMediaPlayer2
- * @title: MprisMediaPlayer2
- * @short_description: Generated C code for the org.mpris.MediaPlayer2 D-Bus interface
- *
- * This section contains code for working with the <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link> D-Bus interface in C.
- */
-
-/* ---- Introspection data for org.mpris.MediaPlayer2 ---- */
-
-static const _ExtendedGDBusMethodInfo _mpris_media_player2_method_info_quit =
-{
- {
- -1,
- "Quit",
- NULL,
- NULL,
- NULL
- },
- "handle-quit",
- FALSE
-};
-
-static const _ExtendedGDBusMethodInfo _mpris_media_player2_method_info_raise =
-{
- {
- -1,
- "Raise",
- NULL,
- NULL,
- NULL
- },
- "handle-raise",
- FALSE
-};
-
-static const _ExtendedGDBusMethodInfo * const _mpris_media_player2_method_info_pointers[] =
-{
- &_mpris_media_player2_method_info_quit,
- &_mpris_media_player2_method_info_raise,
- NULL
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_property_info_can_quit =
-{
- {
- -1,
- "CanQuit",
- "b",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "can-quit",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_property_info_can_raise =
-{
- {
- -1,
- "CanRaise",
- "b",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "can-raise",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_property_info_desktop_entry =
-{
- {
- -1,
- "DesktopEntry",
- "s",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "desktop-entry",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_property_info_identity =
-{
- {
- -1,
- "Identity",
- "s",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "identity",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo * const _mpris_media_player2_property_info_pointers[] =
-{
- &_mpris_media_player2_property_info_can_quit,
- &_mpris_media_player2_property_info_can_raise,
- &_mpris_media_player2_property_info_desktop_entry,
- &_mpris_media_player2_property_info_identity,
- NULL
-};
-
-static const _ExtendedGDBusInterfaceInfo _mpris_media_player2_interface_info =
-{
- {
- -1,
- "org.mpris.MediaPlayer2",
- (GDBusMethodInfo **) &_mpris_media_player2_method_info_pointers,
- NULL,
- (GDBusPropertyInfo **) &_mpris_media_player2_property_info_pointers,
- NULL
- },
- "media-player2",
-};
-
-
-/**
- * mpris_media_player2_interface_info:
- *
- * Gets a machine-readable description of the <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link> D-Bus interface.
- *
- * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
- */
-GDBusInterfaceInfo *
-mpris_media_player2_interface_info (void)
-{
- return (GDBusInterfaceInfo *) &_mpris_media_player2_interface_info;
-}
-
-/**
- * mpris_media_player2_override_properties:
- * @klass: The class structure for a #GObject-derived class.
- * @property_id_begin: The property id to assign to the first overridden property.
- *
- * Overrides all #GObject properties in the #MprisMediaPlayer2 interface for a concrete class.
- * The properties are overridden in the order they are defined.
- *
- * Returns: The last property id.
- */
-guint
-mpris_media_player2_override_properties (GObjectClass *klass, guint property_id_begin)
-{
- g_object_class_override_property (klass, property_id_begin++, "can-quit");
- g_object_class_override_property (klass, property_id_begin++, "can-raise");
- g_object_class_override_property (klass, property_id_begin++, "desktop-entry");
- g_object_class_override_property (klass, property_id_begin++, "identity");
- return property_id_begin - 1;
-}
-
-
-
-/**
- * MprisMediaPlayer2:
- *
- * Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link>.
- */
-
-/**
- * MprisMediaPlayer2Iface:
- * @parent_iface: The parent interface.
- * @handle_quit: Handler for the #MprisMediaPlayer2::handle-quit signal.
- * @handle_raise: Handler for the #MprisMediaPlayer2::handle-raise signal.
- * @get_can_quit: Getter for the #MprisMediaPlayer2:can-quit property.
- * @get_can_raise: Getter for the #MprisMediaPlayer2:can-raise property.
- * @get_desktop_entry: Getter for the #MprisMediaPlayer2:desktop-entry property.
- * @get_identity: Getter for the #MprisMediaPlayer2:identity property.
- *
- * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link>.
- */
-
-static void
-mpris_media_player2_default_init (MprisMediaPlayer2Iface *iface)
-{
- /* GObject signals for incoming D-Bus method calls: */
- /**
- * MprisMediaPlayer2::handle-quit:
- * @object: A #MprisMediaPlayer2.
- * @invocation: A #GDBusMethodInvocation.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Quit">Quit()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_complete_quit() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-quit",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MprisMediaPlayer2Iface, handle_quit),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 1,
- G_TYPE_DBUS_METHOD_INVOCATION);
-
- /**
- * MprisMediaPlayer2::handle-raise:
- * @object: A #MprisMediaPlayer2.
- * @invocation: A #GDBusMethodInvocation.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Raise">Raise()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_complete_raise() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-raise",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MprisMediaPlayer2Iface, handle_raise),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 1,
- G_TYPE_DBUS_METHOD_INVOCATION);
-
- /* GObject properties for D-Bus properties: */
- /**
- * MprisMediaPlayer2:can-quit:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2.CanQuit">"CanQuit"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_boolean ("can-quit", "CanQuit", "CanQuit", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- * MprisMediaPlayer2:can-raise:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2.CanRaise">"CanRaise"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_boolean ("can-raise", "CanRaise", "CanRaise", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- * MprisMediaPlayer2:desktop-entry:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2.DesktopEntry">"DesktopEntry"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_string ("desktop-entry", "DesktopEntry", "DesktopEntry", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- * MprisMediaPlayer2:identity:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2.Identity">"Identity"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_string ("identity", "Identity", "Identity", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-}
-
-typedef MprisMediaPlayer2Iface MprisMediaPlayer2Interface;
-G_DEFINE_INTERFACE (MprisMediaPlayer2, mpris_media_player2, G_TYPE_OBJECT);
-
-/**
- * mpris_media_player2_get_can_quit: (skip)
- * @object: A #MprisMediaPlayer2.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.CanQuit">"CanQuit"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: The property value.
- */
-gboolean 
-mpris_media_player2_get_can_quit (MprisMediaPlayer2 *object)
-{
- return MPRIS_MEDIA_PLAYER2_GET_IFACE (object)->get_can_quit (object);
-}
-
-/**
- * mpris_media_player2_set_can_quit: (skip)
- * @object: A #MprisMediaPlayer2.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2.CanQuit">"CanQuit"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_set_can_quit (MprisMediaPlayer2 *object, gboolean value)
-{
- g_object_set (G_OBJECT (object), "can-quit", value, NULL);
-}
-
-/**
- * mpris_media_player2_get_can_raise: (skip)
- * @object: A #MprisMediaPlayer2.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.CanRaise">"CanRaise"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: The property value.
- */
-gboolean 
-mpris_media_player2_get_can_raise (MprisMediaPlayer2 *object)
-{
- return MPRIS_MEDIA_PLAYER2_GET_IFACE (object)->get_can_raise (object);
-}
-
-/**
- * mpris_media_player2_set_can_raise: (skip)
- * @object: A #MprisMediaPlayer2.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2.CanRaise">"CanRaise"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_set_can_raise (MprisMediaPlayer2 *object, gboolean value)
-{
- g_object_set (G_OBJECT (object), "can-raise", value, NULL);
-}
-
-/**
- * mpris_media_player2_get_desktop_entry: (skip)
- * @object: A #MprisMediaPlayer2.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.DesktopEntry">"DesktopEntry"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use mpris_media_player2_dup_desktop_entry() if on another thread.</warning>
- *
- * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
- */
-const gchar *
-mpris_media_player2_get_desktop_entry (MprisMediaPlayer2 *object)
-{
- return MPRIS_MEDIA_PLAYER2_GET_IFACE (object)->get_desktop_entry (object);
-}
-
-/**
- * mpris_media_player2_dup_desktop_entry: (skip)
- * @object: A #MprisMediaPlayer2.
- *
- * Gets a copy of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.DesktopEntry">"DesktopEntry"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
- */
-gchar *
-mpris_media_player2_dup_desktop_entry (MprisMediaPlayer2 *object)
-{
- gchar *value;
- g_object_get (G_OBJECT (object), "desktop-entry", &value, NULL);
- return value;
-}
-
-/**
- * mpris_media_player2_set_desktop_entry: (skip)
- * @object: A #MprisMediaPlayer2.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2.DesktopEntry">"DesktopEntry"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_set_desktop_entry (MprisMediaPlayer2 *object, const gchar *value)
-{
- g_object_set (G_OBJECT (object), "desktop-entry", value, NULL);
-}
-
-/**
- * mpris_media_player2_get_identity: (skip)
- * @object: A #MprisMediaPlayer2.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.Identity">"Identity"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use mpris_media_player2_dup_identity() if on another thread.</warning>
- *
- * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
- */
-const gchar *
-mpris_media_player2_get_identity (MprisMediaPlayer2 *object)
-{
- return MPRIS_MEDIA_PLAYER2_GET_IFACE (object)->get_identity (object);
-}
-
-/**
- * mpris_media_player2_dup_identity: (skip)
- * @object: A #MprisMediaPlayer2.
- *
- * Gets a copy of the <link linkend="gdbus-property-org-mpris-MediaPlayer2.Identity">"Identity"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
- */
-gchar *
-mpris_media_player2_dup_identity (MprisMediaPlayer2 *object)
-{
- gchar *value;
- g_object_get (G_OBJECT (object), "identity", &value, NULL);
- return value;
-}
-
-/**
- * mpris_media_player2_set_identity: (skip)
- * @object: A #MprisMediaPlayer2.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2.Identity">"Identity"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_set_identity (MprisMediaPlayer2 *object, const gchar *value)
-{
- g_object_set (G_OBJECT (object), "identity", value, NULL);
-}
-
-/**
- * mpris_media_player2_call_quit:
- * @proxy: A #MprisMediaPlayer2Proxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Quit">Quit()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_call_quit_finish() to get the result of the operation.
- *
- * See mpris_media_player2_call_quit_sync() for the synchronous, blocking version of this method.
- */
-void
-mpris_media_player2_call_quit (
- MprisMediaPlayer2 *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "Quit",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * mpris_media_player2_call_quit_finish:
- * @proxy: A #MprisMediaPlayer2Proxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_call_quit().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with mpris_media_player2_call_quit().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_call_quit_finish (
- MprisMediaPlayer2 *proxy,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_call_quit_sync:
- * @proxy: A #MprisMediaPlayer2Proxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Quit">Quit()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_call_quit() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_call_quit_sync (
- MprisMediaPlayer2 *proxy,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "Quit",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_call_raise:
- * @proxy: A #MprisMediaPlayer2Proxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Raise">Raise()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_call_raise_finish() to get the result of the operation.
- *
- * See mpris_media_player2_call_raise_sync() for the synchronous, blocking version of this method.
- */
-void
-mpris_media_player2_call_raise (
- MprisMediaPlayer2 *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "Raise",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * mpris_media_player2_call_raise_finish:
- * @proxy: A #MprisMediaPlayer2Proxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_call_raise().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with mpris_media_player2_call_raise().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_call_raise_finish (
- MprisMediaPlayer2 *proxy,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_call_raise_sync:
- * @proxy: A #MprisMediaPlayer2Proxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Raise">Raise()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_call_raise() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_call_raise_sync (
- MprisMediaPlayer2 *proxy,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "Raise",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_complete_quit:
- * @object: A #MprisMediaPlayer2.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Quit">Quit()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-mpris_media_player2_complete_quit (
- MprisMediaPlayer2 *object,
- GDBusMethodInvocation *invocation)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("()"));
-}
-
-/**
- * mpris_media_player2_complete_raise:
- * @object: A #MprisMediaPlayer2.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2.Raise">Raise()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-mpris_media_player2_complete_raise (
- MprisMediaPlayer2 *object,
- GDBusMethodInvocation *invocation)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("()"));
-}
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * MprisMediaPlayer2Proxy:
- *
- * The #MprisMediaPlayer2Proxy structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * MprisMediaPlayer2ProxyClass:
- * @parent_class: The parent class.
- *
- * Class structure for #MprisMediaPlayer2Proxy.
- */
-
-struct _MprisMediaPlayer2ProxyPrivate
-{
- GData *qdata;
-};
-
-static void mpris_media_player2_proxy_iface_init (MprisMediaPlayer2Iface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (MprisMediaPlayer2Proxy, mpris_media_player2_proxy, G_TYPE_DBUS_PROXY,
- G_IMPLEMENT_INTERFACE (MPRIS_TYPE_MEDIA_PLAYER2, mpris_media_player2_proxy_iface_init));
-
-static void
-mpris_media_player2_proxy_finalize (GObject *object)
-{
- MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (object);
- g_datalist_clear (&proxy->priv->qdata);
- G_OBJECT_CLASS (mpris_media_player2_proxy_parent_class)->finalize (object);
-}
-
-static void
-mpris_media_player2_proxy_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- const _ExtendedGDBusPropertyInfo *info;
- GVariant *variant;
- g_assert (prop_id != 0 && prop_id - 1 < 4);
- info = _mpris_media_player2_property_info_pointers[prop_id - 1];
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name);
- if (info->use_gvariant)
- {
- g_value_set_variant (value, variant);
- }
- else
- {
- if (variant != NULL)
- g_dbus_gvariant_to_gvalue (variant, value);
- }
- if (variant != NULL)
- g_variant_unref (variant);
-}
-
-static void
-mpris_media_player2_proxy_set_property_cb (GDBusProxy *proxy,
- GAsyncResult *res,
- gpointer user_data)
-{
- const _ExtendedGDBusPropertyInfo *info = user_data;
- GError *error;
- error = NULL;
- if (!g_dbus_proxy_call_finish (proxy, res, &error))
- {
- g_warning ("Error setting property `%s' on interface org.mpris.MediaPlayer2: %s (%s, %d)",
- info->parent_struct.name, 
- error->message, g_quark_to_string (error->domain), error->code);
- g_error_free (error);
- }
-}
-
-static void
-mpris_media_player2_proxy_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- const _ExtendedGDBusPropertyInfo *info;
- GVariant *variant;
- g_assert (prop_id != 0 && prop_id - 1 < 4);
- info = _mpris_media_player2_property_info_pointers[prop_id - 1];
- variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature));
- g_dbus_proxy_call (G_DBUS_PROXY (object),
- "org.freedesktop.DBus.Properties.Set",
- g_variant_new ("(ssv)", "org.mpris.MediaPlayer2", info->parent_struct.name, variant),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL, (GAsyncReadyCallback) mpris_media_player2_proxy_set_property_cb, (gpointer) info);
- g_variant_unref (variant);
-}
-
-static void
-mpris_media_player2_proxy_g_signal (GDBusProxy *proxy,
- const gchar *sender_name,
- const gchar *signal_name,
- GVariant *parameters)
-{
- _ExtendedGDBusSignalInfo *info;
- GVariantIter iter;
- GVariant *child;
- GValue *paramv;
- guint num_params;
- guint n;
- guint signal_id;
- info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_mpris_media_player2_interface_info, signal_name);
- if (info == NULL)
- return;
- num_params = g_variant_n_children (parameters);
- paramv = g_new0 (GValue, num_params + 1);
- g_value_init (&paramv[0], MPRIS_TYPE_MEDIA_PLAYER2);
- g_value_set_object (&paramv[0], proxy);
- g_variant_iter_init (&iter, parameters);
- n = 1;
- while ((child = g_variant_iter_next_value (&iter)) != NULL)
- {
- _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1];
- if (arg_info->use_gvariant)
- {
- g_value_init (&paramv[n], G_TYPE_VARIANT);
- g_value_set_variant (&paramv[n], child);
- n++;
- }
- else
- g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
- g_variant_unref (child);
- }
- signal_id = g_signal_lookup (info->signal_name, MPRIS_TYPE_MEDIA_PLAYER2);
- g_signal_emitv (paramv, signal_id, 0, NULL);
- for (n = 0; n < num_params + 1; n++)
- g_value_unset (&paramv[n]);
- g_free (paramv);
-}
-
-static void
-mpris_media_player2_proxy_g_properties_changed (GDBusProxy *_proxy,
- GVariant *changed_properties,
- const gchar *const *invalidated_properties)
-{
- MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (_proxy);
- guint n;
- const gchar *key;
- GVariantIter *iter;
- _ExtendedGDBusPropertyInfo *info;
- g_variant_get (changed_properties, "a{sv}", &iter);
- while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
- {
- info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_interface_info, key);
- g_datalist_remove_data (&proxy->priv->qdata, key);
- if (info != NULL)
- g_object_notify (G_OBJECT (proxy), info->hyphen_name);
- }
- g_variant_iter_free (iter);
- for (n = 0; invalidated_properties[n] != NULL; n++)
- {
- info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_interface_info, invalidated_properties[n]);
- g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
- if (info != NULL)
- g_object_notify (G_OBJECT (proxy), info->hyphen_name);
- }
-}
-
-static gboolean 
-mpris_media_player2_proxy_get_can_quit (MprisMediaPlayer2 *object)
-{
- MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (object);
- GVariant *variant;
- gboolean value = 0;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanQuit");
- if (variant != NULL)
- {
- value = g_variant_get_boolean (variant);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static gboolean 
-mpris_media_player2_proxy_get_can_raise (MprisMediaPlayer2 *object)
-{
- MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (object);
- GVariant *variant;
- gboolean value = 0;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanRaise");
- if (variant != NULL)
- {
- value = g_variant_get_boolean (variant);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static const gchar *
-mpris_media_player2_proxy_get_desktop_entry (MprisMediaPlayer2 *object)
-{
- MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (object);
- GVariant *variant;
- const gchar *value = NULL;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "DesktopEntry");
- if (variant != NULL)
- {
- value = g_variant_get_string (variant, NULL);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static const gchar *
-mpris_media_player2_proxy_get_identity (MprisMediaPlayer2 *object)
-{
- MprisMediaPlayer2Proxy *proxy = MPRIS_MEDIA_PLAYER2_PROXY (object);
- GVariant *variant;
- const gchar *value = NULL;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Identity");
- if (variant != NULL)
- {
- value = g_variant_get_string (variant, NULL);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static void
-mpris_media_player2_proxy_init (MprisMediaPlayer2Proxy *proxy)
-{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, MPRIS_TYPE_MEDIA_PLAYER2_PROXY, MprisMediaPlayer2ProxyPrivate);
- g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), mpris_media_player2_interface_info ());
-}
-
-static void
-mpris_media_player2_proxy_class_init (MprisMediaPlayer2ProxyClass *klass)
-{
- GObjectClass *gobject_class;
- GDBusProxyClass *proxy_class;
-
- g_type_class_add_private (klass, sizeof (MprisMediaPlayer2ProxyPrivate));
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = mpris_media_player2_proxy_finalize;
- gobject_class->get_property = mpris_media_player2_proxy_get_property;
- gobject_class->set_property = mpris_media_player2_proxy_set_property;
-
- proxy_class = G_DBUS_PROXY_CLASS (klass);
- proxy_class->g_signal = mpris_media_player2_proxy_g_signal;
- proxy_class->g_properties_changed = mpris_media_player2_proxy_g_properties_changed;
-
-
- mpris_media_player2_override_properties (gobject_class, 1);
-}
-
-static void
-mpris_media_player2_proxy_iface_init (MprisMediaPlayer2Iface *iface)
-{
- iface->get_can_quit = mpris_media_player2_proxy_get_can_quit;
- iface->get_can_raise = mpris_media_player2_proxy_get_can_raise;
- iface->get_desktop_entry = mpris_media_player2_proxy_get_desktop_entry;
- iface->get_identity = mpris_media_player2_proxy_get_identity;
-}
-
-/**
- * mpris_media_player2_proxy_new:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link>. See g_dbus_proxy_new() for more details.
- *
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_proxy_new_finish() to get the result of the operation.
- *
- * See mpris_media_player2_proxy_new_sync() for the synchronous, blocking version of this constructor.
- */
-void
-mpris_media_player2_proxy_new (
- GDBusConnection *connection,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_async_initable_new_async (MPRIS_TYPE_MEDIA_PLAYER2_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2", NULL);
-}
-
-/**
- * mpris_media_player2_proxy_new_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_proxy_new().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with mpris_media_player2_proxy_new().
- *
- * Returns: (transfer full) (type MprisMediaPlayer2Proxy): The constructed proxy object or %NULL if @error is set.
- */
-MprisMediaPlayer2 *
-mpris_media_player2_proxy_new_finish (
- GAsyncResult *res,
- GError **error)
-{
- GObject *ret;
- GObject *source_object;
- source_object = g_async_result_get_source_object (res);
- ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
- g_object_unref (source_object);
- if (ret != NULL)
- return MPRIS_MEDIA_PLAYER2 (ret);
- else
- return NULL;
-}
-
-/**
- * mpris_media_player2_proxy_new_sync:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Synchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link>. See g_dbus_proxy_new_sync() for more details.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_proxy_new() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type MprisMediaPlayer2Proxy): The constructed proxy object or %NULL if @error is set.
- */
-MprisMediaPlayer2 *
-mpris_media_player2_proxy_new_sync (
- GDBusConnection *connection,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GError **error)
-{
- GInitable *ret;
- ret = g_initable_new (MPRIS_TYPE_MEDIA_PLAYER2_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2", NULL);
- if (ret != NULL)
- return MPRIS_MEDIA_PLAYER2 (ret);
- else
- return NULL;
-}
-
-
-/**
- * mpris_media_player2_proxy_new_for_bus:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Like mpris_media_player2_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
- *
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_proxy_new_for_bus_finish() to get the result of the operation.
- *
- * See mpris_media_player2_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
- */
-void
-mpris_media_player2_proxy_new_for_bus (
- GBusType bus_type,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_async_initable_new_async (MPRIS_TYPE_MEDIA_PLAYER2_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2", NULL);
-}
-
-/**
- * mpris_media_player2_proxy_new_for_bus_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_proxy_new_for_bus().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with mpris_media_player2_proxy_new_for_bus().
- *
- * Returns: (transfer full) (type MprisMediaPlayer2Proxy): The constructed proxy object or %NULL if @error is set.
- */
-MprisMediaPlayer2 *
-mpris_media_player2_proxy_new_for_bus_finish (
- GAsyncResult *res,
- GError **error)
-{
- GObject *ret;
- GObject *source_object;
- source_object = g_async_result_get_source_object (res);
- ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
- g_object_unref (source_object);
- if (ret != NULL)
- return MPRIS_MEDIA_PLAYER2 (ret);
- else
- return NULL;
-}
-
-/**
- * mpris_media_player2_proxy_new_for_bus_sync:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Like mpris_media_player2_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_proxy_new_for_bus() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type MprisMediaPlayer2Proxy): The constructed proxy object or %NULL if @error is set.
- */
-MprisMediaPlayer2 *
-mpris_media_player2_proxy_new_for_bus_sync (
- GBusType bus_type,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GError **error)
-{
- GInitable *ret;
- ret = g_initable_new (MPRIS_TYPE_MEDIA_PLAYER2_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2", NULL);
- if (ret != NULL)
- return MPRIS_MEDIA_PLAYER2 (ret);
- else
- return NULL;
-}
-
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * MprisMediaPlayer2Skeleton:
- *
- * The #MprisMediaPlayer2Skeleton structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * MprisMediaPlayer2SkeletonClass:
- * @parent_class: The parent class.
- *
- * Class structure for #MprisMediaPlayer2Skeleton.
- */
-
-struct _MprisMediaPlayer2SkeletonPrivate
-{
- GValue *properties;
- GList *changed_properties;
- GSource *changed_properties_idle_source;
- GMainContext *context;
- GMutex lock;
-};
-
-static void
-_mpris_media_player2_skeleton_handle_method_call (
- GDBusConnection *connection,
- const gchar *sender,
- const gchar *object_path,
- const gchar *interface_name,
- const gchar *method_name,
- GVariant *parameters,
- GDBusMethodInvocation *invocation,
- gpointer user_data)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (user_data);
- _ExtendedGDBusMethodInfo *info;
- GVariantIter iter;
- GVariant *child;
- GValue *paramv;
- guint num_params;
- guint num_extra;
- guint n;
- guint signal_id;
- GValue return_value = G_VALUE_INIT;
- info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
- g_assert (info != NULL);
- num_params = g_variant_n_children (parameters);
- num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra);
- n = 0;
- g_value_init (&paramv[n], MPRIS_TYPE_MEDIA_PLAYER2);
- g_value_set_object (&paramv[n++], skeleton);
- g_value_init (&paramv[n], G_TYPE_DBUS_METHOD_INVOCATION);
- g_value_set_object (&paramv[n++], invocation);
- if (info->pass_fdlist)
- {
-#ifdef G_OS_UNIX
- g_value_init (&paramv[n], G_TYPE_UNIX_FD_LIST);
- g_value_set_object (&paramv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)));
-#else
- g_assert_not_reached ();
-#endif
- }
- g_variant_iter_init (&iter, parameters);
- while ((child = g_variant_iter_next_value (&iter)) != NULL)
- {
- _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra];
- if (arg_info->use_gvariant)
- {
- g_value_init (&paramv[n], G_TYPE_VARIANT);
- g_value_set_variant (&paramv[n], child);
- n++;
- }
- else
- g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
- g_variant_unref (child);
- }
- signal_id = g_signal_lookup (info->signal_name, MPRIS_TYPE_MEDIA_PLAYER2);
- g_value_init (&return_value, G_TYPE_BOOLEAN);
- g_signal_emitv (paramv, signal_id, 0, &return_value);
- if (!g_value_get_boolean (&return_value))
- g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name);
- g_value_unset (&return_value);
- for (n = 0; n < num_params + num_extra; n++)
- g_value_unset (&paramv[n]);
- g_free (paramv);
-}
-
-static GVariant *
-_mpris_media_player2_skeleton_handle_get_property (
- GDBusConnection *connection,
- const gchar *sender,
- const gchar *object_path,
- const gchar *interface_name,
- const gchar *property_name,
- GError **error,
- gpointer user_data)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (user_data);
- GValue value = G_VALUE_INIT;
- GParamSpec *pspec;
- _ExtendedGDBusPropertyInfo *info;
- GVariant *ret;
- ret = NULL;
- info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_interface_info, property_name);
- g_assert (info != NULL);
- pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
- if (pspec == NULL)
- {
- g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
- }
- else
- {
- g_value_init (&value, pspec->value_type);
- g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value);
- ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature));
- g_value_unset (&value);
- }
- return ret;
-}
-
-static gboolean
-_mpris_media_player2_skeleton_handle_set_property (
- GDBusConnection *connection,
- const gchar *sender,
- const gchar *object_path,
- const gchar *interface_name,
- const gchar *property_name,
- GVariant *variant,
- GError **error,
- gpointer user_data)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (user_data);
- GValue value = G_VALUE_INIT;
- GParamSpec *pspec;
- _ExtendedGDBusPropertyInfo *info;
- gboolean ret;
- ret = FALSE;
- info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_interface_info, property_name);
- g_assert (info != NULL);
- pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
- if (pspec == NULL)
- {
- g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
- }
- else
- {
- if (info->use_gvariant)
- g_value_set_variant (&value, variant);
- else
- g_dbus_gvariant_to_gvalue (variant, &value);
- g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value);
- g_value_unset (&value);
- ret = TRUE;
- }
- return ret;
-}
-
-static const GDBusInterfaceVTable _mpris_media_player2_skeleton_vtable =
-{
- _mpris_media_player2_skeleton_handle_method_call,
- _mpris_media_player2_skeleton_handle_get_property,
- _mpris_media_player2_skeleton_handle_set_property
-};
-
-static GDBusInterfaceInfo *
-mpris_media_player2_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton)
-{
- return mpris_media_player2_interface_info ();
-}
-
-static GDBusInterfaceVTable *
-mpris_media_player2_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton)
-{
- return (GDBusInterfaceVTable *) &_mpris_media_player2_skeleton_vtable;
-}
-
-static GVariant *
-mpris_media_player2_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (_skeleton);
-
- GVariantBuilder builder;
- guint n;
- g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
- if (_mpris_media_player2_interface_info.parent_struct.properties == NULL)
- goto out;
- for (n = 0; _mpris_media_player2_interface_info.parent_struct.properties[n] != NULL; n++)
- {
- GDBusPropertyInfo *info = _mpris_media_player2_interface_info.parent_struct.properties[n];
- if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
- {
- GVariant *value;
- value = _mpris_media_player2_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.mpris.MediaPlayer2", info->name, NULL, skeleton);
- if (value != NULL)
- {
- g_variant_take_ref (value);
- g_variant_builder_add (&builder, "{sv}", info->name, value);
- g_variant_unref (value);
- }
- }
- }
-out:
- return g_variant_builder_end (&builder);
-}
-
-static gboolean _mpris_media_player2_emit_changed (gpointer user_data);
-
-static void
-mpris_media_player2_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (_skeleton);
- gboolean emit_changed = FALSE;
-
- g_mutex_lock (&skeleton->priv->lock);
- if (skeleton->priv->changed_properties_idle_source != NULL)
- {
- g_source_destroy (skeleton->priv->changed_properties_idle_source);
- skeleton->priv->changed_properties_idle_source = NULL;
- emit_changed = TRUE;
- }
- g_mutex_unlock (&skeleton->priv->lock);
-
- if (emit_changed)
- _mpris_media_player2_emit_changed (skeleton);
-}
-
-static void mpris_media_player2_skeleton_iface_init (MprisMediaPlayer2Iface *iface);
-G_DEFINE_TYPE_WITH_CODE (MprisMediaPlayer2Skeleton, mpris_media_player2_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
- G_IMPLEMENT_INTERFACE (MPRIS_TYPE_MEDIA_PLAYER2, mpris_media_player2_skeleton_iface_init));
-
-static void
-mpris_media_player2_skeleton_finalize (GObject *object)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
- guint n;
- for (n = 0; n < 4; n++)
- g_value_unset (&skeleton->priv->properties[n]);
- g_free (skeleton->priv->properties);
- g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free);
- if (skeleton->priv->changed_properties_idle_source != NULL)
- g_source_destroy (skeleton->priv->changed_properties_idle_source);
- g_main_context_unref (skeleton->priv->context);
- g_mutex_clear (&skeleton->priv->lock);
- G_OBJECT_CLASS (mpris_media_player2_skeleton_parent_class)->finalize (object);
-}
-
-static void
-mpris_media_player2_skeleton_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
- g_assert (prop_id != 0 && prop_id - 1 < 4);
- g_mutex_lock (&skeleton->priv->lock);
- g_value_copy (&skeleton->priv->properties[prop_id - 1], value);
- g_mutex_unlock (&skeleton->priv->lock);
-}
-
-static gboolean
-_mpris_media_player2_emit_changed (gpointer user_data)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (user_data);
- GList *l;
- GVariantBuilder builder;
- GVariantBuilder invalidated_builder;
- guint num_changes;
-
- g_mutex_lock (&skeleton->priv->lock);
- g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
- g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as"));
- for (l = skeleton->priv->changed_properties, num_changes = 0; l != NULL; l = l->next)
- {
- ChangedProperty *cp = l->data;
- GVariant *variant;
- const GValue *cur_value;
-
- cur_value = &skeleton->priv->properties[cp->prop_id - 1];
- if (!_g_value_equal (cur_value, &cp->orig_value))
- {
- variant = g_dbus_gvalue_to_gvariant (cur_value, G_VARIANT_TYPE (cp->info->parent_struct.signature));
- g_variant_builder_add (&builder, "{sv}", cp->info->parent_struct.name, variant);
- g_variant_unref (variant);
- num_changes++;
- }
- }
- if (num_changes > 0)
- {
- GList *connections, *l;
- GVariant *signal_variant;
- signal_variant = g_variant_ref_sink (g_variant_new ("(sa{sv}as)", "org.mpris.MediaPlayer2",
- &builder, &invalidated_builder));
- connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
- for (l = connections; l != NULL; l = l->next)
- {
- GDBusConnection *connection = l->data;
-
- g_dbus_connection_emit_signal (connection,
- NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)),
- "org.freedesktop.DBus.Properties",
- "PropertiesChanged",
- signal_variant,
- NULL);
- }
- g_variant_unref (signal_variant);
- g_list_free_full (connections, g_object_unref);
- }
- else
- {
- g_variant_builder_clear (&builder);
- g_variant_builder_clear (&invalidated_builder);
- }
- g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free);
- skeleton->priv->changed_properties = NULL;
- skeleton->priv->changed_properties_idle_source = NULL;
- g_mutex_unlock (&skeleton->priv->lock);
- return FALSE;
-}
-
-static void
-_mpris_media_player2_schedule_emit_changed (MprisMediaPlayer2Skeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)
-{
- ChangedProperty *cp;
- GList *l;
- cp = NULL;
- for (l = skeleton->priv->changed_properties; l != NULL; l = l->next)
- {
- ChangedProperty *i_cp = l->data;
- if (i_cp->info == info)
- {
- cp = i_cp;
- break;
- }
- }
- if (cp == NULL)
- {
- cp = g_new0 (ChangedProperty, 1);
- cp->prop_id = prop_id;
- cp->info = info;
- skeleton->priv->changed_properties = g_list_prepend (skeleton->priv->changed_properties, cp);
- g_value_init (&cp->orig_value, G_VALUE_TYPE (orig_value));
- g_value_copy (orig_value, &cp->orig_value);
- }
-}
-
-static void
-mpris_media_player2_skeleton_notify (GObject *object,
- GParamSpec *pspec)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
- g_mutex_lock (&skeleton->priv->lock);
- if (skeleton->priv->changed_properties != NULL &&
- skeleton->priv->changed_properties_idle_source == NULL)
- {
- skeleton->priv->changed_properties_idle_source = g_idle_source_new ();
- g_source_set_priority (skeleton->priv->changed_properties_idle_source, G_PRIORITY_DEFAULT);
- g_source_set_callback (skeleton->priv->changed_properties_idle_source, _mpris_media_player2_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);
- g_source_attach (skeleton->priv->changed_properties_idle_source, skeleton->priv->context);
- g_source_unref (skeleton->priv->changed_properties_idle_source);
- }
- g_mutex_unlock (&skeleton->priv->lock);
-}
-
-static void
-mpris_media_player2_skeleton_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
- g_assert (prop_id != 0 && prop_id - 1 < 4);
- g_mutex_lock (&skeleton->priv->lock);
- g_object_freeze_notify (object);
- if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1]))
- {
- if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL)
- _mpris_media_player2_schedule_emit_changed (skeleton, _mpris_media_player2_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]);
- g_value_copy (value, &skeleton->priv->properties[prop_id - 1]);
- g_object_notify_by_pspec (object, pspec);
- }
- g_mutex_unlock (&skeleton->priv->lock);
- g_object_thaw_notify (object);
-}
-
-static void
-mpris_media_player2_skeleton_init (MprisMediaPlayer2Skeleton *skeleton)
-{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, MPRIS_TYPE_MEDIA_PLAYER2_SKELETON, MprisMediaPlayer2SkeletonPrivate);
- g_mutex_init (&skeleton->priv->lock);
- skeleton->priv->context = g_main_context_ref_thread_default ();
- skeleton->priv->properties = g_new0 (GValue, 4);
- g_value_init (&skeleton->priv->properties[0], G_TYPE_BOOLEAN);
- g_value_init (&skeleton->priv->properties[1], G_TYPE_BOOLEAN);
- g_value_init (&skeleton->priv->properties[2], G_TYPE_STRING);
- g_value_init (&skeleton->priv->properties[3], G_TYPE_STRING);
-}
-
-static gboolean 
-mpris_media_player2_skeleton_get_can_quit (MprisMediaPlayer2 *object)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
- gboolean value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_boolean (&(skeleton->priv->properties[0]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static gboolean 
-mpris_media_player2_skeleton_get_can_raise (MprisMediaPlayer2 *object)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
- gboolean value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_boolean (&(skeleton->priv->properties[1]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static const gchar *
-mpris_media_player2_skeleton_get_desktop_entry (MprisMediaPlayer2 *object)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
- const gchar *value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_string (&(skeleton->priv->properties[2]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static const gchar *
-mpris_media_player2_skeleton_get_identity (MprisMediaPlayer2 *object)
-{
- MprisMediaPlayer2Skeleton *skeleton = MPRIS_MEDIA_PLAYER2_SKELETON (object);
- const gchar *value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_string (&(skeleton->priv->properties[3]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static void
-mpris_media_player2_skeleton_class_init (MprisMediaPlayer2SkeletonClass *klass)
-{
- GObjectClass *gobject_class;
- GDBusInterfaceSkeletonClass *skeleton_class;
-
- g_type_class_add_private (klass, sizeof (MprisMediaPlayer2SkeletonPrivate));
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = mpris_media_player2_skeleton_finalize;
- gobject_class->get_property = mpris_media_player2_skeleton_get_property;
- gobject_class->set_property = mpris_media_player2_skeleton_set_property;
- gobject_class->notify = mpris_media_player2_skeleton_notify;
-
-
- mpris_media_player2_override_properties (gobject_class, 1);
-
- skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
- skeleton_class->get_info = mpris_media_player2_skeleton_dbus_interface_get_info;
- skeleton_class->get_properties = mpris_media_player2_skeleton_dbus_interface_get_properties;
- skeleton_class->flush = mpris_media_player2_skeleton_dbus_interface_flush;
- skeleton_class->get_vtable = mpris_media_player2_skeleton_dbus_interface_get_vtable;
-}
-
-static void
-mpris_media_player2_skeleton_iface_init (MprisMediaPlayer2Iface *iface)
-{
- iface->get_can_quit = mpris_media_player2_skeleton_get_can_quit;
- iface->get_can_raise = mpris_media_player2_skeleton_get_can_raise;
- iface->get_desktop_entry = mpris_media_player2_skeleton_get_desktop_entry;
- iface->get_identity = mpris_media_player2_skeleton_get_identity;
-}
-
-/**
- * mpris_media_player2_skeleton_new:
- *
- * Creates a skeleton object for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2.top_of_page">org.mpris.MediaPlayer2</link>.
- *
- * Returns: (transfer full) (type MprisMediaPlayer2Skeleton): The skeleton object.
- */
-MprisMediaPlayer2 *
-mpris_media_player2_skeleton_new (void)
-{
- return MPRIS_MEDIA_PLAYER2 (g_object_new (MPRIS_TYPE_MEDIA_PLAYER2_SKELETON, NULL));
-}
-

audacious-plugins-3.3.4.tar.bz2/src/mpris2/object-core.h Deleted

@@ -1,216 +0,0 @@
-/*
- * Generated by gdbus-codegen 2.32.2. DO NOT EDIT.
- *
- * The license of this code is the same as for the source it was derived from.
- */
-
-#ifndef __OBJECT_CORE_H__
-#define __OBJECT_CORE_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-
-/* ------------------------------------------------------------------------ */
-/* Declarations for org.mpris.MediaPlayer2 */
-
-#define MPRIS_TYPE_MEDIA_PLAYER2 (mpris_media_player2_get_type ())
-#define MPRIS_MEDIA_PLAYER2(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MPRIS_TYPE_MEDIA_PLAYER2, MprisMediaPlayer2))
-#define MPRIS_IS_MEDIA_PLAYER2(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MPRIS_TYPE_MEDIA_PLAYER2))
-#define MPRIS_MEDIA_PLAYER2_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), MPRIS_TYPE_MEDIA_PLAYER2, MprisMediaPlayer2Iface))
-
-struct _MprisMediaPlayer2;
-typedef struct _MprisMediaPlayer2 MprisMediaPlayer2;
-typedef struct _MprisMediaPlayer2Iface MprisMediaPlayer2Iface;
-
-struct _MprisMediaPlayer2Iface
-{
- GTypeInterface parent_iface;
-
-
- gboolean (*handle_quit) (
- MprisMediaPlayer2 *object,
- GDBusMethodInvocation *invocation);
-
- gboolean (*handle_raise) (
- MprisMediaPlayer2 *object,
- GDBusMethodInvocation *invocation);
-
- gboolean (*get_can_quit) (MprisMediaPlayer2 *object);
-
- gboolean (*get_can_raise) (MprisMediaPlayer2 *object);
-
- const gchar * (*get_desktop_entry) (MprisMediaPlayer2 *object);
-
- const gchar * (*get_identity) (MprisMediaPlayer2 *object);
-
-};
-
-GType mpris_media_player2_get_type (void) G_GNUC_CONST;
-
-GDBusInterfaceInfo *mpris_media_player2_interface_info (void);
-guint mpris_media_player2_override_properties (GObjectClass *klass, guint property_id_begin);
-
-
-/* D-Bus method call completion functions: */
-void mpris_media_player2_complete_quit (
- MprisMediaPlayer2 *object,
- GDBusMethodInvocation *invocation);
-
-void mpris_media_player2_complete_raise (
- MprisMediaPlayer2 *object,
- GDBusMethodInvocation *invocation);
-
-
-
-/* D-Bus method calls: */
-void mpris_media_player2_call_quit (
- MprisMediaPlayer2 *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean mpris_media_player2_call_quit_finish (
- MprisMediaPlayer2 *proxy,
- GAsyncResult *res,
- GError **error);
-
-gboolean mpris_media_player2_call_quit_sync (
- MprisMediaPlayer2 *proxy,
- GCancellable *cancellable,
- GError **error);
-
-void mpris_media_player2_call_raise (
- MprisMediaPlayer2 *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean mpris_media_player2_call_raise_finish (
- MprisMediaPlayer2 *proxy,
- GAsyncResult *res,
- GError **error);
-
-gboolean mpris_media_player2_call_raise_sync (
- MprisMediaPlayer2 *proxy,
- GCancellable *cancellable,
- GError **error);
-
-
-
-/* D-Bus property accessors: */
-gboolean mpris_media_player2_get_can_quit (MprisMediaPlayer2 *object);
-void mpris_media_player2_set_can_quit (MprisMediaPlayer2 *object, gboolean value);
-
-gboolean mpris_media_player2_get_can_raise (MprisMediaPlayer2 *object);
-void mpris_media_player2_set_can_raise (MprisMediaPlayer2 *object, gboolean value);
-
-const gchar *mpris_media_player2_get_desktop_entry (MprisMediaPlayer2 *object);
-gchar *mpris_media_player2_dup_desktop_entry (MprisMediaPlayer2 *object);
-void mpris_media_player2_set_desktop_entry (MprisMediaPlayer2 *object, const gchar *value);
-
-const gchar *mpris_media_player2_get_identity (MprisMediaPlayer2 *object);
-gchar *mpris_media_player2_dup_identity (MprisMediaPlayer2 *object);
-void mpris_media_player2_set_identity (MprisMediaPlayer2 *object, const gchar *value);
-
-
-/* ---- */
-
-#define MPRIS_TYPE_MEDIA_PLAYER2_PROXY (mpris_media_player2_proxy_get_type ())
-#define MPRIS_MEDIA_PLAYER2_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MPRIS_TYPE_MEDIA_PLAYER2_PROXY, MprisMediaPlayer2Proxy))
-#define MPRIS_MEDIA_PLAYER2_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), MPRIS_TYPE_MEDIA_PLAYER2_PROXY, MprisMediaPlayer2ProxyClass))
-#define MPRIS_MEDIA_PLAYER2_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MPRIS_TYPE_MEDIA_PLAYER2_PROXY, MprisMediaPlayer2ProxyClass))
-#define MPRIS_IS_MEDIA_PLAYER2_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MPRIS_TYPE_MEDIA_PLAYER2_PROXY))
-#define MPRIS_IS_MEDIA_PLAYER2_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MPRIS_TYPE_MEDIA_PLAYER2_PROXY))
-
-typedef struct _MprisMediaPlayer2Proxy MprisMediaPlayer2Proxy;
-typedef struct _MprisMediaPlayer2ProxyClass MprisMediaPlayer2ProxyClass;
-typedef struct _MprisMediaPlayer2ProxyPrivate MprisMediaPlayer2ProxyPrivate;
-
-struct _MprisMediaPlayer2Proxy
-{
- /*< private >*/
- GDBusProxy parent_instance;
- MprisMediaPlayer2ProxyPrivate *priv;
-};
-
-struct _MprisMediaPlayer2ProxyClass
-{
- GDBusProxyClass parent_class;
-};
-
-GType mpris_media_player2_proxy_get_type (void) G_GNUC_CONST;
-
-void mpris_media_player2_proxy_new (
- GDBusConnection *connection,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-MprisMediaPlayer2 *mpris_media_player2_proxy_new_finish (
- GAsyncResult *res,
- GError **error);
-MprisMediaPlayer2 *mpris_media_player2_proxy_new_sync (
- GDBusConnection *connection,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GError **error);
-
-void mpris_media_player2_proxy_new_for_bus (
- GBusType bus_type,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-MprisMediaPlayer2 *mpris_media_player2_proxy_new_for_bus_finish (
- GAsyncResult *res,
- GError **error);
-MprisMediaPlayer2 *mpris_media_player2_proxy_new_for_bus_sync (
- GBusType bus_type,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GError **error);
-
-
-/* ---- */
-
-#define MPRIS_TYPE_MEDIA_PLAYER2_SKELETON (mpris_media_player2_skeleton_get_type ())
-#define MPRIS_MEDIA_PLAYER2_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MPRIS_TYPE_MEDIA_PLAYER2_SKELETON, MprisMediaPlayer2Skeleton))
-#define MPRIS_MEDIA_PLAYER2_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), MPRIS_TYPE_MEDIA_PLAYER2_SKELETON, MprisMediaPlayer2SkeletonClass))
-#define MPRIS_MEDIA_PLAYER2_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MPRIS_TYPE_MEDIA_PLAYER2_SKELETON, MprisMediaPlayer2SkeletonClass))
-#define MPRIS_IS_MEDIA_PLAYER2_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MPRIS_TYPE_MEDIA_PLAYER2_SKELETON))
-#define MPRIS_IS_MEDIA_PLAYER2_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MPRIS_TYPE_MEDIA_PLAYER2_SKELETON))
-
-typedef struct _MprisMediaPlayer2Skeleton MprisMediaPlayer2Skeleton;
-typedef struct _MprisMediaPlayer2SkeletonClass MprisMediaPlayer2SkeletonClass;
-typedef struct _MprisMediaPlayer2SkeletonPrivate MprisMediaPlayer2SkeletonPrivate;
-
-struct _MprisMediaPlayer2Skeleton
-{
- /*< private >*/
- GDBusInterfaceSkeleton parent_instance;
- MprisMediaPlayer2SkeletonPrivate *priv;
-};
-
-struct _MprisMediaPlayer2SkeletonClass
-{
- GDBusInterfaceSkeletonClass parent_class;
-};
-
-GType mpris_media_player2_skeleton_get_type (void) G_GNUC_CONST;
-
-MprisMediaPlayer2 *mpris_media_player2_skeleton_new (void);
-
-
-G_END_DECLS
-
-#endif /* __OBJECT_CORE_H__ */

audacious-plugins-3.3.4.tar.bz2/src/mpris2/object-player.c Deleted

@@ -1,3276 +0,0 @@
-/*
- * Generated by gdbus-codegen 2.32.2. DO NOT EDIT.
- *
- * The license of this code is the same as for the source it was derived from.
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "object-player.h"
-
-#ifdef G_OS_UNIX
-# include <gio/gunixfdlist.h>
-#endif
-
-typedef struct
-{
- GDBusArgInfo parent_struct;
- gboolean use_gvariant;
-} _ExtendedGDBusArgInfo;
-
-typedef struct
-{
- GDBusMethodInfo parent_struct;
- const gchar *signal_name;
- gboolean pass_fdlist;
-} _ExtendedGDBusMethodInfo;
-
-typedef struct
-{
- GDBusSignalInfo parent_struct;
- const gchar *signal_name;
-} _ExtendedGDBusSignalInfo;
-
-typedef struct
-{
- GDBusPropertyInfo parent_struct;
- const gchar *hyphen_name;
- gboolean use_gvariant;
-} _ExtendedGDBusPropertyInfo;
-
-typedef struct
-{
- GDBusInterfaceInfo parent_struct;
- const gchar *hyphen_name;
-} _ExtendedGDBusInterfaceInfo;
-
-typedef struct
-{
- const _ExtendedGDBusPropertyInfo *info;
- guint prop_id;
- GValue orig_value; /* the value before the change */
-} ChangedProperty;
-
-static void
-_changed_property_free (ChangedProperty *data)
-{
- g_value_unset (&data->orig_value);
- g_free (data);
-}
-
-static gboolean
-_g_strv_equal0 (gchar **a, gchar **b)
-{
- gboolean ret = FALSE;
- guint n;
- if (a == NULL && b == NULL)
- {
- ret = TRUE;
- goto out;
- }
- if (a == NULL || b == NULL)
- goto out;
- if (g_strv_length (a) != g_strv_length (b))
- goto out;
- for (n = 0; a[n] != NULL; n++)
- if (g_strcmp0 (a[n], b[n]) != 0)
- goto out;
- ret = TRUE;
-out:
- return ret;
-}
-
-static gboolean
-_g_variant_equal0 (GVariant *a, GVariant *b)
-{
- gboolean ret = FALSE;
- if (a == NULL && b == NULL)
- {
- ret = TRUE;
- goto out;
- }
- if (a == NULL || b == NULL)
- goto out;
- ret = g_variant_equal (a, b);
-out:
- return ret;
-}
-
-G_GNUC_UNUSED static gboolean
-_g_value_equal (const GValue *a, const GValue *b)
-{
- gboolean ret = FALSE;
- g_assert (G_VALUE_TYPE (a) == G_VALUE_TYPE (b));
- switch (G_VALUE_TYPE (a))
- {
- case G_TYPE_BOOLEAN:
- ret = (g_value_get_boolean (a) == g_value_get_boolean (b));
- break;
- case G_TYPE_UCHAR:
- ret = (g_value_get_uchar (a) == g_value_get_uchar (b));
- break;
- case G_TYPE_INT:
- ret = (g_value_get_int (a) == g_value_get_int (b));
- break;
- case G_TYPE_UINT:
- ret = (g_value_get_uint (a) == g_value_get_uint (b));
- break;
- case G_TYPE_INT64:
- ret = (g_value_get_int64 (a) == g_value_get_int64 (b));
- break;
- case G_TYPE_UINT64:
- ret = (g_value_get_uint64 (a) == g_value_get_uint64 (b));
- break;
- case G_TYPE_DOUBLE:
- ret = (g_value_get_double (a) == g_value_get_double (b));
- break;
- case G_TYPE_STRING:
- ret = (g_strcmp0 (g_value_get_string (a), g_value_get_string (b)) == 0);
- break;
- case G_TYPE_VARIANT:
- ret = _g_variant_equal0 (g_value_get_variant (a), g_value_get_variant (b));
- break;
- default:
- if (G_VALUE_TYPE (a) == G_TYPE_STRV)
- ret = _g_strv_equal0 (g_value_get_boxed (a), g_value_get_boxed (b));
- else
- g_critical ("_g_value_equal() does not handle type %s", g_type_name (G_VALUE_TYPE (a)));
- break;
- }
- return ret;
-}
-
-/* ------------------------------------------------------------------------
- * Code for interface org.mpris.MediaPlayer2.Player
- * ------------------------------------------------------------------------
- */
-
-/**
- * SECTION:MprisMediaPlayer2Player
- * @title: MprisMediaPlayer2Player
- * @short_description: Generated C code for the org.mpris.MediaPlayer2.Player D-Bus interface
- *
- * This section contains code for working with the <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link> D-Bus interface in C.
- */
-
-/* ---- Introspection data for org.mpris.MediaPlayer2.Player ---- */
-
-static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_next =
-{
- {
- -1,
- "Next",
- NULL,
- NULL,
- NULL
- },
- "handle-next",
- FALSE
-};
-
-static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_pause =
-{
- {
- -1,
- "Pause",
- NULL,
- NULL,
- NULL
- },
- "handle-pause",
- FALSE
-};
-
-static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_play =
-{
- {
- -1,
- "Play",
- NULL,
- NULL,
- NULL
- },
- "handle-play",
- FALSE
-};
-
-static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_play_pause =
-{
- {
- -1,
- "PlayPause",
- NULL,
- NULL,
- NULL
- },
- "handle-play-pause",
- FALSE
-};
-
-static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_previous =
-{
- {
- -1,
- "Previous",
- NULL,
- NULL,
- NULL
- },
- "handle-previous",
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _mpris_media_player2_player_method_info_seek_IN_ARG_Offset =
-{
- {
- -1,
- "Offset",
- "x",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _mpris_media_player2_player_method_info_seek_IN_ARG_pointers[] =
-{
- &_mpris_media_player2_player_method_info_seek_IN_ARG_Offset,
- NULL
-};
-
-static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_seek =
-{
- {
- -1,
- "Seek",
- (GDBusArgInfo **) &_mpris_media_player2_player_method_info_seek_IN_ARG_pointers,
- NULL,
- NULL
- },
- "handle-seek",
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _mpris_media_player2_player_method_info_set_position_IN_ARG_TrackId =
-{
- {
- -1,
- "TrackId",
- "o",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo _mpris_media_player2_player_method_info_set_position_IN_ARG_Position =
-{
- {
- -1,
- "Position",
- "x",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _mpris_media_player2_player_method_info_set_position_IN_ARG_pointers[] =
-{
- &_mpris_media_player2_player_method_info_set_position_IN_ARG_TrackId,
- &_mpris_media_player2_player_method_info_set_position_IN_ARG_Position,
- NULL
-};
-
-static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_set_position =
-{
- {
- -1,
- "SetPosition",
- (GDBusArgInfo **) &_mpris_media_player2_player_method_info_set_position_IN_ARG_pointers,
- NULL,
- NULL
- },
- "handle-set-position",
- FALSE
-};
-
-static const _ExtendedGDBusMethodInfo _mpris_media_player2_player_method_info_stop =
-{
- {
- -1,
- "Stop",
- NULL,
- NULL,
- NULL
- },
- "handle-stop",
- FALSE
-};
-
-static const _ExtendedGDBusMethodInfo * const _mpris_media_player2_player_method_info_pointers[] =
-{
- &_mpris_media_player2_player_method_info_next,
- &_mpris_media_player2_player_method_info_pause,
- &_mpris_media_player2_player_method_info_play,
- &_mpris_media_player2_player_method_info_play_pause,
- &_mpris_media_player2_player_method_info_previous,
- &_mpris_media_player2_player_method_info_seek,
- &_mpris_media_player2_player_method_info_set_position,
- &_mpris_media_player2_player_method_info_stop,
- NULL
-};
-
-static const _ExtendedGDBusArgInfo _mpris_media_player2_player_signal_info_seeked_ARG_Position =
-{
- {
- -1,
- "Position",
- "x",
- NULL
- },
- FALSE
-};
-
-static const _ExtendedGDBusArgInfo * const _mpris_media_player2_player_signal_info_seeked_ARG_pointers[] =
-{
- &_mpris_media_player2_player_signal_info_seeked_ARG_Position,
- NULL
-};
-
-static const _ExtendedGDBusSignalInfo _mpris_media_player2_player_signal_info_seeked =
-{
- {
- -1,
- "Seeked",
- (GDBusArgInfo **) &_mpris_media_player2_player_signal_info_seeked_ARG_pointers,
- NULL
- },
- "seeked"
-};
-
-static const _ExtendedGDBusSignalInfo * const _mpris_media_player2_player_signal_info_pointers[] =
-{
- &_mpris_media_player2_player_signal_info_seeked,
- NULL
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_can_control =
-{
- {
- -1,
- "CanControl",
- "b",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "can-control",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_can_go_next =
-{
- {
- -1,
- "CanGoNext",
- "b",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "can-go-next",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_can_go_previous =
-{
- {
- -1,
- "CanGoPrevious",
- "b",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "can-go-previous",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_can_pause =
-{
- {
- -1,
- "CanPause",
- "b",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "can-pause",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_can_play =
-{
- {
- -1,
- "CanPlay",
- "b",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "can-play",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_can_seek =
-{
- {
- -1,
- "CanSeek",
- "b",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "can-seek",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_metadata =
-{
- {
- -1,
- "Metadata",
- "a{sv}",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "metadata",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_playback_status =
-{
- {
- -1,
- "PlaybackStatus",
- "s",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "playback-status",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_position =
-{
- {
- -1,
- "Position",
- "x",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE,
- NULL
- },
- "position",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo _mpris_media_player2_player_property_info_volume =
-{
- {
- -1,
- "Volume",
- "d",
- G_DBUS_PROPERTY_INFO_FLAGS_READABLE | G_DBUS_PROPERTY_INFO_FLAGS_WRITABLE,
- NULL
- },
- "volume",
- FALSE
-};
-
-static const _ExtendedGDBusPropertyInfo * const _mpris_media_player2_player_property_info_pointers[] =
-{
- &_mpris_media_player2_player_property_info_can_control,
- &_mpris_media_player2_player_property_info_can_go_next,
- &_mpris_media_player2_player_property_info_can_go_previous,
- &_mpris_media_player2_player_property_info_can_pause,
- &_mpris_media_player2_player_property_info_can_play,
- &_mpris_media_player2_player_property_info_can_seek,
- &_mpris_media_player2_player_property_info_metadata,
- &_mpris_media_player2_player_property_info_playback_status,
- &_mpris_media_player2_player_property_info_position,
- &_mpris_media_player2_player_property_info_volume,
- NULL
-};
-
-static const _ExtendedGDBusInterfaceInfo _mpris_media_player2_player_interface_info =
-{
- {
- -1,
- "org.mpris.MediaPlayer2.Player",
- (GDBusMethodInfo **) &_mpris_media_player2_player_method_info_pointers,
- (GDBusSignalInfo **) &_mpris_media_player2_player_signal_info_pointers,
- (GDBusPropertyInfo **) &_mpris_media_player2_player_property_info_pointers,
- NULL
- },
- "media-player2-player",
-};
-
-
-/**
- * mpris_media_player2_player_interface_info:
- *
- * Gets a machine-readable description of the <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link> D-Bus interface.
- *
- * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free.
- */
-GDBusInterfaceInfo *
-mpris_media_player2_player_interface_info (void)
-{
- return (GDBusInterfaceInfo *) &_mpris_media_player2_player_interface_info;
-}
-
-/**
- * mpris_media_player2_player_override_properties:
- * @klass: The class structure for a #GObject-derived class.
- * @property_id_begin: The property id to assign to the first overridden property.
- *
- * Overrides all #GObject properties in the #MprisMediaPlayer2Player interface for a concrete class.
- * The properties are overridden in the order they are defined.
- *
- * Returns: The last property id.
- */
-guint
-mpris_media_player2_player_override_properties (GObjectClass *klass, guint property_id_begin)
-{
- g_object_class_override_property (klass, property_id_begin++, "can-control");
- g_object_class_override_property (klass, property_id_begin++, "can-go-next");
- g_object_class_override_property (klass, property_id_begin++, "can-go-previous");
- g_object_class_override_property (klass, property_id_begin++, "can-pause");
- g_object_class_override_property (klass, property_id_begin++, "can-play");
- g_object_class_override_property (klass, property_id_begin++, "can-seek");
- g_object_class_override_property (klass, property_id_begin++, "metadata");
- g_object_class_override_property (klass, property_id_begin++, "playback-status");
- g_object_class_override_property (klass, property_id_begin++, "position");
- g_object_class_override_property (klass, property_id_begin++, "volume");
- return property_id_begin - 1;
-}
-
-
-
-/**
- * MprisMediaPlayer2Player:
- *
- * Abstract interface type for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link>.
- */
-
-/**
- * MprisMediaPlayer2PlayerIface:
- * @parent_iface: The parent interface.
- * @handle_next: Handler for the #MprisMediaPlayer2Player::handle-next signal.
- * @handle_pause: Handler for the #MprisMediaPlayer2Player::handle-pause signal.
- * @handle_play: Handler for the #MprisMediaPlayer2Player::handle-play signal.
- * @handle_play_pause: Handler for the #MprisMediaPlayer2Player::handle-play-pause signal.
- * @handle_previous: Handler for the #MprisMediaPlayer2Player::handle-previous signal.
- * @handle_seek: Handler for the #MprisMediaPlayer2Player::handle-seek signal.
- * @handle_set_position: Handler for the #MprisMediaPlayer2Player::handle-set-position signal.
- * @handle_stop: Handler for the #MprisMediaPlayer2Player::handle-stop signal.
- * @get_can_control: Getter for the #MprisMediaPlayer2Player:can-control property.
- * @get_can_go_next: Getter for the #MprisMediaPlayer2Player:can-go-next property.
- * @get_can_go_previous: Getter for the #MprisMediaPlayer2Player:can-go-previous property.
- * @get_can_pause: Getter for the #MprisMediaPlayer2Player:can-pause property.
- * @get_can_play: Getter for the #MprisMediaPlayer2Player:can-play property.
- * @get_can_seek: Getter for the #MprisMediaPlayer2Player:can-seek property.
- * @get_metadata: Getter for the #MprisMediaPlayer2Player:metadata property.
- * @get_playback_status: Getter for the #MprisMediaPlayer2Player:playback-status property.
- * @get_position: Getter for the #MprisMediaPlayer2Player:position property.
- * @get_volume: Getter for the #MprisMediaPlayer2Player:volume property.
- * @seeked: Handler for the #MprisMediaPlayer2Player::seeked signal.
- *
- * Virtual table for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link>.
- */
-
-static void
-mpris_media_player2_player_default_init (MprisMediaPlayer2PlayerIface *iface)
-{
- /* GObject signals for incoming D-Bus method calls: */
- /**
- * MprisMediaPlayer2Player::handle-next:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: A #GDBusMethodInvocation.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Next">Next()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_next() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-next",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_next),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 1,
- G_TYPE_DBUS_METHOD_INVOCATION);
-
- /**
- * MprisMediaPlayer2Player::handle-pause:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: A #GDBusMethodInvocation.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Pause">Pause()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_pause() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-pause",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_pause),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 1,
- G_TYPE_DBUS_METHOD_INVOCATION);
-
- /**
- * MprisMediaPlayer2Player::handle-play:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: A #GDBusMethodInvocation.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Play">Play()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_play() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-play",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_play),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 1,
- G_TYPE_DBUS_METHOD_INVOCATION);
-
- /**
- * MprisMediaPlayer2Player::handle-play-pause:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: A #GDBusMethodInvocation.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.PlayPause">PlayPause()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_play_pause() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-play-pause",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_play_pause),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 1,
- G_TYPE_DBUS_METHOD_INVOCATION);
-
- /**
- * MprisMediaPlayer2Player::handle-previous:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: A #GDBusMethodInvocation.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Previous">Previous()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_previous() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-previous",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_previous),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 1,
- G_TYPE_DBUS_METHOD_INVOCATION);
-
- /**
- * MprisMediaPlayer2Player::handle-seek:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: A #GDBusMethodInvocation.
- * @arg_Offset: Argument passed by remote caller.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Seek">Seek()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_seek() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-seek",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_seek),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 2,
- G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_INT64);
-
- /**
- * MprisMediaPlayer2Player::handle-set-position:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: A #GDBusMethodInvocation.
- * @arg_TrackId: Argument passed by remote caller.
- * @arg_Position: Argument passed by remote caller.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.SetPosition">SetPosition()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_set_position() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-set-position",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_set_position),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 3,
- G_TYPE_DBUS_METHOD_INVOCATION, G_TYPE_STRING, G_TYPE_INT64);
-
- /**
- * MprisMediaPlayer2Player::handle-stop:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: A #GDBusMethodInvocation.
- *
- * Signal emitted when a remote caller is invoking the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Stop">Stop()</link> D-Bus method.
- *
- * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call mpris_media_player2_player_complete_stop() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned.
- *
- * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run.
- */
- g_signal_new ("handle-stop",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, handle_stop),
- g_signal_accumulator_true_handled,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_BOOLEAN,
- 1,
- G_TYPE_DBUS_METHOD_INVOCATION);
-
- /* GObject signals for received D-Bus signals: */
- /**
- * MprisMediaPlayer2Player::seeked:
- * @object: A #MprisMediaPlayer2Player.
- * @arg_Position: Argument.
- *
- * On the client-side, this signal is emitted whenever the D-Bus signal <link linkend="gdbus-signal-org-mpris-MediaPlayer2-Player.Seeked">"Seeked"</link> is received.
- *
- * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal.
- */
- g_signal_new ("seeked",
- G_TYPE_FROM_INTERFACE (iface),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (MprisMediaPlayer2PlayerIface, seeked),
- NULL,
- NULL,
- g_cclosure_marshal_generic,
- G_TYPE_NONE,
- 1, G_TYPE_INT64);
-
- /* GObject properties for D-Bus properties: */
- /**
- * MprisMediaPlayer2Player:can-control:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanControl">"CanControl"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_boolean ("can-control", "CanControl", "CanControl", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- * MprisMediaPlayer2Player:can-go-next:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanGoNext">"CanGoNext"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_boolean ("can-go-next", "CanGoNext", "CanGoNext", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- * MprisMediaPlayer2Player:can-go-previous:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanGoPrevious">"CanGoPrevious"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_boolean ("can-go-previous", "CanGoPrevious", "CanGoPrevious", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- * MprisMediaPlayer2Player:can-pause:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanPause">"CanPause"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_boolean ("can-pause", "CanPause", "CanPause", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- * MprisMediaPlayer2Player:can-play:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanPlay">"CanPlay"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_boolean ("can-play", "CanPlay", "CanPlay", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- * MprisMediaPlayer2Player:can-seek:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanSeek">"CanSeek"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_boolean ("can-seek", "CanSeek", "CanSeek", FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- * MprisMediaPlayer2Player:metadata:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Metadata">"Metadata"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_variant ("metadata", "Metadata", "Metadata", G_VARIANT_TYPE ("a{sv}"), NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- * MprisMediaPlayer2Player:playback-status:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.PlaybackStatus">"PlaybackStatus"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_string ("playback-status", "PlaybackStatus", "PlaybackStatus", NULL, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- * MprisMediaPlayer2Player:position:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Position">"Position"</link>.
- *
- * Since the D-Bus property for this #GObject property is readable but not writable, it is meaningful to read from it on both the client- and service-side. It is only meaningful, however, to write to it on the service-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_int64 ("position", "Position", "Position", G_MININT64, G_MAXINT64, 0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
- /**
- * MprisMediaPlayer2Player:volume:
- *
- * Represents the D-Bus property <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Volume">"Volume"</link>.
- *
- * Since the D-Bus property for this #GObject property is both readable and writable, it is meaningful to both read from it and write to it on both the service- and client-side.
- */
- g_object_interface_install_property (iface,
- g_param_spec_double ("volume", "Volume", "Volume", -G_MAXDOUBLE, G_MAXDOUBLE, 0.0, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-}
-
-typedef MprisMediaPlayer2PlayerIface MprisMediaPlayer2PlayerInterface;
-G_DEFINE_INTERFACE (MprisMediaPlayer2Player, mpris_media_player2_player, G_TYPE_OBJECT);
-
-/**
- * mpris_media_player2_player_get_can_control: (skip)
- * @object: A #MprisMediaPlayer2Player.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanControl">"CanControl"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: The property value.
- */
-gboolean 
-mpris_media_player2_player_get_can_control (MprisMediaPlayer2Player *object)
-{
- return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_can_control (object);
-}
-
-/**
- * mpris_media_player2_player_set_can_control: (skip)
- * @object: A #MprisMediaPlayer2Player.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanControl">"CanControl"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_player_set_can_control (MprisMediaPlayer2Player *object, gboolean value)
-{
- g_object_set (G_OBJECT (object), "can-control", value, NULL);
-}
-
-/**
- * mpris_media_player2_player_get_can_go_next: (skip)
- * @object: A #MprisMediaPlayer2Player.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanGoNext">"CanGoNext"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: The property value.
- */
-gboolean 
-mpris_media_player2_player_get_can_go_next (MprisMediaPlayer2Player *object)
-{
- return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_can_go_next (object);
-}
-
-/**
- * mpris_media_player2_player_set_can_go_next: (skip)
- * @object: A #MprisMediaPlayer2Player.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanGoNext">"CanGoNext"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_player_set_can_go_next (MprisMediaPlayer2Player *object, gboolean value)
-{
- g_object_set (G_OBJECT (object), "can-go-next", value, NULL);
-}
-
-/**
- * mpris_media_player2_player_get_can_go_previous: (skip)
- * @object: A #MprisMediaPlayer2Player.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanGoPrevious">"CanGoPrevious"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: The property value.
- */
-gboolean 
-mpris_media_player2_player_get_can_go_previous (MprisMediaPlayer2Player *object)
-{
- return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_can_go_previous (object);
-}
-
-/**
- * mpris_media_player2_player_set_can_go_previous: (skip)
- * @object: A #MprisMediaPlayer2Player.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanGoPrevious">"CanGoPrevious"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_player_set_can_go_previous (MprisMediaPlayer2Player *object, gboolean value)
-{
- g_object_set (G_OBJECT (object), "can-go-previous", value, NULL);
-}
-
-/**
- * mpris_media_player2_player_get_can_pause: (skip)
- * @object: A #MprisMediaPlayer2Player.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanPause">"CanPause"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: The property value.
- */
-gboolean 
-mpris_media_player2_player_get_can_pause (MprisMediaPlayer2Player *object)
-{
- return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_can_pause (object);
-}
-
-/**
- * mpris_media_player2_player_set_can_pause: (skip)
- * @object: A #MprisMediaPlayer2Player.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanPause">"CanPause"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_player_set_can_pause (MprisMediaPlayer2Player *object, gboolean value)
-{
- g_object_set (G_OBJECT (object), "can-pause", value, NULL);
-}
-
-/**
- * mpris_media_player2_player_get_can_play: (skip)
- * @object: A #MprisMediaPlayer2Player.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanPlay">"CanPlay"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: The property value.
- */
-gboolean 
-mpris_media_player2_player_get_can_play (MprisMediaPlayer2Player *object)
-{
- return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_can_play (object);
-}
-
-/**
- * mpris_media_player2_player_set_can_play: (skip)
- * @object: A #MprisMediaPlayer2Player.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanPlay">"CanPlay"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_player_set_can_play (MprisMediaPlayer2Player *object, gboolean value)
-{
- g_object_set (G_OBJECT (object), "can-play", value, NULL);
-}
-
-/**
- * mpris_media_player2_player_get_can_seek: (skip)
- * @object: A #MprisMediaPlayer2Player.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanSeek">"CanSeek"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: The property value.
- */
-gboolean 
-mpris_media_player2_player_get_can_seek (MprisMediaPlayer2Player *object)
-{
- return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_can_seek (object);
-}
-
-/**
- * mpris_media_player2_player_set_can_seek: (skip)
- * @object: A #MprisMediaPlayer2Player.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.CanSeek">"CanSeek"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_player_set_can_seek (MprisMediaPlayer2Player *object, gboolean value)
-{
- g_object_set (G_OBJECT (object), "can-seek", value, NULL);
-}
-
-/**
- * mpris_media_player2_player_get_metadata: (skip)
- * @object: A #MprisMediaPlayer2Player.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Metadata">"Metadata"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use mpris_media_player2_player_dup_metadata() if on another thread.</warning>
- *
- * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
- */
-GVariant *
-mpris_media_player2_player_get_metadata (MprisMediaPlayer2Player *object)
-{
- return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_metadata (object);
-}
-
-/**
- * mpris_media_player2_player_dup_metadata: (skip)
- * @object: A #MprisMediaPlayer2Player.
- *
- * Gets a copy of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Metadata">"Metadata"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_variant_unref().
- */
-GVariant *
-mpris_media_player2_player_dup_metadata (MprisMediaPlayer2Player *object)
-{
- GVariant *value;
- g_object_get (G_OBJECT (object), "metadata", &value, NULL);
- return value;
-}
-
-/**
- * mpris_media_player2_player_set_metadata: (skip)
- * @object: A #MprisMediaPlayer2Player.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Metadata">"Metadata"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_player_set_metadata (MprisMediaPlayer2Player *object, GVariant *value)
-{
- g_object_set (G_OBJECT (object), "metadata", value, NULL);
-}
-
-/**
- * mpris_media_player2_player_get_playback_status: (skip)
- * @object: A #MprisMediaPlayer2Player.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.PlaybackStatus">"PlaybackStatus"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * <warning>The returned value is only valid until the property changes so on the client-side it is only safe to use this function on the thread where @object was constructed. Use mpris_media_player2_player_dup_playback_status() if on another thread.</warning>
- *
- * Returns: (transfer none): The property value or %NULL if the property is not set. Do not free the returned value, it belongs to @object.
- */
-const gchar *
-mpris_media_player2_player_get_playback_status (MprisMediaPlayer2Player *object)
-{
- return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_playback_status (object);
-}
-
-/**
- * mpris_media_player2_player_dup_playback_status: (skip)
- * @object: A #MprisMediaPlayer2Player.
- *
- * Gets a copy of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.PlaybackStatus">"PlaybackStatus"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: (transfer full): The property value or %NULL if the property is not set. The returned value should be freed with g_free().
- */
-gchar *
-mpris_media_player2_player_dup_playback_status (MprisMediaPlayer2Player *object)
-{
- gchar *value;
- g_object_get (G_OBJECT (object), "playback-status", &value, NULL);
- return value;
-}
-
-/**
- * mpris_media_player2_player_set_playback_status: (skip)
- * @object: A #MprisMediaPlayer2Player.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.PlaybackStatus">"PlaybackStatus"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_player_set_playback_status (MprisMediaPlayer2Player *object, const gchar *value)
-{
- g_object_set (G_OBJECT (object), "playback-status", value, NULL);
-}
-
-/**
- * mpris_media_player2_player_get_position: (skip)
- * @object: A #MprisMediaPlayer2Player.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Position">"Position"</link> D-Bus property.
- *
- * Since this D-Bus property is readable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: The property value.
- */
-gint64 
-mpris_media_player2_player_get_position (MprisMediaPlayer2Player *object)
-{
- return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_position (object);
-}
-
-/**
- * mpris_media_player2_player_set_position: (skip)
- * @object: A #MprisMediaPlayer2Player.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Position">"Position"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is not writable, it is only meaningful to use this function on the service-side.
- */
-void
-mpris_media_player2_player_set_position (MprisMediaPlayer2Player *object, gint64 value)
-{
- g_object_set (G_OBJECT (object), "position", value, NULL);
-}
-
-/**
- * mpris_media_player2_player_get_volume: (skip)
- * @object: A #MprisMediaPlayer2Player.
- *
- * Gets the value of the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Volume">"Volume"</link> D-Bus property.
- *
- * Since this D-Bus property is both readable and writable, it is meaningful to use this function on both the client- and service-side.
- *
- * Returns: The property value.
- */
-gdouble 
-mpris_media_player2_player_get_volume (MprisMediaPlayer2Player *object)
-{
- return MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE (object)->get_volume (object);
-}
-
-/**
- * mpris_media_player2_player_set_volume: (skip)
- * @object: A #MprisMediaPlayer2Player.
- * @value: The value to set.
- *
- * Sets the <link linkend="gdbus-property-org-mpris-MediaPlayer2-Player.Volume">"Volume"</link> D-Bus property to @value.
- *
- * Since this D-Bus property is both readable and writable, it is meaningful to use this function on both the client- and service-side.
- */
-void
-mpris_media_player2_player_set_volume (MprisMediaPlayer2Player *object, gdouble value)
-{
- g_object_set (G_OBJECT (object), "volume", value, NULL);
-}
-
-/**
- * mpris_media_player2_player_emit_seeked:
- * @object: A #MprisMediaPlayer2Player.
- * @arg_Position: Argument to pass with the signal.
- *
- * Emits the <link linkend="gdbus-signal-org-mpris-MediaPlayer2-Player.Seeked">"Seeked"</link> D-Bus signal.
- */
-void
-mpris_media_player2_player_emit_seeked (
- MprisMediaPlayer2Player *object,
- gint64 arg_Position)
-{
- g_signal_emit_by_name (object, "seeked", arg_Position);
-}
-
-/**
- * mpris_media_player2_player_call_next:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Next">Next()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_player_call_next_finish() to get the result of the operation.
- *
- * See mpris_media_player2_player_call_next_sync() for the synchronous, blocking version of this method.
- */
-void
-mpris_media_player2_player_call_next (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "Next",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * mpris_media_player2_player_call_next_finish:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_next().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with mpris_media_player2_player_call_next().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_next_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_next_sync:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Next">Next()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_player_call_next() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_next_sync (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "Next",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_pause:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Pause">Pause()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_player_call_pause_finish() to get the result of the operation.
- *
- * See mpris_media_player2_player_call_pause_sync() for the synchronous, blocking version of this method.
- */
-void
-mpris_media_player2_player_call_pause (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "Pause",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * mpris_media_player2_player_call_pause_finish:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_pause().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with mpris_media_player2_player_call_pause().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_pause_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_pause_sync:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Pause">Pause()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_player_call_pause() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_pause_sync (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "Pause",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_play:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Play">Play()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_player_call_play_finish() to get the result of the operation.
- *
- * See mpris_media_player2_player_call_play_sync() for the synchronous, blocking version of this method.
- */
-void
-mpris_media_player2_player_call_play (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "Play",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * mpris_media_player2_player_call_play_finish:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_play().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with mpris_media_player2_player_call_play().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_play_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_play_sync:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Play">Play()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_player_call_play() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_play_sync (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "Play",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_play_pause:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.PlayPause">PlayPause()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_player_call_play_pause_finish() to get the result of the operation.
- *
- * See mpris_media_player2_player_call_play_pause_sync() for the synchronous, blocking version of this method.
- */
-void
-mpris_media_player2_player_call_play_pause (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "PlayPause",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * mpris_media_player2_player_call_play_pause_finish:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_play_pause().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with mpris_media_player2_player_call_play_pause().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_play_pause_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_play_pause_sync:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.PlayPause">PlayPause()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_player_call_play_pause() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_play_pause_sync (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "PlayPause",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_previous:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Previous">Previous()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_player_call_previous_finish() to get the result of the operation.
- *
- * See mpris_media_player2_player_call_previous_sync() for the synchronous, blocking version of this method.
- */
-void
-mpris_media_player2_player_call_previous (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "Previous",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * mpris_media_player2_player_call_previous_finish:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_previous().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with mpris_media_player2_player_call_previous().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_previous_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_previous_sync:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Previous">Previous()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_player_call_previous() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_previous_sync (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "Previous",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_seek:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @arg_Offset: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Seek">Seek()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_player_call_seek_finish() to get the result of the operation.
- *
- * See mpris_media_player2_player_call_seek_sync() for the synchronous, blocking version of this method.
- */
-void
-mpris_media_player2_player_call_seek (
- MprisMediaPlayer2Player *proxy,
- gint64 arg_Offset,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "Seek",
- g_variant_new ("(x)",
- arg_Offset),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * mpris_media_player2_player_call_seek_finish:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_seek().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with mpris_media_player2_player_call_seek().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_seek_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_seek_sync:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @arg_Offset: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Seek">Seek()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_player_call_seek() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_seek_sync (
- MprisMediaPlayer2Player *proxy,
- gint64 arg_Offset,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "Seek",
- g_variant_new ("(x)",
- arg_Offset),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_set_position:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @arg_TrackId: Argument to pass with the method invocation.
- * @arg_Position: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.SetPosition">SetPosition()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_player_call_set_position_finish() to get the result of the operation.
- *
- * See mpris_media_player2_player_call_set_position_sync() for the synchronous, blocking version of this method.
- */
-void
-mpris_media_player2_player_call_set_position (
- MprisMediaPlayer2Player *proxy,
- const gchar *arg_TrackId,
- gint64 arg_Position,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "SetPosition",
- g_variant_new ("(ox)",
- arg_TrackId,
- arg_Position),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * mpris_media_player2_player_call_set_position_finish:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_set_position().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with mpris_media_player2_player_call_set_position().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_set_position_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_set_position_sync:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @arg_TrackId: Argument to pass with the method invocation.
- * @arg_Position: Argument to pass with the method invocation.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.SetPosition">SetPosition()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_player_call_set_position() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_set_position_sync (
- MprisMediaPlayer2Player *proxy,
- const gchar *arg_TrackId,
- gint64 arg_Position,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "SetPosition",
- g_variant_new ("(ox)",
- arg_TrackId,
- arg_Position),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_stop:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Stop">Stop()</link> D-Bus method on @proxy.
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_player_call_stop_finish() to get the result of the operation.
- *
- * See mpris_media_player2_player_call_stop_sync() for the synchronous, blocking version of this method.
- */
-void
-mpris_media_player2_player_call_stop (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_dbus_proxy_call (G_DBUS_PROXY (proxy),
- "Stop",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- callback,
- user_data);
-}
-
-/**
- * mpris_media_player2_player_call_stop_finish:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_call_stop().
- * @error: Return location for error or %NULL.
- *
- * Finishes an operation started with mpris_media_player2_player_call_stop().
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_stop_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_finish (G_DBUS_PROXY (proxy), res, error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_call_stop_sync:
- * @proxy: A #MprisMediaPlayer2PlayerProxy.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL.
- *
- * Synchronously invokes the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Stop">Stop()</link> D-Bus method on @proxy. The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_player_call_stop() for the asynchronous version of this method.
- *
- * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set.
- */
-gboolean
-mpris_media_player2_player_call_stop_sync (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GError **error)
-{
- GVariant *_ret;
- _ret = g_dbus_proxy_call_sync (G_DBUS_PROXY (proxy),
- "Stop",
- g_variant_new ("()"),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- cancellable,
- error);
- if (_ret == NULL)
- goto _out;
- g_variant_get (_ret,
- "()");
- g_variant_unref (_ret);
-_out:
- return _ret != NULL;
-}
-
-/**
- * mpris_media_player2_player_complete_next:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Next">Next()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-mpris_media_player2_player_complete_next (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("()"));
-}
-
-/**
- * mpris_media_player2_player_complete_pause:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Pause">Pause()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-mpris_media_player2_player_complete_pause (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("()"));
-}
-
-/**
- * mpris_media_player2_player_complete_play:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Play">Play()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-mpris_media_player2_player_complete_play (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("()"));
-}
-
-/**
- * mpris_media_player2_player_complete_play_pause:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.PlayPause">PlayPause()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-mpris_media_player2_player_complete_play_pause (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("()"));
-}
-
-/**
- * mpris_media_player2_player_complete_previous:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Previous">Previous()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-mpris_media_player2_player_complete_previous (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("()"));
-}
-
-/**
- * mpris_media_player2_player_complete_seek:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Seek">Seek()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-mpris_media_player2_player_complete_seek (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("()"));
-}
-
-/**
- * mpris_media_player2_player_complete_set_position:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.SetPosition">SetPosition()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-mpris_media_player2_player_complete_set_position (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("()"));
-}
-
-/**
- * mpris_media_player2_player_complete_stop:
- * @object: A #MprisMediaPlayer2Player.
- * @invocation: (transfer full): A #GDBusMethodInvocation.
- *
- * Helper function used in service implementations to finish handling invocations of the <link linkend="gdbus-method-org-mpris-MediaPlayer2-Player.Stop">Stop()</link> D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar.
- *
- * This method will free @invocation, you cannot use it afterwards.
- */
-void
-mpris_media_player2_player_complete_stop (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation)
-{
- g_dbus_method_invocation_return_value (invocation,
- g_variant_new ("()"));
-}
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * MprisMediaPlayer2PlayerProxy:
- *
- * The #MprisMediaPlayer2PlayerProxy structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * MprisMediaPlayer2PlayerProxyClass:
- * @parent_class: The parent class.
- *
- * Class structure for #MprisMediaPlayer2PlayerProxy.
- */
-
-struct _MprisMediaPlayer2PlayerProxyPrivate
-{
- GData *qdata;
-};
-
-static void mpris_media_player2_player_proxy_iface_init (MprisMediaPlayer2PlayerIface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (MprisMediaPlayer2PlayerProxy, mpris_media_player2_player_proxy, G_TYPE_DBUS_PROXY,
- G_IMPLEMENT_INTERFACE (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER, mpris_media_player2_player_proxy_iface_init));
-
-static void
-mpris_media_player2_player_proxy_finalize (GObject *object)
-{
- MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
- g_datalist_clear (&proxy->priv->qdata);
- G_OBJECT_CLASS (mpris_media_player2_player_proxy_parent_class)->finalize (object);
-}
-
-static void
-mpris_media_player2_player_proxy_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- const _ExtendedGDBusPropertyInfo *info;
- GVariant *variant;
- g_assert (prop_id != 0 && prop_id - 1 < 10);
- info = _mpris_media_player2_player_property_info_pointers[prop_id - 1];
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (object), info->parent_struct.name);
- if (info->use_gvariant)
- {
- g_value_set_variant (value, variant);
- }
- else
- {
- if (variant != NULL)
- g_dbus_gvariant_to_gvalue (variant, value);
- }
- if (variant != NULL)
- g_variant_unref (variant);
-}
-
-static void
-mpris_media_player2_player_proxy_set_property_cb (GDBusProxy *proxy,
- GAsyncResult *res,
- gpointer user_data)
-{
- const _ExtendedGDBusPropertyInfo *info = user_data;
- GError *error;
- error = NULL;
- if (!g_dbus_proxy_call_finish (proxy, res, &error))
- {
- g_warning ("Error setting property `%s' on interface org.mpris.MediaPlayer2.Player: %s (%s, %d)",
- info->parent_struct.name, 
- error->message, g_quark_to_string (error->domain), error->code);
- g_error_free (error);
- }
-}
-
-static void
-mpris_media_player2_player_proxy_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- const _ExtendedGDBusPropertyInfo *info;
- GVariant *variant;
- g_assert (prop_id != 0 && prop_id - 1 < 10);
- info = _mpris_media_player2_player_property_info_pointers[prop_id - 1];
- variant = g_dbus_gvalue_to_gvariant (value, G_VARIANT_TYPE (info->parent_struct.signature));
- g_dbus_proxy_call (G_DBUS_PROXY (object),
- "org.freedesktop.DBus.Properties.Set",
- g_variant_new ("(ssv)", "org.mpris.MediaPlayer2.Player", info->parent_struct.name, variant),
- G_DBUS_CALL_FLAGS_NONE,
- -1,
- NULL, (GAsyncReadyCallback) mpris_media_player2_player_proxy_set_property_cb, (gpointer) info);
- g_variant_unref (variant);
-}
-
-static void
-mpris_media_player2_player_proxy_g_signal (GDBusProxy *proxy,
- const gchar *sender_name,
- const gchar *signal_name,
- GVariant *parameters)
-{
- _ExtendedGDBusSignalInfo *info;
- GVariantIter iter;
- GVariant *child;
- GValue *paramv;
- guint num_params;
- guint n;
- guint signal_id;
- info = (_ExtendedGDBusSignalInfo *) g_dbus_interface_info_lookup_signal ((GDBusInterfaceInfo *) &_mpris_media_player2_player_interface_info, signal_name);
- if (info == NULL)
- return;
- num_params = g_variant_n_children (parameters);
- paramv = g_new0 (GValue, num_params + 1);
- g_value_init (&paramv[0], MPRIS_TYPE_MEDIA_PLAYER2_PLAYER);
- g_value_set_object (&paramv[0], proxy);
- g_variant_iter_init (&iter, parameters);
- n = 1;
- while ((child = g_variant_iter_next_value (&iter)) != NULL)
- {
- _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.args[n - 1];
- if (arg_info->use_gvariant)
- {
- g_value_init (&paramv[n], G_TYPE_VARIANT);
- g_value_set_variant (&paramv[n], child);
- n++;
- }
- else
- g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
- g_variant_unref (child);
- }
- signal_id = g_signal_lookup (info->signal_name, MPRIS_TYPE_MEDIA_PLAYER2_PLAYER);
- g_signal_emitv (paramv, signal_id, 0, NULL);
- for (n = 0; n < num_params + 1; n++)
- g_value_unset (&paramv[n]);
- g_free (paramv);
-}
-
-static void
-mpris_media_player2_player_proxy_g_properties_changed (GDBusProxy *_proxy,
- GVariant *changed_properties,
- const gchar *const *invalidated_properties)
-{
- MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (_proxy);
- guint n;
- const gchar *key;
- GVariantIter *iter;
- _ExtendedGDBusPropertyInfo *info;
- g_variant_get (changed_properties, "a{sv}", &iter);
- while (g_variant_iter_next (iter, "{&sv}", &key, NULL))
- {
- info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_player_interface_info, key);
- g_datalist_remove_data (&proxy->priv->qdata, key);
- if (info != NULL)
- g_object_notify (G_OBJECT (proxy), info->hyphen_name);
- }
- g_variant_iter_free (iter);
- for (n = 0; invalidated_properties[n] != NULL; n++)
- {
- info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_player_interface_info, invalidated_properties[n]);
- g_datalist_remove_data (&proxy->priv->qdata, invalidated_properties[n]);
- if (info != NULL)
- g_object_notify (G_OBJECT (proxy), info->hyphen_name);
- }
-}
-
-static gboolean 
-mpris_media_player2_player_proxy_get_can_control (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
- GVariant *variant;
- gboolean value = 0;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanControl");
- if (variant != NULL)
- {
- value = g_variant_get_boolean (variant);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static gboolean 
-mpris_media_player2_player_proxy_get_can_go_next (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
- GVariant *variant;
- gboolean value = 0;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanGoNext");
- if (variant != NULL)
- {
- value = g_variant_get_boolean (variant);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static gboolean 
-mpris_media_player2_player_proxy_get_can_go_previous (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
- GVariant *variant;
- gboolean value = 0;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanGoPrevious");
- if (variant != NULL)
- {
- value = g_variant_get_boolean (variant);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static gboolean 
-mpris_media_player2_player_proxy_get_can_pause (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
- GVariant *variant;
- gboolean value = 0;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanPause");
- if (variant != NULL)
- {
- value = g_variant_get_boolean (variant);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static gboolean 
-mpris_media_player2_player_proxy_get_can_play (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
- GVariant *variant;
- gboolean value = 0;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanPlay");
- if (variant != NULL)
- {
- value = g_variant_get_boolean (variant);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static gboolean 
-mpris_media_player2_player_proxy_get_can_seek (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
- GVariant *variant;
- gboolean value = 0;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "CanSeek");
- if (variant != NULL)
- {
- value = g_variant_get_boolean (variant);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static GVariant *
-mpris_media_player2_player_proxy_get_metadata (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
- GVariant *variant;
- GVariant *value = NULL;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Metadata");
- value = variant;
- if (variant != NULL)
- g_variant_unref (variant);
- return value;
-}
-
-static const gchar *
-mpris_media_player2_player_proxy_get_playback_status (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
- GVariant *variant;
- const gchar *value = NULL;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "PlaybackStatus");
- if (variant != NULL)
- {
- value = g_variant_get_string (variant, NULL);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static gint64 
-mpris_media_player2_player_proxy_get_position (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
- GVariant *variant;
- gint64 value = 0;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Position");
- if (variant != NULL)
- {
- value = g_variant_get_int64 (variant);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static gdouble 
-mpris_media_player2_player_proxy_get_volume (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerProxy *proxy = MPRIS_MEDIA_PLAYER2_PLAYER_PROXY (object);
- GVariant *variant;
- gdouble value = 0;
- variant = g_dbus_proxy_get_cached_property (G_DBUS_PROXY (proxy), "Volume");
- if (variant != NULL)
- {
- value = g_variant_get_double (variant);
- g_variant_unref (variant);
- }
- return value;
-}
-
-static void
-mpris_media_player2_player_proxy_init (MprisMediaPlayer2PlayerProxy *proxy)
-{
- proxy->priv = G_TYPE_INSTANCE_GET_PRIVATE (proxy, MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, MprisMediaPlayer2PlayerProxyPrivate);
- g_dbus_proxy_set_interface_info (G_DBUS_PROXY (proxy), mpris_media_player2_player_interface_info ());
-}
-
-static void
-mpris_media_player2_player_proxy_class_init (MprisMediaPlayer2PlayerProxyClass *klass)
-{
- GObjectClass *gobject_class;
- GDBusProxyClass *proxy_class;
-
- g_type_class_add_private (klass, sizeof (MprisMediaPlayer2PlayerProxyPrivate));
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = mpris_media_player2_player_proxy_finalize;
- gobject_class->get_property = mpris_media_player2_player_proxy_get_property;
- gobject_class->set_property = mpris_media_player2_player_proxy_set_property;
-
- proxy_class = G_DBUS_PROXY_CLASS (klass);
- proxy_class->g_signal = mpris_media_player2_player_proxy_g_signal;
- proxy_class->g_properties_changed = mpris_media_player2_player_proxy_g_properties_changed;
-
-
- mpris_media_player2_player_override_properties (gobject_class, 1);
-}
-
-static void
-mpris_media_player2_player_proxy_iface_init (MprisMediaPlayer2PlayerIface *iface)
-{
- iface->get_can_control = mpris_media_player2_player_proxy_get_can_control;
- iface->get_can_go_next = mpris_media_player2_player_proxy_get_can_go_next;
- iface->get_can_go_previous = mpris_media_player2_player_proxy_get_can_go_previous;
- iface->get_can_pause = mpris_media_player2_player_proxy_get_can_pause;
- iface->get_can_play = mpris_media_player2_player_proxy_get_can_play;
- iface->get_can_seek = mpris_media_player2_player_proxy_get_can_seek;
- iface->get_metadata = mpris_media_player2_player_proxy_get_metadata;
- iface->get_playback_status = mpris_media_player2_player_proxy_get_playback_status;
- iface->get_position = mpris_media_player2_player_proxy_get_position;
- iface->get_volume = mpris_media_player2_player_proxy_get_volume;
-}
-
-/**
- * mpris_media_player2_player_proxy_new:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Asynchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link>. See g_dbus_proxy_new() for more details.
- *
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_player_proxy_new_finish() to get the result of the operation.
- *
- * See mpris_media_player2_player_proxy_new_sync() for the synchronous, blocking version of this constructor.
- */
-void
-mpris_media_player2_player_proxy_new (
- GDBusConnection *connection,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_async_initable_new_async (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2.Player", NULL);
-}
-
-/**
- * mpris_media_player2_player_proxy_new_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_proxy_new().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with mpris_media_player2_player_proxy_new().
- *
- * Returns: (transfer full) (type MprisMediaPlayer2PlayerProxy): The constructed proxy object or %NULL if @error is set.
- */
-MprisMediaPlayer2Player *
-mpris_media_player2_player_proxy_new_finish (
- GAsyncResult *res,
- GError **error)
-{
- GObject *ret;
- GObject *source_object;
- source_object = g_async_result_get_source_object (res);
- ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
- g_object_unref (source_object);
- if (ret != NULL)
- return MPRIS_MEDIA_PLAYER2_PLAYER (ret);
- else
- return NULL;
-}
-
-/**
- * mpris_media_player2_player_proxy_new_sync:
- * @connection: A #GDBusConnection.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection.
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Synchronously creates a proxy for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link>. See g_dbus_proxy_new_sync() for more details.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_player_proxy_new() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type MprisMediaPlayer2PlayerProxy): The constructed proxy object or %NULL if @error is set.
- */
-MprisMediaPlayer2Player *
-mpris_media_player2_player_proxy_new_sync (
- GDBusConnection *connection,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GError **error)
-{
- GInitable *ret;
- ret = g_initable_new (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-connection", connection, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2.Player", NULL);
- if (ret != NULL)
- return MPRIS_MEDIA_PLAYER2_PLAYER (ret);
- else
- return NULL;
-}
-
-
-/**
- * mpris_media_player2_player_proxy_new_for_bus:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @callback: A #GAsyncReadyCallback to call when the request is satisfied.
- * @user_data: User data to pass to @callback.
- *
- * Like mpris_media_player2_player_proxy_new() but takes a #GBusType instead of a #GDBusConnection.
- *
- * When the operation is finished, @callback will be invoked in the <link linkend="g-main-context-push-thread-default">thread-default main loop</link> of the thread you are calling this method from.
- * You can then call mpris_media_player2_player_proxy_new_for_bus_finish() to get the result of the operation.
- *
- * See mpris_media_player2_player_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor.
- */
-void
-mpris_media_player2_player_proxy_new_for_bus (
- GBusType bus_type,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data)
-{
- g_async_initable_new_async (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, G_PRIORITY_DEFAULT, cancellable, callback, user_data, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2.Player", NULL);
-}
-
-/**
- * mpris_media_player2_player_proxy_new_for_bus_finish:
- * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to mpris_media_player2_player_proxy_new_for_bus().
- * @error: Return location for error or %NULL
- *
- * Finishes an operation started with mpris_media_player2_player_proxy_new_for_bus().
- *
- * Returns: (transfer full) (type MprisMediaPlayer2PlayerProxy): The constructed proxy object or %NULL if @error is set.
- */
-MprisMediaPlayer2Player *
-mpris_media_player2_player_proxy_new_for_bus_finish (
- GAsyncResult *res,
- GError **error)
-{
- GObject *ret;
- GObject *source_object;
- source_object = g_async_result_get_source_object (res);
- ret = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object), res, error);
- g_object_unref (source_object);
- if (ret != NULL)
- return MPRIS_MEDIA_PLAYER2_PLAYER (ret);
- else
- return NULL;
-}
-
-/**
- * mpris_media_player2_player_proxy_new_for_bus_sync:
- * @bus_type: A #GBusType.
- * @flags: Flags from the #GDBusProxyFlags enumeration.
- * @name: A bus name (well-known or unique).
- * @object_path: An object path.
- * @cancellable: (allow-none): A #GCancellable or %NULL.
- * @error: Return location for error or %NULL
- *
- * Like mpris_media_player2_player_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection.
- *
- * The calling thread is blocked until a reply is received.
- *
- * See mpris_media_player2_player_proxy_new_for_bus() for the asynchronous version of this constructor.
- *
- * Returns: (transfer full) (type MprisMediaPlayer2PlayerProxy): The constructed proxy object or %NULL if @error is set.
- */
-MprisMediaPlayer2Player *
-mpris_media_player2_player_proxy_new_for_bus_sync (
- GBusType bus_type,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GError **error)
-{
- GInitable *ret;
- ret = g_initable_new (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, cancellable, error, "g-flags", flags, "g-name", name, "g-bus-type", bus_type, "g-object-path", object_path, "g-interface-name", "org.mpris.MediaPlayer2.Player", NULL);
- if (ret != NULL)
- return MPRIS_MEDIA_PLAYER2_PLAYER (ret);
- else
- return NULL;
-}
-
-
-/* ------------------------------------------------------------------------ */
-
-/**
- * MprisMediaPlayer2PlayerSkeleton:
- *
- * The #MprisMediaPlayer2PlayerSkeleton structure contains only private data and should only be accessed using the provided API.
- */
-
-/**
- * MprisMediaPlayer2PlayerSkeletonClass:
- * @parent_class: The parent class.
- *
- * Class structure for #MprisMediaPlayer2PlayerSkeleton.
- */
-
-struct _MprisMediaPlayer2PlayerSkeletonPrivate
-{
- GValue *properties;
- GList *changed_properties;
- GSource *changed_properties_idle_source;
- GMainContext *context;
- GMutex lock;
-};
-
-static void
-_mpris_media_player2_player_skeleton_handle_method_call (
- GDBusConnection *connection,
- const gchar *sender,
- const gchar *object_path,
- const gchar *interface_name,
- const gchar *method_name,
- GVariant *parameters,
- GDBusMethodInvocation *invocation,
- gpointer user_data)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (user_data);
- _ExtendedGDBusMethodInfo *info;
- GVariantIter iter;
- GVariant *child;
- GValue *paramv;
- guint num_params;
- guint num_extra;
- guint n;
- guint signal_id;
- GValue return_value = G_VALUE_INIT;
- info = (_ExtendedGDBusMethodInfo *) g_dbus_method_invocation_get_method_info (invocation);
- g_assert (info != NULL);
- num_params = g_variant_n_children (parameters);
- num_extra = info->pass_fdlist ? 3 : 2; paramv = g_new0 (GValue, num_params + num_extra);
- n = 0;
- g_value_init (&paramv[n], MPRIS_TYPE_MEDIA_PLAYER2_PLAYER);
- g_value_set_object (&paramv[n++], skeleton);
- g_value_init (&paramv[n], G_TYPE_DBUS_METHOD_INVOCATION);
- g_value_set_object (&paramv[n++], invocation);
- if (info->pass_fdlist)
- {
-#ifdef G_OS_UNIX
- g_value_init (&paramv[n], G_TYPE_UNIX_FD_LIST);
- g_value_set_object (&paramv[n++], g_dbus_message_get_unix_fd_list (g_dbus_method_invocation_get_message (invocation)));
-#else
- g_assert_not_reached ();
-#endif
- }
- g_variant_iter_init (&iter, parameters);
- while ((child = g_variant_iter_next_value (&iter)) != NULL)
- {
- _ExtendedGDBusArgInfo *arg_info = (_ExtendedGDBusArgInfo *) info->parent_struct.in_args[n - num_extra];
- if (arg_info->use_gvariant)
- {
- g_value_init (&paramv[n], G_TYPE_VARIANT);
- g_value_set_variant (&paramv[n], child);
- n++;
- }
- else
- g_dbus_gvariant_to_gvalue (child, &paramv[n++]);
- g_variant_unref (child);
- }
- signal_id = g_signal_lookup (info->signal_name, MPRIS_TYPE_MEDIA_PLAYER2_PLAYER);
- g_value_init (&return_value, G_TYPE_BOOLEAN);
- g_signal_emitv (paramv, signal_id, 0, &return_value);
- if (!g_value_get_boolean (&return_value))
- g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD, "Method %s is not implemented on interface %s", method_name, interface_name);
- g_value_unset (&return_value);
- for (n = 0; n < num_params + num_extra; n++)
- g_value_unset (&paramv[n]);
- g_free (paramv);
-}
-
-static GVariant *
-_mpris_media_player2_player_skeleton_handle_get_property (
- GDBusConnection *connection,
- const gchar *sender,
- const gchar *object_path,
- const gchar *interface_name,
- const gchar *property_name,
- GError **error,
- gpointer user_data)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (user_data);
- GValue value = G_VALUE_INIT;
- GParamSpec *pspec;
- _ExtendedGDBusPropertyInfo *info;
- GVariant *ret;
- ret = NULL;
- info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_player_interface_info, property_name);
- g_assert (info != NULL);
- pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
- if (pspec == NULL)
- {
- g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
- }
- else
- {
- g_value_init (&value, pspec->value_type);
- g_object_get_property (G_OBJECT (skeleton), info->hyphen_name, &value);
- ret = g_dbus_gvalue_to_gvariant (&value, G_VARIANT_TYPE (info->parent_struct.signature));
- g_value_unset (&value);
- }
- return ret;
-}
-
-static gboolean
-_mpris_media_player2_player_skeleton_handle_set_property (
- GDBusConnection *connection,
- const gchar *sender,
- const gchar *object_path,
- const gchar *interface_name,
- const gchar *property_name,
- GVariant *variant,
- GError **error,
- gpointer user_data)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (user_data);
- GValue value = G_VALUE_INIT;
- GParamSpec *pspec;
- _ExtendedGDBusPropertyInfo *info;
- gboolean ret;
- ret = FALSE;
- info = (_ExtendedGDBusPropertyInfo *) g_dbus_interface_info_lookup_property ((GDBusInterfaceInfo *) &_mpris_media_player2_player_interface_info, property_name);
- g_assert (info != NULL);
- pspec = g_object_class_find_property (G_OBJECT_GET_CLASS (skeleton), info->hyphen_name);
- if (pspec == NULL)
- {
- g_set_error (error, G_DBUS_ERROR, G_DBUS_ERROR_INVALID_ARGS, "No property with name %s", property_name);
- }
- else
- {
- if (info->use_gvariant)
- g_value_set_variant (&value, variant);
- else
- g_dbus_gvariant_to_gvalue (variant, &value);
- g_object_set_property (G_OBJECT (skeleton), info->hyphen_name, &value);
- g_value_unset (&value);
- ret = TRUE;
- }
- return ret;
-}
-
-static const GDBusInterfaceVTable _mpris_media_player2_player_skeleton_vtable =
-{
- _mpris_media_player2_player_skeleton_handle_method_call,
- _mpris_media_player2_player_skeleton_handle_get_property,
- _mpris_media_player2_player_skeleton_handle_set_property
-};
-
-static GDBusInterfaceInfo *
-mpris_media_player2_player_skeleton_dbus_interface_get_info (GDBusInterfaceSkeleton *skeleton)
-{
- return mpris_media_player2_player_interface_info ();
-}
-
-static GDBusInterfaceVTable *
-mpris_media_player2_player_skeleton_dbus_interface_get_vtable (GDBusInterfaceSkeleton *skeleton)
-{
- return (GDBusInterfaceVTable *) &_mpris_media_player2_player_skeleton_vtable;
-}
-
-static GVariant *
-mpris_media_player2_player_skeleton_dbus_interface_get_properties (GDBusInterfaceSkeleton *_skeleton)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (_skeleton);
-
- GVariantBuilder builder;
- guint n;
- g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
- if (_mpris_media_player2_player_interface_info.parent_struct.properties == NULL)
- goto out;
- for (n = 0; _mpris_media_player2_player_interface_info.parent_struct.properties[n] != NULL; n++)
- {
- GDBusPropertyInfo *info = _mpris_media_player2_player_interface_info.parent_struct.properties[n];
- if (info->flags & G_DBUS_PROPERTY_INFO_FLAGS_READABLE)
- {
- GVariant *value;
- value = _mpris_media_player2_player_skeleton_handle_get_property (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)), NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.mpris.MediaPlayer2.Player", info->name, NULL, skeleton);
- if (value != NULL)
- {
- g_variant_take_ref (value);
- g_variant_builder_add (&builder, "{sv}", info->name, value);
- g_variant_unref (value);
- }
- }
- }
-out:
- return g_variant_builder_end (&builder);
-}
-
-static gboolean _mpris_media_player2_player_emit_changed (gpointer user_data);
-
-static void
-mpris_media_player2_player_skeleton_dbus_interface_flush (GDBusInterfaceSkeleton *_skeleton)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (_skeleton);
- gboolean emit_changed = FALSE;
-
- g_mutex_lock (&skeleton->priv->lock);
- if (skeleton->priv->changed_properties_idle_source != NULL)
- {
- g_source_destroy (skeleton->priv->changed_properties_idle_source);
- skeleton->priv->changed_properties_idle_source = NULL;
- emit_changed = TRUE;
- }
- g_mutex_unlock (&skeleton->priv->lock);
-
- if (emit_changed)
- _mpris_media_player2_player_emit_changed (skeleton);
-}
-
-static void
-_mpris_media_player2_player_on_signal_seeked (
- MprisMediaPlayer2Player *object,
- gint64 arg_Position)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
-
- GList *connections, *l;
- GVariant *signal_variant;
- connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
-
- signal_variant = g_variant_ref_sink (g_variant_new ("(x)",
- arg_Position));
- for (l = connections; l != NULL; l = l->next)
- {
- GDBusConnection *connection = l->data;
- g_dbus_connection_emit_signal (connection,
- NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)), "org.mpris.MediaPlayer2.Player", "Seeked",
- signal_variant, NULL);
- }
- g_variant_unref (signal_variant);
- g_list_free_full (connections, g_object_unref);
-}
-
-static void mpris_media_player2_player_skeleton_iface_init (MprisMediaPlayer2PlayerIface *iface);
-G_DEFINE_TYPE_WITH_CODE (MprisMediaPlayer2PlayerSkeleton, mpris_media_player2_player_skeleton, G_TYPE_DBUS_INTERFACE_SKELETON,
- G_IMPLEMENT_INTERFACE (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER, mpris_media_player2_player_skeleton_iface_init));
-
-static void
-mpris_media_player2_player_skeleton_finalize (GObject *object)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- guint n;
- for (n = 0; n < 10; n++)
- g_value_unset (&skeleton->priv->properties[n]);
- g_free (skeleton->priv->properties);
- g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free);
- if (skeleton->priv->changed_properties_idle_source != NULL)
- g_source_destroy (skeleton->priv->changed_properties_idle_source);
- g_main_context_unref (skeleton->priv->context);
- g_mutex_clear (&skeleton->priv->lock);
- G_OBJECT_CLASS (mpris_media_player2_player_skeleton_parent_class)->finalize (object);
-}
-
-static void
-mpris_media_player2_player_skeleton_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- g_assert (prop_id != 0 && prop_id - 1 < 10);
- g_mutex_lock (&skeleton->priv->lock);
- g_value_copy (&skeleton->priv->properties[prop_id - 1], value);
- g_mutex_unlock (&skeleton->priv->lock);
-}
-
-static gboolean
-_mpris_media_player2_player_emit_changed (gpointer user_data)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (user_data);
- GList *l;
- GVariantBuilder builder;
- GVariantBuilder invalidated_builder;
- guint num_changes;
-
- g_mutex_lock (&skeleton->priv->lock);
- g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
- g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as"));
- for (l = skeleton->priv->changed_properties, num_changes = 0; l != NULL; l = l->next)
- {
- ChangedProperty *cp = l->data;
- GVariant *variant;
- const GValue *cur_value;
-
- cur_value = &skeleton->priv->properties[cp->prop_id - 1];
- if (!_g_value_equal (cur_value, &cp->orig_value))
- {
- variant = g_dbus_gvalue_to_gvariant (cur_value, G_VARIANT_TYPE (cp->info->parent_struct.signature));
- g_variant_builder_add (&builder, "{sv}", cp->info->parent_struct.name, variant);
- g_variant_unref (variant);
- num_changes++;
- }
- }
- if (num_changes > 0)
- {
- GList *connections, *l;
- GVariant *signal_variant;
- signal_variant = g_variant_ref_sink (g_variant_new ("(sa{sv}as)", "org.mpris.MediaPlayer2.Player",
- &builder, &invalidated_builder));
- connections = g_dbus_interface_skeleton_get_connections (G_DBUS_INTERFACE_SKELETON (skeleton));
- for (l = connections; l != NULL; l = l->next)
- {
- GDBusConnection *connection = l->data;
-
- g_dbus_connection_emit_signal (connection,
- NULL, g_dbus_interface_skeleton_get_object_path (G_DBUS_INTERFACE_SKELETON (skeleton)),
- "org.freedesktop.DBus.Properties",
- "PropertiesChanged",
- signal_variant,
- NULL);
- }
- g_variant_unref (signal_variant);
- g_list_free_full (connections, g_object_unref);
- }
- else
- {
- g_variant_builder_clear (&builder);
- g_variant_builder_clear (&invalidated_builder);
- }
- g_list_free_full (skeleton->priv->changed_properties, (GDestroyNotify) _changed_property_free);
- skeleton->priv->changed_properties = NULL;
- skeleton->priv->changed_properties_idle_source = NULL;
- g_mutex_unlock (&skeleton->priv->lock);
- return FALSE;
-}
-
-static void
-_mpris_media_player2_player_schedule_emit_changed (MprisMediaPlayer2PlayerSkeleton *skeleton, const _ExtendedGDBusPropertyInfo *info, guint prop_id, const GValue *orig_value)
-{
- ChangedProperty *cp;
- GList *l;
- cp = NULL;
- for (l = skeleton->priv->changed_properties; l != NULL; l = l->next)
- {
- ChangedProperty *i_cp = l->data;
- if (i_cp->info == info)
- {
- cp = i_cp;
- break;
- }
- }
- if (cp == NULL)
- {
- cp = g_new0 (ChangedProperty, 1);
- cp->prop_id = prop_id;
- cp->info = info;
- skeleton->priv->changed_properties = g_list_prepend (skeleton->priv->changed_properties, cp);
- g_value_init (&cp->orig_value, G_VALUE_TYPE (orig_value));
- g_value_copy (orig_value, &cp->orig_value);
- }
-}
-
-static void
-mpris_media_player2_player_skeleton_notify (GObject *object,
- GParamSpec *pspec)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- g_mutex_lock (&skeleton->priv->lock);
- if (skeleton->priv->changed_properties != NULL &&
- skeleton->priv->changed_properties_idle_source == NULL)
- {
- skeleton->priv->changed_properties_idle_source = g_idle_source_new ();
- g_source_set_priority (skeleton->priv->changed_properties_idle_source, G_PRIORITY_DEFAULT);
- g_source_set_callback (skeleton->priv->changed_properties_idle_source, _mpris_media_player2_player_emit_changed, g_object_ref (skeleton), (GDestroyNotify) g_object_unref);
- g_source_attach (skeleton->priv->changed_properties_idle_source, skeleton->priv->context);
- g_source_unref (skeleton->priv->changed_properties_idle_source);
- }
- g_mutex_unlock (&skeleton->priv->lock);
-}
-
-static void
-mpris_media_player2_player_skeleton_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- g_assert (prop_id != 0 && prop_id - 1 < 10);
- g_mutex_lock (&skeleton->priv->lock);
- g_object_freeze_notify (object);
- if (!_g_value_equal (value, &skeleton->priv->properties[prop_id - 1]))
- {
- if (g_dbus_interface_skeleton_get_connection (G_DBUS_INTERFACE_SKELETON (skeleton)) != NULL)
- _mpris_media_player2_player_schedule_emit_changed (skeleton, _mpris_media_player2_player_property_info_pointers[prop_id - 1], prop_id, &skeleton->priv->properties[prop_id - 1]);
- g_value_copy (value, &skeleton->priv->properties[prop_id - 1]);
- g_object_notify_by_pspec (object, pspec);
- }
- g_mutex_unlock (&skeleton->priv->lock);
- g_object_thaw_notify (object);
-}
-
-static void
-mpris_media_player2_player_skeleton_init (MprisMediaPlayer2PlayerSkeleton *skeleton)
-{
- skeleton->priv = G_TYPE_INSTANCE_GET_PRIVATE (skeleton, MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON, MprisMediaPlayer2PlayerSkeletonPrivate);
- g_mutex_init (&skeleton->priv->lock);
- skeleton->priv->context = g_main_context_ref_thread_default ();
- skeleton->priv->properties = g_new0 (GValue, 10);
- g_value_init (&skeleton->priv->properties[0], G_TYPE_BOOLEAN);
- g_value_init (&skeleton->priv->properties[1], G_TYPE_BOOLEAN);
- g_value_init (&skeleton->priv->properties[2], G_TYPE_BOOLEAN);
- g_value_init (&skeleton->priv->properties[3], G_TYPE_BOOLEAN);
- g_value_init (&skeleton->priv->properties[4], G_TYPE_BOOLEAN);
- g_value_init (&skeleton->priv->properties[5], G_TYPE_BOOLEAN);
- g_value_init (&skeleton->priv->properties[6], G_TYPE_VARIANT);
- g_value_init (&skeleton->priv->properties[7], G_TYPE_STRING);
- g_value_init (&skeleton->priv->properties[8], G_TYPE_INT64);
- g_value_init (&skeleton->priv->properties[9], G_TYPE_DOUBLE);
-}
-
-static gboolean 
-mpris_media_player2_player_skeleton_get_can_control (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- gboolean value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_boolean (&(skeleton->priv->properties[0]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static gboolean 
-mpris_media_player2_player_skeleton_get_can_go_next (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- gboolean value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_boolean (&(skeleton->priv->properties[1]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static gboolean 
-mpris_media_player2_player_skeleton_get_can_go_previous (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- gboolean value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_boolean (&(skeleton->priv->properties[2]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static gboolean 
-mpris_media_player2_player_skeleton_get_can_pause (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- gboolean value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_boolean (&(skeleton->priv->properties[3]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static gboolean 
-mpris_media_player2_player_skeleton_get_can_play (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- gboolean value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_boolean (&(skeleton->priv->properties[4]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static gboolean 
-mpris_media_player2_player_skeleton_get_can_seek (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- gboolean value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_boolean (&(skeleton->priv->properties[5]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static GVariant *
-mpris_media_player2_player_skeleton_get_metadata (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- GVariant *value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_variant (&(skeleton->priv->properties[6]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static const gchar *
-mpris_media_player2_player_skeleton_get_playback_status (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- const gchar *value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_string (&(skeleton->priv->properties[7]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static gint64 
-mpris_media_player2_player_skeleton_get_position (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- gint64 value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_int64 (&(skeleton->priv->properties[8]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static gdouble 
-mpris_media_player2_player_skeleton_get_volume (MprisMediaPlayer2Player *object)
-{
- MprisMediaPlayer2PlayerSkeleton *skeleton = MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON (object);
- gdouble value;
- g_mutex_lock (&skeleton->priv->lock);
- value = g_value_get_double (&(skeleton->priv->properties[9]));
- g_mutex_unlock (&skeleton->priv->lock);
- return value;
-}
-
-static void
-mpris_media_player2_player_skeleton_class_init (MprisMediaPlayer2PlayerSkeletonClass *klass)
-{
- GObjectClass *gobject_class;
- GDBusInterfaceSkeletonClass *skeleton_class;
-
- g_type_class_add_private (klass, sizeof (MprisMediaPlayer2PlayerSkeletonPrivate));
-
- gobject_class = G_OBJECT_CLASS (klass);
- gobject_class->finalize = mpris_media_player2_player_skeleton_finalize;
- gobject_class->get_property = mpris_media_player2_player_skeleton_get_property;
- gobject_class->set_property = mpris_media_player2_player_skeleton_set_property;
- gobject_class->notify = mpris_media_player2_player_skeleton_notify;
-
-
- mpris_media_player2_player_override_properties (gobject_class, 1);
-
- skeleton_class = G_DBUS_INTERFACE_SKELETON_CLASS (klass);
- skeleton_class->get_info = mpris_media_player2_player_skeleton_dbus_interface_get_info;
- skeleton_class->get_properties = mpris_media_player2_player_skeleton_dbus_interface_get_properties;
- skeleton_class->flush = mpris_media_player2_player_skeleton_dbus_interface_flush;
- skeleton_class->get_vtable = mpris_media_player2_player_skeleton_dbus_interface_get_vtable;
-}
-
-static void
-mpris_media_player2_player_skeleton_iface_init (MprisMediaPlayer2PlayerIface *iface)
-{
- iface->seeked = _mpris_media_player2_player_on_signal_seeked;
- iface->get_can_control = mpris_media_player2_player_skeleton_get_can_control;
- iface->get_can_go_next = mpris_media_player2_player_skeleton_get_can_go_next;
- iface->get_can_go_previous = mpris_media_player2_player_skeleton_get_can_go_previous;
- iface->get_can_pause = mpris_media_player2_player_skeleton_get_can_pause;
- iface->get_can_play = mpris_media_player2_player_skeleton_get_can_play;
- iface->get_can_seek = mpris_media_player2_player_skeleton_get_can_seek;
- iface->get_metadata = mpris_media_player2_player_skeleton_get_metadata;
- iface->get_playback_status = mpris_media_player2_player_skeleton_get_playback_status;
- iface->get_position = mpris_media_player2_player_skeleton_get_position;
- iface->get_volume = mpris_media_player2_player_skeleton_get_volume;
-}
-
-/**
- * mpris_media_player2_player_skeleton_new:
- *
- * Creates a skeleton object for the D-Bus interface <link linkend="gdbus-interface-org-mpris-MediaPlayer2-Player.top_of_page">org.mpris.MediaPlayer2.Player</link>.
- *
- * Returns: (transfer full) (type MprisMediaPlayer2PlayerSkeleton): The skeleton object.
- */
-MprisMediaPlayer2Player *
-mpris_media_player2_player_skeleton_new (void)
-{
- return MPRIS_MEDIA_PLAYER2_PLAYER (g_object_new (MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON, NULL));
-}
-

audacious-plugins-3.3.4.tar.bz2/src/mpris2/object-player.h Deleted

@@ -1,411 +0,0 @@
-/*
- * Generated by gdbus-codegen 2.32.2. DO NOT EDIT.
- *
- * The license of this code is the same as for the source it was derived from.
- */
-
-#ifndef __OBJECT_PLAYER_H__
-#define __OBJECT_PLAYER_H__
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-
-/* ------------------------------------------------------------------------ */
-/* Declarations for org.mpris.MediaPlayer2.Player */
-
-#define MPRIS_TYPE_MEDIA_PLAYER2_PLAYER (mpris_media_player2_player_get_type ())
-#define MPRIS_MEDIA_PLAYER2_PLAYER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER, MprisMediaPlayer2Player))
-#define MPRIS_IS_MEDIA_PLAYER2_PLAYER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER))
-#define MPRIS_MEDIA_PLAYER2_PLAYER_GET_IFACE(o) (G_TYPE_INSTANCE_GET_INTERFACE ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER, MprisMediaPlayer2PlayerIface))
-
-struct _MprisMediaPlayer2Player;
-typedef struct _MprisMediaPlayer2Player MprisMediaPlayer2Player;
-typedef struct _MprisMediaPlayer2PlayerIface MprisMediaPlayer2PlayerIface;
-
-struct _MprisMediaPlayer2PlayerIface
-{
- GTypeInterface parent_iface;
-
-
-
- gboolean (*handle_next) (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
- gboolean (*handle_pause) (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
- gboolean (*handle_play) (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
- gboolean (*handle_play_pause) (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
- gboolean (*handle_previous) (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
- gboolean (*handle_seek) (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation,
- gint64 arg_Offset);
-
- gboolean (*handle_set_position) (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation,
- const gchar *arg_TrackId,
- gint64 arg_Position);
-
- gboolean (*handle_stop) (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
- gboolean (*get_can_control) (MprisMediaPlayer2Player *object);
-
- gboolean (*get_can_go_next) (MprisMediaPlayer2Player *object);
-
- gboolean (*get_can_go_previous) (MprisMediaPlayer2Player *object);
-
- gboolean (*get_can_pause) (MprisMediaPlayer2Player *object);
-
- gboolean (*get_can_play) (MprisMediaPlayer2Player *object);
-
- gboolean (*get_can_seek) (MprisMediaPlayer2Player *object);
-
- GVariant * (*get_metadata) (MprisMediaPlayer2Player *object);
-
- const gchar * (*get_playback_status) (MprisMediaPlayer2Player *object);
-
- gint64 (*get_position) (MprisMediaPlayer2Player *object);
-
- gdouble (*get_volume) (MprisMediaPlayer2Player *object);
-
- void (*seeked) (
- MprisMediaPlayer2Player *object,
- gint64 arg_Position);
-
-};
-
-GType mpris_media_player2_player_get_type (void) G_GNUC_CONST;
-
-GDBusInterfaceInfo *mpris_media_player2_player_interface_info (void);
-guint mpris_media_player2_player_override_properties (GObjectClass *klass, guint property_id_begin);
-
-
-/* D-Bus method call completion functions: */
-void mpris_media_player2_player_complete_next (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
-void mpris_media_player2_player_complete_pause (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
-void mpris_media_player2_player_complete_play (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
-void mpris_media_player2_player_complete_play_pause (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
-void mpris_media_player2_player_complete_previous (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
-void mpris_media_player2_player_complete_seek (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
-void mpris_media_player2_player_complete_set_position (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
-void mpris_media_player2_player_complete_stop (
- MprisMediaPlayer2Player *object,
- GDBusMethodInvocation *invocation);
-
-
-
-/* D-Bus signal emissions functions: */
-void mpris_media_player2_player_emit_seeked (
- MprisMediaPlayer2Player *object,
- gint64 arg_Position);
-
-
-
-/* D-Bus method calls: */
-void mpris_media_player2_player_call_next (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean mpris_media_player2_player_call_next_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error);
-
-gboolean mpris_media_player2_player_call_next_sync (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GError **error);
-
-void mpris_media_player2_player_call_pause (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean mpris_media_player2_player_call_pause_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error);
-
-gboolean mpris_media_player2_player_call_pause_sync (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GError **error);
-
-void mpris_media_player2_player_call_play (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean mpris_media_player2_player_call_play_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error);
-
-gboolean mpris_media_player2_player_call_play_sync (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GError **error);
-
-void mpris_media_player2_player_call_play_pause (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean mpris_media_player2_player_call_play_pause_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error);
-
-gboolean mpris_media_player2_player_call_play_pause_sync (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GError **error);
-
-void mpris_media_player2_player_call_previous (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean mpris_media_player2_player_call_previous_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error);
-
-gboolean mpris_media_player2_player_call_previous_sync (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GError **error);
-
-void mpris_media_player2_player_call_seek (
- MprisMediaPlayer2Player *proxy,
- gint64 arg_Offset,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean mpris_media_player2_player_call_seek_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error);
-
-gboolean mpris_media_player2_player_call_seek_sync (
- MprisMediaPlayer2Player *proxy,
- gint64 arg_Offset,
- GCancellable *cancellable,
- GError **error);
-
-void mpris_media_player2_player_call_set_position (
- MprisMediaPlayer2Player *proxy,
- const gchar *arg_TrackId,
- gint64 arg_Position,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean mpris_media_player2_player_call_set_position_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error);
-
-gboolean mpris_media_player2_player_call_set_position_sync (
- MprisMediaPlayer2Player *proxy,
- const gchar *arg_TrackId,
- gint64 arg_Position,
- GCancellable *cancellable,
- GError **error);
-
-void mpris_media_player2_player_call_stop (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-
-gboolean mpris_media_player2_player_call_stop_finish (
- MprisMediaPlayer2Player *proxy,
- GAsyncResult *res,
- GError **error);
-
-gboolean mpris_media_player2_player_call_stop_sync (
- MprisMediaPlayer2Player *proxy,
- GCancellable *cancellable,
- GError **error);
-
-
-
-/* D-Bus property accessors: */
-gboolean mpris_media_player2_player_get_can_control (MprisMediaPlayer2Player *object);
-void mpris_media_player2_player_set_can_control (MprisMediaPlayer2Player *object, gboolean value);
-
-gboolean mpris_media_player2_player_get_can_go_next (MprisMediaPlayer2Player *object);
-void mpris_media_player2_player_set_can_go_next (MprisMediaPlayer2Player *object, gboolean value);
-
-gboolean mpris_media_player2_player_get_can_go_previous (MprisMediaPlayer2Player *object);
-void mpris_media_player2_player_set_can_go_previous (MprisMediaPlayer2Player *object, gboolean value);
-
-gboolean mpris_media_player2_player_get_can_pause (MprisMediaPlayer2Player *object);
-void mpris_media_player2_player_set_can_pause (MprisMediaPlayer2Player *object, gboolean value);
-
-gboolean mpris_media_player2_player_get_can_play (MprisMediaPlayer2Player *object);
-void mpris_media_player2_player_set_can_play (MprisMediaPlayer2Player *object, gboolean value);
-
-gboolean mpris_media_player2_player_get_can_seek (MprisMediaPlayer2Player *object);
-void mpris_media_player2_player_set_can_seek (MprisMediaPlayer2Player *object, gboolean value);
-
-GVariant *mpris_media_player2_player_get_metadata (MprisMediaPlayer2Player *object);
-GVariant *mpris_media_player2_player_dup_metadata (MprisMediaPlayer2Player *object);
-void mpris_media_player2_player_set_metadata (MprisMediaPlayer2Player *object, GVariant *value);
-
-const gchar *mpris_media_player2_player_get_playback_status (MprisMediaPlayer2Player *object);
-gchar *mpris_media_player2_player_dup_playback_status (MprisMediaPlayer2Player *object);
-void mpris_media_player2_player_set_playback_status (MprisMediaPlayer2Player *object, const gchar *value);
-
-gint64 mpris_media_player2_player_get_position (MprisMediaPlayer2Player *object);
-void mpris_media_player2_player_set_position (MprisMediaPlayer2Player *object, gint64 value);
-
-gdouble mpris_media_player2_player_get_volume (MprisMediaPlayer2Player *object);
-void mpris_media_player2_player_set_volume (MprisMediaPlayer2Player *object, gdouble value);
-
-
-/* ---- */
-
-#define MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY (mpris_media_player2_player_proxy_get_type ())
-#define MPRIS_MEDIA_PLAYER2_PLAYER_PROXY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, MprisMediaPlayer2PlayerProxy))
-#define MPRIS_MEDIA_PLAYER2_PLAYER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, MprisMediaPlayer2PlayerProxyClass))
-#define MPRIS_MEDIA_PLAYER2_PLAYER_PROXY_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY, MprisMediaPlayer2PlayerProxyClass))
-#define MPRIS_IS_MEDIA_PLAYER2_PLAYER_PROXY(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY))
-#define MPRIS_IS_MEDIA_PLAYER2_PLAYER_PROXY_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_PROXY))
-
-typedef struct _MprisMediaPlayer2PlayerProxy MprisMediaPlayer2PlayerProxy;
-typedef struct _MprisMediaPlayer2PlayerProxyClass MprisMediaPlayer2PlayerProxyClass;
-typedef struct _MprisMediaPlayer2PlayerProxyPrivate MprisMediaPlayer2PlayerProxyPrivate;
-
-struct _MprisMediaPlayer2PlayerProxy
-{
- /*< private >*/
- GDBusProxy parent_instance;
- MprisMediaPlayer2PlayerProxyPrivate *priv;
-};
-
-struct _MprisMediaPlayer2PlayerProxyClass
-{
- GDBusProxyClass parent_class;
-};
-
-GType mpris_media_player2_player_proxy_get_type (void) G_GNUC_CONST;
-
-void mpris_media_player2_player_proxy_new (
- GDBusConnection *connection,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-MprisMediaPlayer2Player *mpris_media_player2_player_proxy_new_finish (
- GAsyncResult *res,
- GError **error);
-MprisMediaPlayer2Player *mpris_media_player2_player_proxy_new_sync (
- GDBusConnection *connection,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GError **error);
-
-void mpris_media_player2_player_proxy_new_for_bus (
- GBusType bus_type,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GAsyncReadyCallback callback,
- gpointer user_data);
-MprisMediaPlayer2Player *mpris_media_player2_player_proxy_new_for_bus_finish (
- GAsyncResult *res,
- GError **error);
-MprisMediaPlayer2Player *mpris_media_player2_player_proxy_new_for_bus_sync (
- GBusType bus_type,
- GDBusProxyFlags flags,
- const gchar *name,
- const gchar *object_path,
- GCancellable *cancellable,
- GError **error);
-
-
-/* ---- */
-
-#define MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON (mpris_media_player2_player_skeleton_get_type ())
-#define MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON, MprisMediaPlayer2PlayerSkeleton))
-#define MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON, MprisMediaPlayer2PlayerSkeletonClass))
-#define MPRIS_MEDIA_PLAYER2_PLAYER_SKELETON_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON, MprisMediaPlayer2PlayerSkeletonClass))
-#define MPRIS_IS_MEDIA_PLAYER2_PLAYER_SKELETON(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON))
-#define MPRIS_IS_MEDIA_PLAYER2_PLAYER_SKELETON_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), MPRIS_TYPE_MEDIA_PLAYER2_PLAYER_SKELETON))
-
-typedef struct _MprisMediaPlayer2PlayerSkeleton MprisMediaPlayer2PlayerSkeleton;
-typedef struct _MprisMediaPlayer2PlayerSkeletonClass MprisMediaPlayer2PlayerSkeletonClass;
-typedef struct _MprisMediaPlayer2PlayerSkeletonPrivate MprisMediaPlayer2PlayerSkeletonPrivate;
-
-struct _MprisMediaPlayer2PlayerSkeleton
-{
- /*< private >*/
- GDBusInterfaceSkeleton parent_instance;
- MprisMediaPlayer2PlayerSkeletonPrivate *priv;
-};
-
-struct _MprisMediaPlayer2PlayerSkeletonClass
-{
- GDBusInterfaceSkeletonClass parent_class;
-};
-
-GType mpris_media_player2_player_skeleton_get_type (void) G_GNUC_CONST;
-
-MprisMediaPlayer2Player *mpris_media_player2_player_skeleton_new (void);
-
-
-G_END_DECLS
-
-#endif /* __OBJECT_PLAYER_H__ */

audacious-plugins-3.3.4.tar.bz2/src/scrobbler Deleted

audacious-plugins-3.3.4.tar.bz2/src/scrobbler/Makefile Deleted

audacious-plugins-3.3.4.tar.bz2/src/scrobbler/configure.c Deleted

@@ -1,197 +0,0 @@
-#include "settings.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <glib.h>
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include <audacious/i18n.h>
-#include <audacious/misc.h>
-#include <audacious/preferences.h>
-
-#include "plugin.h"
-
-GtkWidget *entry1, *entry2, *entry3, *cfgdlg;
-guint apply_timeout = 0; /* ID of timeout to save new config */
-gboolean running = TRUE; /* if plugin threads are running */
-
-static char *hexify(char *pass, int len)
-{
- static char buf[33];
- char *bp = buf;
- char hexchars[] = "0123456789abcdef";
- int i;
-
- memset(buf, 0, sizeof(buf));
-
- for(i = 0; i < len; i++) {
- *(bp++) = hexchars[(pass[i] >> 4) & 0x0f];
- *(bp++) = hexchars[pass[i] & 0x0f];
- }
- *bp = 0;
- return buf;
-}
-
-static char *pwd = NULL;
-
-static void saveconfig(void)
-{
- const char *uid = gtk_entry_get_text(GTK_ENTRY(entry1));
- const char *url = gtk_entry_get_text(GTK_ENTRY(entry3));
-
- unsigned char md5pword[16];
- gsize md5len = 16;
-
- if (pwd != NULL && pwd[0] != '\0') {
- GChecksum * state = g_checksum_new (G_CHECKSUM_MD5);
- g_checksum_update (state, (unsigned char *) pwd, strlen (pwd));
- g_checksum_get_digest (state, md5pword, & md5len);
- g_checksum_free (state);
-
- aud_set_string ("audioscrobbler", "password",
- hexify ((gchar *) md5pword, sizeof md5pword));
- }
- if (uid != NULL && uid[0] != '\0') {
- aud_set_string ("audioscrobbler", "username", uid);
- } else {
- aud_set_string ("audioscrobbler", "username", "");
- aud_set_string ("audioscrobbler", "password", "");
- }
-
- if (url != NULL && url[0] != '\0')
- aud_set_string ("audioscrobbler", "sc_url", url);
- else
- aud_set_string ("audioscrobbler", "sc_url", LASTFM_HS_URL);
-}
-
-static gboolean apply_config_changes(gpointer data) {
- apply_timeout = 0;
- saveconfig();
- start();
- running = TRUE;
- return FALSE;
-}
-
-static void configure_apply(void) {
- if (apply_timeout) { /* config has been changed, but wasn't saved yet */
- g_source_remove(apply_timeout);
- apply_config_changes(NULL);
- }
-}
-
-static void configure_cleanup(void) {
- g_free(pwd);
- pwd = NULL;
-}
-
-static void
-entry_changed(GtkWidget *widget, gpointer data)
-{
- if (running) {
- stop();
- running = FALSE;
- }
-
- if (apply_timeout)
- g_source_remove(apply_timeout);
-
- apply_timeout = g_timeout_add_seconds(10, (GSourceFunc) apply_config_changes, NULL);
-}
-
-static void entry_focus_in(GtkWidget *widget, gpointer data)
-{
- gtk_entry_set_text(GTK_ENTRY(widget), "");
- gtk_entry_set_visibility(GTK_ENTRY(widget), FALSE);
-}
-
-static void entry_focus_out(GtkWidget *widget, gpointer data)
-{
- if (widget == entry2)
- {
- g_free(pwd);
- pwd = g_strdup(gtk_entry_get_text(GTK_ENTRY(entry2)));
- }
-
- entry_changed(widget, data);
- gtk_entry_set_text(GTK_ENTRY(widget), _("Change password"));
- gtk_entry_set_visibility(GTK_ENTRY(widget), TRUE);
-}
-
-static void *create_cfgdlg(void)
-{
- GtkWidget *vbox, *notebook, *grid, *label;
- gchar *username, *sc_url;
-
- vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
- notebook = gtk_notebook_new();
-
- grid = gtk_grid_new();
- gtk_grid_set_row_spacing(GTK_GRID(grid), 6);
- gtk_grid_set_column_spacing(GTK_GRID(grid), 6);
- gtk_container_set_border_width(GTK_CONTAINER(grid), 6);
-
- label = gtk_label_new(_("Services"));
- gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
- gtk_widget_set_halign(label, GTK_ALIGN_START);
- gtk_container_add(GTK_CONTAINER(vbox), label);
-
- label = gtk_label_new(_("Last.fm"));
- gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), grid, label);
-
- label = gtk_label_new(_("Username:"));
- gtk_widget_set_halign(label, GTK_ALIGN_END);
- gtk_grid_attach(GTK_GRID(grid), label, 0, 0, 1, 1);
-
- label = gtk_label_new(_("Password:"));
- gtk_widget_set_halign(label, GTK_ALIGN_END);
- gtk_grid_attach(GTK_GRID(grid), label, 0, 1, 1, 1);
-
- label = gtk_label_new(_("Scrobbler URL:"));
- gtk_widget_set_halign(label, GTK_ALIGN_END);
- gtk_grid_attach(GTK_GRID(grid), label, 0, 2, 1, 1);
-
- entry1 = gtk_entry_new();
- gtk_widget_set_hexpand(entry1, TRUE);
- username = aud_get_string("audioscrobbler", "username");
- gtk_entry_set_text(GTK_ENTRY(entry1), username);
- g_signal_connect(entry1, "changed", G_CALLBACK(entry_changed), NULL);
- gtk_grid_attach(GTK_GRID(grid), entry1, 1, 0, 1, 1);
- g_free(username);
-
- entry2 = gtk_entry_new();
- gtk_widget_set_hexpand(entry2, TRUE);
- gtk_entry_set_text(GTK_ENTRY(entry2), _("Change password"));
- g_signal_connect(entry2, "focus-in-event", G_CALLBACK(entry_focus_in), NULL);
- g_signal_connect(entry2, "focus-out-event", G_CALLBACK(entry_focus_out), NULL);
- gtk_grid_attach(GTK_GRID(grid), entry2, 1, 1, 1, 1);
-
- entry3 = gtk_entry_new();
- gtk_widget_set_hexpand(entry3, TRUE);
- sc_url = aud_get_string("audioscrobbler", "sc_url");
- gtk_entry_set_text(GTK_ENTRY(entry3), sc_url);
- g_signal_connect(entry3, "changed", G_CALLBACK(entry_changed), NULL);
- gtk_grid_attach(GTK_GRID(grid), entry3, 1, 2, 1, 1);
- g_free(sc_url);
-
- gtk_box_pack_start(GTK_BOX(vbox), notebook, FALSE, FALSE, 6);
- gtk_widget_show_all(vbox);
-
- return vbox;
-}
-
-/* TODO: don't use WIDGET_CUSTOM there */
-static PreferencesWidget settings[] = {
- {WIDGET_CUSTOM, .data = {.populate = create_cfgdlg}}};
-
-PluginPreferences preferences = {
- .widgets = settings,
- .n_widgets = G_N_ELEMENTS (settings),
- .apply = configure_apply,
- .cleanup = configure_cleanup
-};

audacious-plugins-3.3.4.tar.bz2/src/scrobbler/fmt.c Deleted

@@ -1,91 +0,0 @@
-#include <wchar.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include "fmt.h"
-#include <curl/curl.h>
-#include <glib.h>
-
-char *fmt_escape(const char *str)
-{
- if (str == NULL)
- return NULL;
-
- return curl_escape(str, 0);
-}
-
-char *fmt_unescape(char *str)
-{
- if (str == NULL)
- return NULL;
-
- return curl_unescape(str, 0);
-}
-
-char *fmt_timestr(time_t t, int gmt)
-{
- struct tm *tm;
- static char buf[30];
-
- tm = gmt ? gmtime(&t) : localtime(&t);
- g_snprintf(buf, sizeof(buf), "%d-%.2d-%.2d %.2d:%.2d:%.2d",
- tm->tm_year + 1900,
- tm->tm_mon + 1,
- tm->tm_mday,
- tm->tm_hour,
- tm->tm_min,
- tm->tm_sec);
- return buf;
-}
-
-char *fmt_vastr(char *fmt, ...)
-{
- va_list ap;
- static char buf[4096];
- va_start(ap, fmt);
- vsnprintf(buf, sizeof(buf), fmt, ap);
- va_end(ap);
- return buf;
-}
-
-void fmt_debug(char *file, const char *fun, char *str)
-{
- fprintf(stderr, "%s [%s] %s: %s\n", fmt_timestr(time(NULL), 0),
- file, fun, str);
-}
-
-char *fmt_string_pack(char *string, char *fmt, ...)
-{
- int buflen = 0, stringlen = 0;
- char buf[4096];
- va_list ap;
-
- va_start(ap, fmt);
- vsnprintf(buf, sizeof(buf), fmt, ap);
- va_end(ap);
- if(string != NULL) stringlen = strlen(string);
- buflen = strlen(buf);
-
- string = realloc(string, stringlen + buflen + 1);
- memcpy(string + stringlen, buf, buflen);
- *(string + stringlen + buflen) = 0;
- return string;
-}
-
-int fmt_strcasecmp(const char *s1, const char *s2)
-{
- while (toupper((int) *s1) == toupper((int) *s2++))
- if (!*s1++)
- return 0;
- return toupper((int) s1[0]) - toupper((int) s2[-1]);
-}
-
-int fmt_strncasecmp(const char *s1, const char *s2, size_t n)
-{
- while (toupper((int) *s1) == toupper((int) *s2++) && --n)
- if(!*s1++)
- return 0;
- return n ? toupper((int) s1[0]) - toupper((int) s2[-1]) : 0;
-}

audacious-plugins-3.3.4.tar.bz2/src/scrobbler/fmt.h Deleted

audacious-plugins-3.3.4.tar.bz2/src/scrobbler/plugin.c Deleted

@@ -1,191 +0,0 @@
-#include "settings.h"
-
-#include <glib.h>
-#include <audacious/i18n.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include <audacious/debug.h>
-#include <audacious/misc.h>
-#include <audacious/playlist.h>
-#include <audacious/plugin.h>
-#include <libaudcore/audstrings.h>
-#include <libaudcore/hook.h>
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#include <wchar.h>
-#include <sys/time.h>
-
-#include <curl/curl.h>
-
-#include "plugin.h"
-#include "scrobbler.h"
-#include "fmt.h"
-
-typedef struct submit_t
-{
- int dosubmit, pos_c, len;
-} submit_t;
-
-static int sc_going, ge_going;
-
-static pthread_mutex_t m_scrobbler = PTHREAD_MUTEX_INITIALIZER;
-
-guint track_timeout = 0;
-
-static gboolean ishttp(const char *a)
-{
- g_return_val_if_fail(a != NULL, FALSE);
- return str_has_prefix_nocase(a, "http://") || str_has_prefix_nocase(a, "https://");
-}
-
-static void aud_hook_playback_begin(gpointer hook_data, gpointer user_data)
-{
- gint playlist = aud_playlist_get_playing();
- gint pos = aud_playlist_get_position(playlist);
-
- char *filename = aud_playlist_entry_get_filename(playlist, pos);
- bool_t is_http_source = ishttp(filename);
- str_unref(filename);
-
- Tuple *tuple = aud_playlist_entry_get_tuple(playlist, pos, FALSE);
- if (!tuple)
- return;
-
- int len = tuple_get_int(tuple, FIELD_LENGTH, NULL) / 1000;
-
- /* Make up a length when we submit streaming to now playing.
- * We will change it before we actually scrobble the track. */
- if (len < 1 && is_http_source)
- len = 240;
-
- if (len < 30)
- {
- AUDDBG("Length less than 30 seconds; not submitting\n");
- tuple_unref(tuple);
- return;
- }
-
- sc_idle(&m_scrobbler);
-
- sc_addentry(&m_scrobbler, tuple, len, is_http_source);
- tuple_unref(tuple);
-
- if (!track_timeout)
- track_timeout = g_timeout_add_seconds(1, sc_timeout, &m_scrobbler);
-}
-
-static void aud_hook_playback_end(gpointer aud_hook_data, gpointer user_data)
-{
- sc_playback_end();
- sc_idle(&m_scrobbler);
-
- if (track_timeout)
- {
- g_source_remove(track_timeout);
- track_timeout = 0;
- }
-}
-
-void start(void) {
- sc_going = 1;
-
- gchar * username = aud_get_string ("audioscrobbler", "username");
- gchar * password = aud_get_string ("audioscrobbler", "password");
- gchar * sc_url = aud_get_string ("audioscrobbler", "sc_url");
-
- if ((!username || !password) || (!*username || !*password))
- {
- AUDDBG("username/password not found - not starting last.fm support");
- sc_going = 0;
- }
- else
- sc_init(username, password, sc_url);
-
- g_free (username);
- g_free (password);
- g_free (sc_url);
-
- hook_associate("playback begin", aud_hook_playback_begin, NULL);
- hook_associate("playback stop", aud_hook_playback_end, NULL);
-
- AUDDBG("plugin started");
- sc_idle(&m_scrobbler);
-}
-
-void stop(void) {
- if (!sc_going && !ge_going)
- return;
- pthread_mutex_lock(&m_scrobbler);
-
- if (sc_going)
- sc_cleaner();
- sc_going = 0;
- ge_going = 0;
- pthread_mutex_unlock(&m_scrobbler);
-
- hook_dissociate("playback begin", aud_hook_playback_begin);
- hook_dissociate("playback stop", aud_hook_playback_end);
-}
-
-static gboolean init(void)
-{
- start();
- return TRUE;
-}
-
-static void cleanup(void)
-{
- stop();
-}
-
-void setup_proxy(CURL *curl)
-{
- if (! aud_get_bool (NULL, "use_proxy"))
- curl_easy_setopt(curl, CURLOPT_PROXY, "");
- else
- {
- gchar * proxy_host = aud_get_string (NULL, "proxy_host");
- gchar * proxy_port = aud_get_string (NULL, "proxy_port");
-
- curl_easy_setopt(curl, CURLOPT_PROXY, proxy_host);
- curl_easy_setopt(curl, CURLOPT_PROXYPORT, atol(proxy_port));
-
- if (! aud_get_bool (NULL, "proxy_use_auth"))
- {
- gchar * user = aud_get_string (NULL, "proxy_user");
- gchar * pass = aud_get_string (NULL, "proxy_pass");
- gchar * userpwd = g_strdup_printf ("%s:%s", user, pass);
-
- curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, userpwd);
-
- g_free (user);
- g_free (pass);
- g_free (userpwd);
- }
-
- g_free (proxy_host);
- g_free (proxy_port);
- }
-}
-
-static const char about[] =
- N_("Audacious AudioScrobbler Plugin\n\n"
- "Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>");
-
-AUD_GENERAL_PLUGIN
-(
- .name = N_("Scrobbler"),
- .domain = PACKAGE,
- .about_text = about,
- .prefs = & preferences,
- .init = init,
- .cleanup = cleanup
-)

audacious-plugins-3.3.4.tar.bz2/src/scrobbler/plugin.h Deleted

audacious-plugins-3.3.4.tar.bz2/src/scrobbler/scrobbler.c Deleted

@@ -1,1233 +0,0 @@
-#include <inttypes.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include "fmt.h"
-#include "plugin.h"
-#include "scrobbler.h"
-#include "settings.h"
-#include <glib.h>
-
-#include <audacious/drct.h>
-#include <audacious/debug.h>
-#include <audacious/misc.h>
-#include <audacious/playlist.h>
-#include <audacious/plugin.h>
-
-#define SCROBBLER_CLI_ID "aud"
-#define SCROBBLER_HS_WAIT 1800
-#define SCROBBLER_SB_WAIT 10
-#define SCROBBLER_VERSION "1.2"
-#define SCROBBLER_IMPLEMENTATION "0.2" /* This is the implementation, not the player version. */
-#define SCROBBLER_SB_MAXLEN 1024
-#define CACHE_SIZE 1024
-
-/* Scrobblerbackend for xmms plugin, first draft */
-
-static int sc_hs_status,
- sc_hs_timeout,
- sc_hs_errors,
- sc_sb_errors,
- sc_bad_users,
- sc_submit_interval,
- sc_submit_timeout,
- sc_srv_res_size,
- sc_giveup,
- sc_major_error_present;
-
-static char *sc_submit_url, /* queue */
- *sc_np_url, /* np */
- *sc_hs_url, /* handshake url */
- *sc_session_id,
- *sc_username = NULL,
- *sc_password = NULL,
- *sc_challenge_hash,
- sc_response_hash[65535],
- *sc_srv_res,
- sc_curl_errbuf[CURL_ERROR_SIZE],
- *sc_major_error;
-
-static int sc_submit_np(Tuple *tuple, int len);
-static void dump_queue();
-
-/**** Queue stuff ****/
-
-#define I_ARTIST(i) i->artist
-#define I_TITLE(i) i->title
-#define I_TIME(i) i->utctime
-#define I_LEN(i) i->len
-#define I_ALBUM(i) i->album
-
-typedef struct {
- char *artist, *title, *album;
- int utctime, track, len;
- int timeplayed;
- int numtries;
- bool_t is_http_source;
- void *next;
-} item_t;
-
-static item_t *q_queue = NULL;
-static item_t *q_queue_last = NULL;
-static int q_nitems;
-static item_t *np_item = NULL;
-
-gchar *
-xmms_urldecode_plain(const gchar * encoded_path)
-{
- const gchar *cur, *ext;
- gchar *path, *tmp;
- guint realchar;
-
- if (!encoded_path)
- return NULL;
-
- cur = encoded_path;
- if (*cur == '/')
- while (cur[1] == '/')
- cur++;
-
- tmp = g_malloc0(strlen(cur) + 1);
-
- while ((ext = strchr(cur, '%')) != NULL) {
- strncat(tmp, cur, ext - cur);
- ext++;
- cur = ext + 2;
- if (!sscanf(ext, "%2x", &realchar)) {
- /*
- * Assume it is a literal '%'. Several file
- * managers send unencoded file: urls on on
- * drag and drop.
- */
- realchar = '%';
- cur -= 2;
- }
- tmp[strlen(tmp)] = realchar;
- }
-
- path = g_strconcat(tmp, cur, NULL);
- g_free(tmp);
- return path;
-}
-
-static void q_item_free(item_t *item)
-{
- if (item == NULL)
- return;
- curl_free(item->artist);
- curl_free(item->title);
- curl_free(item->album);
- free(item);
-}
-
-static item_t *q_additem(item_t *newitem)
-{
- AUDDBG("Adding %s - %s to the queue\n", newitem->artist, newitem->title);
-
- q_nitems++;
- newitem->next = NULL;
- if (q_queue_last == NULL)
- {
- q_queue = q_queue_last = newitem;
- }
- else
- {
- q_queue_last->next = newitem;
- q_queue_last = newitem;
- }
- return newitem;
-}
-
-static item_t *create_item(Tuple *tuple, int len, bool_t is_http_source)
-{
- item_t *item;
- gchar *album, *artist, *title;
-
- item = malloc(sizeof(item_t));
-
- artist = tuple_get_str(tuple, FIELD_ARTIST, NULL);
- item->artist = fmt_escape(artist);
- str_unref(artist);
-
- title = tuple_get_str(tuple, FIELD_TITLE, NULL);
- item->title = fmt_escape(title);
- str_unref(title);
-
- if (item->artist == NULL || item->title == NULL)
- {
- free (item);
- return NULL;
- }
-
- item->len = len;
- item->track = tuple_get_int(tuple, FIELD_TRACK_NUMBER, NULL);
- item->timeplayed = 0;
- item->utctime = time(NULL);
-
- album = tuple_get_str(tuple, FIELD_ALBUM, NULL);
- if (album)
- {
- item->album = fmt_escape(album);
- str_unref(album);
- }
- else
- item->album = fmt_escape("");
-
- item->is_http_source = is_http_source;
-
- item->next = NULL;
-
- return item;
-}
-
-static item_t *q_put(Tuple *tuple, int t, int len)
-{
- item_t *item;
-
- if (!(item = create_item(tuple, len, FALSE)))
- return NULL;
-
- item->timeplayed = len;
- item->utctime = t;
-
- return q_additem(item);
-}
-
-static item_t *set_np(Tuple *tuple, int len, bool_t is_http_source)
-{
- if (np_item != NULL)
- q_item_free (np_item);
-
- if ((np_item = create_item(tuple, len, is_http_source)))
- AUDDBG ("Tracking now-playing track: %s - %s\n", np_item->artist,
- np_item->title);
-
- return np_item;
-}
-
-#if 0
-static item_t *q_peek(void)
-{
- if (q_nitems == 0)
- return NULL;
- return q_queue;
-}
-#endif
-
-static item_t *q_peekall(int rewind)
-{
- static item_t *citem = NULL;
- item_t *temp_item;
-
- if (rewind) {
- citem = q_queue;
- return NULL;
- }
-
- temp_item = citem;
-
- if(citem != NULL)
- citem = citem->next;
-
- return temp_item;
-}
-
-static int q_get(void)
-{
- item_t *item;
-
- if (q_nitems == 0)
- return 0;
-
- item = q_queue;
-
- if(item == NULL)
- return 0;
-
- q_nitems--;
- q_queue = q_queue->next;
-
- AUDDBG("Removing %s - %s from queue\n", item->artist, item->title);
-
- q_item_free(item);
-
- if (q_nitems == 0)
- {
- q_queue_last = NULL;
- return 0;
- }
-
- return -1;
-}
-
-static void q_free(void)
-{
- while (q_get());
-}
-
-
-/* isn't there better way for that? --desowin */
-gboolean sc_timeout(gpointer data)
-{
- if (!np_item)
- return TRUE;
-
- if (aud_drct_get_playing() && !aud_drct_get_paused())
- np_item->timeplayed++;
-
- if (np_item->is_http_source)
- {
- /* This might be a stream, so check if the track info has changed. */
- int playlist = aud_playlist_get_playing();
- int pos = aud_playlist_get_position(playlist);
- Tuple *tuple = aud_playlist_entry_get_tuple(playlist, pos, FALSE);
-
- if (!tuple)
- return TRUE;
-
- int len = tuple_get_int(tuple, FIELD_LENGTH, NULL) / 1000;
-
- /* Make up a length when we submit streaming to now playing.
- * We will change it before we actually scrobble the track. */
- if (len < 1)
- len = 240;
-
- item_t *current_item = create_item(tuple, len, TRUE);
-
- if (!current_item)
- {
- tuple_unref(tuple);
- return TRUE;
- }
-
- if (strcmp(np_item->artist, current_item->artist)
- || strcmp(np_item->title, current_item->title)
- || strcmp (np_item->album, current_item->album)
- || np_item->track != current_item->track)
- {
- /* Now set the real length of the track. */
- np_item->len = np_item->timeplayed;
-
- AUDDBG("Submitting\n");
-
- q_additem(np_item);
- np_item = current_item;
- dump_queue();
-
- /* Make sure the queue is submitted. */
- sc_idle(data);
-
- sc_submit_np(tuple, len);
- }
- else
- {
- q_item_free(current_item);
-
- if (np_item->timeplayed > np_item->len)
- {
- /* Submit the track again to make sure it stays on now playing.
- * This doubles the total length we have submitted. */
- sc_submit_np(tuple, np_item->len);
- np_item->len *= 2;
- }
- }
-
- tuple_unref(tuple);
- }
- else
- {
- /*
- * Check our now-playing track to see if it should go into the queue
- */
- if (((np_item->timeplayed >= (np_item->len / 2)) ||
- (np_item->timeplayed >= 240)))
- {
- AUDDBG("submitting!!!\n");
-
- q_additem(np_item);
- np_item = NULL;
- dump_queue();
- }
- }
-
- return TRUE;
-}
-
-void sc_playback_end(void)
-{
- if (np_item && np_item->is_http_source)
- {
- /* Now set the real length of the track. */
- np_item->len = np_item->timeplayed;
-
- AUDDBG("Submitting\n");
-
- q_additem(np_item);
- np_item = NULL;
- dump_queue();
- }
-}
-
-/* Error functions */
-
-static void sc_throw_error(char *errortxt)
-{
- sc_major_error_present = 1;
- if(sc_major_error == NULL)
- sc_major_error = strdup(errortxt);
-
- return;
-}
-
-int sc_catch_error(void)
-{
- return sc_major_error_present;
-}
-
-char *sc_fetch_error(void)
-{
- return sc_major_error;
-}
-
-void sc_clear_error(void)
-{
- sc_major_error_present = 0;
- if(sc_major_error != NULL)
- free(sc_major_error);
- sc_major_error = NULL;
-
- return;
-}
-
-static size_t sc_store_res(void *ptr, size_t size,
- size_t nmemb,
- void *stream __attribute__((unused)))
-{
- int len = size * nmemb;
-
- sc_srv_res = realloc(sc_srv_res, sc_srv_res_size + len + 1);
- memcpy(sc_srv_res + sc_srv_res_size,
- ptr, len);
- sc_srv_res_size += len;
- return len;
-}
-
-static void sc_free_res(void)
-{
- if(sc_srv_res != NULL)
- free(sc_srv_res);
- sc_srv_res = NULL;
- sc_srv_res_size = 0;
-}
-
-static int sc_parse_hs_res(void)
-{
- char *interval;
-
- if (!sc_srv_res_size) {
- AUDDBG("No reply from server\n");
- return -1;
- }
- if (sc_srv_res == NULL) {
- AUDDBG("Reply is NULL, size=%d\n", sc_srv_res_size);
- return -1;
- }
- *(sc_srv_res + sc_srv_res_size) = 0;
-
- AUDDBG("reply is: %s\n", sc_srv_res);
- if (!strncmp(sc_srv_res, "OK\n", 3)) {
- gchar *scratch = g_strdup(sc_srv_res);
- gchar **split = g_strsplit(scratch, "\n", 5);
-
- g_free(scratch);
-
- sc_session_id = g_strdup(split[1]);
- sc_np_url = g_strdup(split[2]);
- sc_submit_url = g_strdup(split[3]);
-
- g_strfreev(split);
- return 0;
- }
- if (!strncmp(sc_srv_res, "FAILED ", 7)) {
- interval = strstr(sc_srv_res, "INTERVAL");
-
- /* Throwing a major error, just in case */
- /* sc_throw_error(fmt_vastr("%s", sc_srv_res));
- sc_hs_errors++; */
- AUDDBG("error: %s\n", sc_srv_res);
-
- return -1;
- }
-
- if (!strncmp(sc_srv_res, "UPDATE ", 7)) {
- interval = strstr(sc_srv_res, "INTERVAL");
- if(!interval)
- {
- AUDDBG("missing INTERVAL\n");
- }
- else
- {
- *(interval - 1) = 0;
- sc_submit_interval = strtol(interval + 8, NULL, 10);
- }
-
- sc_submit_url = strchr(strchr(sc_srv_res, '\n') + 1, '\n') + 1;
- *(sc_submit_url - 1) = 0;
- sc_submit_url = strdup(sc_submit_url);
- sc_challenge_hash = strchr(sc_srv_res, '\n') + 1;
- *(sc_challenge_hash - 1) = 0;
- sc_challenge_hash = strdup(sc_challenge_hash);
-
- /* Throwing major error. Need to alert client to update. */
- sc_throw_error(fmt_vastr("Please update Audacious.\n"
- "Update available at: http://audacious-media-player.org"));
- AUDDBG("update client: %s\n", sc_srv_res + 7);
-
- /*
- * Russ isn't clear on whether we can submit with a not-updated
- * client. Neither is RJ. I use what we did before.
- */
- sc_giveup = -1;
- return -1;
- }
- if (!strncmp(sc_srv_res, "UPTODATE\n", 9)) {
- sc_bad_users = 0;
-
- interval = strstr(sc_srv_res, "INTERVAL");
- if (!interval) {
- AUDDBG("missing INTERVAL\n");
- /*
- * This is probably a bad thing, but Russ seems to
- * think its OK to assume that an UPTODATE response
- * may not have an INTERVAL... We return -1 anyway.
- */
- return -1;
- }
- else
- {
- *(interval - 1) = 0;
- sc_submit_interval = strtol(interval + 8, NULL, 10);
- }
-
- sc_submit_url = strchr(strchr(sc_srv_res, '\n') + 1, '\n') + 1;
- *(sc_submit_url - 1) = 0;
- sc_submit_url = strdup(sc_submit_url);
- sc_challenge_hash = strchr(sc_srv_res, '\n') + 1;
- *(sc_challenge_hash - 1) = 0;
- sc_challenge_hash = strdup(sc_challenge_hash);
-
- return 0;
- }
- if(!strncmp(sc_srv_res, "BADAUTH", 7)) {
- /* Throwing major error. */
- sc_throw_error("Incorrect username/password.\n"
- "Please fix in configuration.");
- AUDDBG("incorrect username/password\n");
-
- interval = strstr(sc_srv_res, "INTERVAL");
- if(!interval)
- {
- AUDDBG("missing INTERVAL\n");
- }
- else
- {
- *(interval - 1) = 0;
- sc_submit_interval = strtol(interval + 8, NULL, 10);
- }
-
- return -1;
- }
-
- AUDDBG("unknown server-reply '%s'\n", sc_srv_res);
- return -1;
-}
-
-static unsigned char *md5_string(char *pass, int len)
-{
- static unsigned char md5pword[16];
- gsize md5len = 16;
-
- GChecksum * state = g_checksum_new (G_CHECKSUM_MD5);
- g_checksum_update (state, (unsigned char *) pass, len);
- g_checksum_get_digest (state, md5pword, & md5len);
- g_checksum_free (state);
-
- return md5pword;
-}
-
-static void hexify(char *pass, int len)
-{
- char *bp = sc_response_hash;
- char hexchars[] = "0123456789abcdef";
- int i;
-
- memset(sc_response_hash, 0, sizeof(sc_response_hash));
-
- for(i = 0; i < len; i++) {
- *(bp++) = hexchars[(pass[i] >> 4) & 0x0f];
- *(bp++) = hexchars[pass[i] & 0x0f];
- }
- *bp = 0;
-
- return;
-}
-
-static int sc_parse_sb_res(void);
-static pthread_mutex_t submit_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-gpointer sc_curl_perform_thread(gpointer data)
-{
- CURL *curl = (CURL *) data;
-
- pthread_mutex_lock(&submit_mutex);
-
- curl_easy_perform(curl);
- curl_easy_cleanup(curl);
-
- if (sc_parse_sb_res()) {
- sc_sb_errors++;
- sc_free_res();
- AUDDBG("Retrying in %d secs, %d elements in queue\n",
- sc_submit_interval, q_nitems);
-
- pthread_mutex_unlock(&submit_mutex);
-
- return NULL;
- }
-
- pthread_mutex_unlock(&submit_mutex);
-
- sc_free_res();
- return NULL;
-}
-
-void sc_curl_perform(CURL *curl)
-{
- pthread_t thread;
- pthread_create(&thread, NULL, sc_curl_perform_thread, curl);
- pthread_detach(thread);
-}
-
-static int sc_handshake(void)
-{
- int status;
- char buf[65535];
- CURL *curl;
- time_t ts = time(NULL);
- char *auth_tmp;
- char *auth;
-
- auth_tmp = g_strdup_printf("%s%"PRId64, sc_password, (gint64) ts);
- auth = (char *)md5_string(auth_tmp, strlen(auth_tmp));
- g_free(auth_tmp);
- hexify(auth, 16);
- auth_tmp = g_strdup(sc_response_hash);
-
- g_snprintf(buf, sizeof(buf), "%s/?hs=true&p=%s&c=%s&v=%s&u=%s&t=%"PRId64"&a=%s",
- sc_hs_url, SCROBBLER_VERSION,
- SCROBBLER_CLI_ID, SCROBBLER_IMPLEMENTATION, sc_username, (gint64) ts,
- auth_tmp);
- g_free(auth_tmp);
-
- curl = curl_easy_init();
- setup_proxy(curl);
- curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
- curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
- curl_easy_setopt(curl, CURLOPT_URL, buf);
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
- sc_store_res);
- memset(sc_curl_errbuf, 0, sizeof(sc_curl_errbuf));
- curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, sc_curl_errbuf);
- curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
- curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, SC_CURL_TIMEOUT);
- status = curl_easy_perform(curl);
- curl_easy_cleanup(curl);
-
- sc_hs_timeout = time(NULL) + SCROBBLER_HS_WAIT;
-
- if (status) {
- AUDDBG("curl error: %s\n", sc_curl_errbuf);
- sc_hs_errors++;
- sc_free_res();
- return -1;
- }
-
- if (sc_parse_hs_res()) {
- sc_hs_errors++;
- sc_free_res();
- return -1;
- }
-
- if (sc_challenge_hash != NULL) {
- unsigned char md5pword[16];
- gsize md5len = 16;
-
- /*AUDDBG("Pass Hash: %s", sc_password));*/
- /*AUDDBG("Challenge Hash: %s", sc_challenge_hash));*/
-
- GChecksum * state = g_checksum_new (G_CHECKSUM_MD5);
- g_checksum_update (state, (unsigned char *) sc_password, strlen (sc_password));
- g_checksum_update (state, (unsigned char *) sc_challenge_hash,
- strlen (sc_challenge_hash));
- g_checksum_get_digest (state, md5pword, & md5len);
- g_checksum_free (state);
-
- hexify((char*)md5pword, sizeof(md5pword));
- /*AUDDBG("Response Hash: %s", sc_response_hash));*/
- }
-
- sc_hs_errors = 0;
- sc_hs_status = 1;
-
- sc_free_res();
-
- AUDDBG("submiturl: %s - interval: %d\n",
- sc_submit_url, sc_submit_interval);
-
- return 0;
-}
-
-static int sc_parse_sb_res(void)
-{
- char *ch, *ch2;
-
- if (!sc_srv_res_size) {
- AUDDBG("No response from server\n");
- return -1;
- }
- if (sc_srv_res == NULL) {
- AUDDBG("Reply is NULL, size=%d\n", sc_srv_res_size);
- return -1;
- }
- *(sc_srv_res + sc_srv_res_size) = 0;
-
- AUDDBG("message: %s\n", sc_srv_res);
- if (!strncmp(sc_srv_res, "OK", 2)) {
- if ((ch = strstr(sc_srv_res, "INTERVAL"))) {
- sc_submit_interval = strtol(ch + 8, NULL, 10);
- AUDDBG("got new interval: %d\n",
- sc_submit_interval);
- }
-
- AUDDBG("submission ok: %s\n", sc_srv_res);
-
- return 0;
- }
-
- if (!strncmp(sc_srv_res, "BADAUTH", 7)) {
- if ((ch = strstr(sc_srv_res, "INTERVAL"))) {
- sc_submit_interval = strtol(ch + 8, NULL, 10);
- AUDDBG("got new interval: %d\n",
- sc_submit_interval);
- }
-
- AUDDBG("incorrect username/password\n");
-
- sc_giveup = 0;
-
- /*
- * We obviously aren't authenticated. The server might have
- * lost our handshake status though, so let's try
- * re-handshaking... This might not be proper.
- * (we don't give up)
- */
- sc_hs_status = 0;
-
- if(sc_challenge_hash != NULL)
- free(sc_challenge_hash);
- if(sc_submit_url != NULL)
- free(sc_submit_url);
-
- sc_challenge_hash = sc_submit_url = NULL;
- sc_bad_users++;
-
- if(sc_bad_users > 2)
- {
- AUDDBG("3 BADAUTH returns on submission. Halting "
- "submissions until login fixed.\n");
- sc_throw_error("Incorrect username/password.\n"
- "Please fix in configuration.");
- }
-
- return -1;
- }
-
- if(!strncmp(sc_srv_res, "BADSESSION", 10)) {
- AUDDBG("Invalid session, re-handshaking\n");
-
- sc_free_res();
- sc_handshake();
-
- return -1;
- }
-
- if (!strncmp(sc_srv_res, "FAILED", 6)) {
- if ((ch = strstr(sc_srv_res, "INTERVAL"))) {
- sc_submit_interval = strtol(ch + 8, NULL, 10);
- AUDDBG("got new interval: %d\n",
- sc_submit_interval);
- }
-
- /* This could be important. (Such as FAILED - Get new plugin) */
- /*sc_throw_error(fmt_vastr("%s", sc_srv_res));*/
-
- AUDDBG("%s\n", sc_srv_res);
-
- return -1;
- }
-
- if (!strncmp(sc_srv_res, "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">", 50)) {
- ch = strstr(sc_srv_res, "<TITLE>");
- ch2 = strstr(sc_srv_res, "</TITLE>");
- if (ch != NULL && ch2 != NULL) {
- ch += strlen("<TITLE>");
- *ch2 = '\0';
-
- AUDDBG("HTTP Error (%d): '%s'\n",
- atoi(ch), ch + 4);
-// *ch2 = '<'; // needed? --yaz
- }
-
- return -1;
- }
-
- AUDDBG("unknown server-reply %s\n", sc_srv_res);
-
- return -1;
-}
-
-static gchar *sc_itemtag(char c, int n, char *str)
-{
- static char buf[SCROBBLER_SB_MAXLEN];
- g_snprintf(buf, SCROBBLER_SB_MAXLEN, "&%c[%d]=%s", c, n, str);
- return buf;
-}
-
-#define cfa(f, l, n, v) \
-curl_formadd(f, l, CURLFORM_COPYNAME, n, \
- CURLFORM_PTRCONTENTS, v, CURLFORM_END)
-
-static int sc_generateentry(GString *submission)
-{
- int i;
- item_t *item;
-
- i = 0;
-
- q_peekall(1);
-
- while ((item = q_peekall(0)) && i < 10)
- {
- /*
- * We assume now that all tracks in the queue should be submitted.
- * The check occurs in the sc_timeout() function now.
- */
-
- if (!item) {
- AUDDBG("item = NULL :(\n");
- return i;
- }
-
- g_string_append(submission,sc_itemtag('a',i,I_ARTIST(item)));
- g_string_append(submission,sc_itemtag('t',i,I_TITLE(item)));
- gchar *tmp = g_strdup_printf("%d",I_LEN(item));
- g_string_append(submission,sc_itemtag('l',i,tmp));
- g_free(tmp);
- tmp = g_strdup_printf("%d",I_TIME(item));
- g_string_append(submission,sc_itemtag('i',i,tmp));
- g_free(tmp);
- g_string_append(submission,sc_itemtag('m',i,""));
- g_string_append(submission,sc_itemtag('b',i,I_ALBUM(item)));
- g_string_append(submission,sc_itemtag('o',i,"P"));
- tmp = g_strdup_printf("%d",item->track);
- g_string_append(submission,sc_itemtag('n',i,tmp));
- g_free(tmp);
- g_string_append(submission,sc_itemtag('r',i,""));
-
- AUDDBG("a[%d]=%s t[%d]=%s l[%d]=%d i[%d]=%d b[%d]=%s\n",
- i, I_ARTIST(item),
- i, I_TITLE(item),
- i, I_LEN(item),
- i, I_TIME(item),
- i, I_ALBUM(item));
- i++;
- }
-
- return i;
-}
-
-static int sc_submit_np(Tuple *tuple, int len)
-{
- CURL *curl;
- /* struct HttpPost *post = NULL , *last = NULL; */
- static gchar entry[16384];
-
- curl = curl_easy_init();
- setup_proxy(curl);
- curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
- curl_easy_setopt(curl, CURLOPT_URL, sc_np_url);
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
- sc_store_res);
- curl_easy_setopt(curl, CURLOPT_USERAGENT, USER_AGENT);
- curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
- /*cfa(&post, &last, "debug", "failed");*/
-
- char *artist = tuple_get_str(tuple, FIELD_ARTIST, NULL);
- char *field_artist = fmt_escape(artist);
- str_unref(artist);
-
- char *title = tuple_get_str(tuple, FIELD_TITLE, NULL);
- char *field_title = fmt_escape(title);
- str_unref(title);
-
- char *album = tuple_get_str(tuple, FIELD_ALBUM, NULL);
- char *field_album = album ? fmt_escape(album) : fmt_escape("");
- str_unref(album);
-
- snprintf(entry, 16384, "s=%s&a=%s&t=%s&b=%s&l=%d&n=%d&m=", sc_session_id,
- field_artist,
- field_title,
- field_album,
- len,
- tuple_get_int(tuple, FIELD_TRACK_NUMBER, NULL));
- curl_free(field_artist);
- curl_free(field_title);
- curl_free(field_album);
-
- curl_easy_setopt(curl, CURLOPT_POSTFIELDS, (char *) entry);
- memset(sc_curl_errbuf, 0, sizeof(sc_curl_errbuf));
- curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, sc_curl_errbuf);
- curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
- curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, SC_CURL_TIMEOUT);
- curl_easy_setopt(curl, CURLOPT_TIMEOUT, SCROBBLER_SB_WAIT);
- sc_curl_perform(curl);
-
- return 0;
-}
-
-static int sc_submitentry(gchar *entry)
-{
- CURL *curl;
- /* struct HttpPost *post = NULL , *last = NULL; */
- static gchar sub[16384];
-
- curl = curl_easy_init();
- setup_proxy(curl);
- curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1);
- curl_easy_setopt(curl, CURLOPT_URL, sc_submit_url);
- curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION,
- sc_store_res);
- curl_easy_setopt(curl, CURLOPT_USERAGENT, USER_AGENT);
- curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
- /*cfa(&post, &last, "debug", "failed");*/
-
- /*AUDDBG("Response Hash: %s", sc_response_hash));*/
- snprintf(sub, 16384, "s=%s%s", sc_session_id, entry);
-
- curl_easy_setopt(curl, CURLOPT_POSTFIELDS, (char *) sub);
- memset(sc_curl_errbuf, 0, sizeof(sc_curl_errbuf));
- curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, sc_curl_errbuf);
- curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
- curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, SC_CURL_TIMEOUT);
- curl_easy_setopt(curl, CURLOPT_TIMEOUT, SCROBBLER_SB_WAIT);
- sc_curl_perform(curl);
-
- return 0;
-}
-
-static void sc_handlequeue(pthread_mutex_t *mutex)
-{
- GString *submitentry;
- int nsubmit;
- int wait;
- int i;
-
- AUDDBG("handle queue\n");
-
- if(sc_submit_timeout < time(NULL) && sc_bad_users < 3)
- {
- submitentry = g_string_new("");
-
- AUDDBG("ok to handle queue!\n");
-
- pthread_mutex_lock(mutex);
-
- nsubmit = sc_generateentry(submitentry);
-
- pthread_mutex_unlock(mutex);
-
- if (nsubmit > 0)
- {
- AUDDBG("Number submitting: %d\n", nsubmit);
- AUDDBG("Submission: %s\n", submitentry->str);
-
- if(!sc_submitentry(submitentry->str))
- {
- pthread_mutex_lock(mutex);
-
- AUDDBG("Clearing out %d item(s) from the queue\n", nsubmit);
- for (i=0; i<nsubmit; i++)
- {
- q_get();
- }
-
- /*
- * This should make sure that the queue doesn't
- * get submitted multiple times on a nasty
- * segfault...
- */
- dump_queue();
-
- pthread_mutex_unlock(mutex);
-
- sc_sb_errors = 0;
- }
- if(sc_sb_errors)
- {
- /* Dump queue */
- pthread_mutex_lock(mutex);
- dump_queue();
- pthread_mutex_unlock(mutex);
-
- if(sc_sb_errors < 5)
- /* Retry after 1 min */
- wait = 60;
- else
- wait = /* sc_submit_interval + */
- ( ((sc_sb_errors - 5) < 7) ?
- (60 << (sc_sb_errors-5)) :
- 7200 );
-
- sc_submit_timeout = time(NULL) + wait;
-
- AUDDBG("Error while submitting. "
- "Retrying after %d seconds.\n", wait);
- }
- }
-
- g_string_free(submitentry, TRUE);
- }
-}
-
-static void read_cache(void)
-{
- int i=0;
- item_t *item;
-
- gchar * path = g_strconcat (aud_get_path (AUD_PATH_USER_DIR), "/scrobblerqueue.txt", NULL);
-
- if (! g_file_test (path, G_FILE_TEST_EXISTS))
- return;
-
- AUDDBG ("Opening %s\n", path);
-
- gchar* cache;
- gchar** values;
- gchar** entry;
- g_file_get_contents (path, & cache, NULL, NULL);
- values = g_strsplit(cache, "\n", 0);
- g_free (path);
-
- int x;
- for (x=0; values[x] && strlen(values[x]); x++) {
- entry = g_strsplit(values[x], "\t", 0);
- if (entry[0] && entry[1] && entry[2] && entry[3] && entry[4] && entry[6]) {
- char *artist, *title, *album;
- int t, len, track;
-
- artist = g_strdup(entry[0]);
- album = g_strdup(entry[1]);
- title = g_strdup(entry[2]);
- track = atoi(entry[3]);
- len = atoi(entry[4]);
- t = atoi(entry[6]);
-
- /*
- * All entries in the queue should have "L" as the sixth field now, but
- * we'll continue to check the value anyway, for backwards-compatibility reasons.
- */
- if (!strncmp(entry[5], "L", 1)) {
- Tuple *tuple = tuple_new();
- gchar* string_value;
- string_value = xmms_urldecode_plain(artist);
- tuple_set_str(tuple, FIELD_ARTIST, NULL, string_value);
- g_free(string_value);
- string_value = xmms_urldecode_plain(title);
- tuple_set_str(tuple, FIELD_TITLE, NULL, string_value);
- g_free(string_value);
- string_value = xmms_urldecode_plain(album);
- tuple_set_str(tuple, FIELD_ALBUM, NULL, string_value);
- g_free(string_value);
- tuple_set_int(tuple, FIELD_TRACK_NUMBER, NULL, track);
- item = q_put(tuple, t, len);
-
- tuple_unref(tuple);
-
- if (item != NULL)
- AUDDBG ("a[%d]=%s t[%d]=%s l[%d]=%d i[%d]=%d b[%d]=%s\n", i,
- I_ARTIST (item), i, I_TITLE (item), i, I_LEN (item), i,
- I_TIME (item), i, I_ALBUM (item));
- }
-
- g_free(artist);
- g_free(title);
- g_free(album);
- i++;
- }
- g_strfreev(entry);
- }
- g_strfreev(values);
- g_free(cache);
- AUDDBG("Done loading cache.\n");
-}
-
-static void dump_queue(void)
-{
- FILE *fd;
- item_t *item;
-
- /*AUDDBG("Entering dump_queue();");*/
-
- gchar * home;
- if (!(home = getenv("HOME")))
- {
- AUDDBG("No HOME directory found. Cannot dump queue.\n");
- return;
- }
-
- gchar * path = g_strconcat (aud_get_path (AUD_PATH_USER_DIR), "/scrobblerqueue.txt", NULL);
-
- if (! (fd = fopen (path, "w")))
- {
- AUDDBG("Failure opening %s\n", path);
- g_free (path);
- return;
- }
-
- AUDDBG("Opening %s\n", path);
- g_free (path);
-
- q_peekall(1);
-
- /*
- * The sixth field used to be "L" for tracks which were valid submissions,
- * and "S" for tracks which were still playing, and shouldn't be submitted
- * yet. We only store valid submissions in the queue, now, but the "L" value
- * is left in-place for backwards-compatibility reasons. It should probably
- * be removed at some point.
- */
- while ((item = q_peekall(0))) {
- fprintf(fd, "%s\t%s\t%s\t%d\t%d\t%s\t%d\n",
- I_ARTIST(item),
- I_ALBUM(item),
- I_TITLE(item),
- item->track,
- I_LEN(item),
- "L",
- I_TIME(item));
- }
-
- fclose(fd);
-}
-
-/* This was made public */
-
-void sc_cleaner(void)
-{
- if(sc_submit_url != NULL)
- free(sc_submit_url);
- if(sc_username != NULL)
- free(sc_username);
- if(sc_password != NULL)
- free(sc_password);
- if(sc_challenge_hash != NULL)
- free(sc_challenge_hash);
- if(sc_srv_res != NULL)
- free(sc_srv_res);
- if(sc_major_error != NULL)
- free(sc_major_error);
- dump_queue();
- q_free();
- AUDDBG("scrobbler shutting down\n");
-}
-
-static void sc_checkhandshake(void)
-{
- int wait;
-
- if (!sc_username || !sc_password)
- return;
-
- if (sc_hs_status)
- return;
- if (sc_hs_timeout < time(NULL))
- {
- sc_handshake();
-
- if(sc_hs_errors)
- {
- if(sc_hs_errors < 5)
- /* Retry after 60 seconds */
- wait = 60;
- else
- wait = /* sc_submit_interval + */
- ( ((sc_hs_errors - 5) < 7) ?
- (60 << (sc_hs_errors-5)) :
- 7200 );
- sc_hs_timeout = time(NULL) + wait;
- AUDDBG("Error while handshaking. Retrying "
- "after %d seconds.\n", wait);
- }
- }
-}
-
-/**** Public *****/
-
-/* Called at session startup*/
-
-void sc_init(char *uname, char *pwd, char *url)
-{
- sc_hs_status = sc_hs_timeout = sc_hs_errors = sc_submit_timeout =
- sc_srv_res_size = sc_giveup = sc_major_error_present =
- sc_bad_users = sc_sb_errors = 0;
- sc_submit_interval = 1;
-
- sc_submit_url = sc_username = sc_password = sc_srv_res =
- sc_challenge_hash = sc_major_error = NULL;
- sc_username = strdup(uname);
- sc_password = strdup(pwd);
- if (url)
- sc_hs_url = strdup(url);
- else
- sc_hs_url = strdup(LASTFM_HS_URL);
- read_cache();
- AUDDBG("scrobbler starting up\n");
-}
-
-void sc_addentry(pthread_mutex_t *mutex, Tuple *tuple, int len, bool_t is_http_source)
-{
- pthread_mutex_lock(mutex);
-
- sc_submit_np(tuple, len);
- set_np(tuple, len, is_http_source);
-
- /*
- * This will help make sure the queue will be saved on a nasty
- * segfault...
- */
- dump_queue();
-
- pthread_mutex_unlock(mutex);
-}
-
-/* Call periodically from the plugin */
-int sc_idle(pthread_mutex_t *mutex)
-{
- sc_checkhandshake();
- if (sc_hs_status)
- sc_handlequeue(mutex);
-
- return sc_giveup;
-}

audacious-plugins-3.3.4.tar.bz2/src/scrobbler/scrobbler.h Deleted

audacious-plugins-3.3.4.tar.bz2/src/scrobbler/settings.h Deleted

audacious-plugins-3.3.4.tar.bz2/src/sid/xmms-sid-logo.xpm Deleted

@@ -1,188 +0,0 @@
-/* XPM */
-static char * xmms_sid_logo_xpm[] = {
-"249 120 65 1",
-" 	c None",
-".	c #0B0A0B",
-"+	c #B9A962",
-"@	c #517764",
-"#	c #32301B",
-"$	c #3F6957",
-"%	c #3A5E4D",
-"&	c #305243",
-"*	c #B9C0C1",
-"=	c #2D433A",
-"-	c #978A59",
-";	c #222523",
-">	c #CBD1D1",
-",	c #6D764E",
-"'	c #4E5D3D",
-")	c #4B4629",
-"!	c #586845",
-"~	c #747762",
-"{	c #151615",
-"]	c #465131",
-"^	c #898D64",
-"/	c #D7DEDE",
-"(	c #3E4028",
-"_	c #9A9A92",
-":	c #2E3722",
-"<	c #404A4C",
-"[	c #868276",
-"}	c #363F41",
-"|	c #4F6B5B",
-"1	c #4B5E55",
-"2	c #575233",
-"3	c #E2EAEB",
-"4	c #3F464A",
-"5	c #3A3821",
-"6	c #7A8684",
-"7	c #666A52",
-"8	c #382818",
-"9	c #535352",
-"0	c #6A6053",
-"a	c #494848",
-"b	c #798282",
-"c	c #37393C",
-"d	c #A09867",
-"e	c #424146",
-"f	c #1F1D1C",
-"g	c #70777D",
-"h	c #858F8C",
-"i	c #2F3133",
-"j	c #817D4F",
-"k	c #2B2824",
-"l	c #FBFDFD",
-"m	c #B59D50",
-"n	c #756C60",
-"o	c #3B3F42",
-"p	c #635E3B",
-"q	c #A8ADA9",
-"r	c #5A5E5F",
-"s	c #7B7C81",
-"t	c #31373A",
-"u	c #6F6A43",
-"v	c #455150",
-"w	c #3C414B",
-"x	c #656B6F",
-"y	c #181B18",
-"z	c #101010",
-"$%%%%%%%,j,!j^,7j^u%&&v!---j---j,]&v%&&7jp]&&&&%'7jp&&'u----p]&&&&&=&=&]7~0<&v&<=<]r,j,r]v&vvvjdmmmmmmmmd-'',-~!||$1,^[|%%$$$@6@||~dm+mmmmm+mm-'%!jd7%%1![d,1%$|~^d,%%%![d,$%%1,d[!%%|j^[!$$|,d^,|@$@^d,!|$@@ddu1$@@@@$$$$@,_^@@$$@jdd'jd-7jd-7jdj!jdj7jd",
-"%$%$&%%$bd,],du'jd]}&&&u------m-u(=&&=<7^!&&&&&&&,dp=&=p-m--'==%%%&&&&=&'u-['$%|1|&('j-j<1@|1'~mm-m-m--mm-)],d0(=&&%7+^|$|@@1$$%%!~+mmmmmm+++mj(<%^q,|%%|^d,1|$@^dd,v$@@^dp%1%%,m-'%&$bm^|%%@^qd'&%$@-d,%%$$6^d!$$@@$$$$@@$@d-@@$$%,+-]~m-!dd-'bm~)bd,'~^",
-"$@@$&$$$@^7!^dp]j-2=&&%,d--m----j]%%%%&--]=%$%&&]7^p&&&]jm-j'&&==&&<&&===]0-,]<&v%%<=]u^^7==vv!jmmmmmmmmmj]'jdu'&%%@,dj'$%&%%%%%$@,+mmm+mmmdmm^!|7^m71@h@jm!&=%$,d+6'$$@^q!%$@@^*-p|$$jdj%%$|jdd,@$%@^d,!$$$,dd,@@$%$@@@@$$j+-'%$$@6d-],d-p~ddp,d-p^+,]j-",
-"$$%%@@$%@d^7^d!'jd']&%!um---m---j]&&&'@d!&&&=====!d'%&='ummp]&&%%%==&&&===]p-~}<%=:=<]p,d^'<%v]pj-mmmmmmm,((7dp%$%%%,d^&&&&%%$1%&]7mmmmmmmmm+m-']@q+'&%@,^d!%$@@6qmj|$&'^dp&%%$d+d!@%%bm[]%$%,md6@@$@^+,$$$@^q+!$$$$$@@@@|,_+d@@@@@6+d'j+-ujm-'jdj,~d~!j^",
-"$@$$$$$|,^!]jd7'jd,%%%%,mmm--mm-j'%%1~+j!%&%%$$|@j^]&&$!,--2)%&&v%v%1%&&1%9]u-b1v&%|g@']7^d71<<]pjmmmmmm-up,[d7]%$,~__d@6@6@|%%1|!,dmmmmm++md+j'!^_^!'%&!^d7|@$!j_^b1||@^d@!@@~^d,%%@,^h~|$@@ddj,%%%b,j|]%$@^^jx$$@@6@$%%|s^^jp$$%$,_j2~m^p~m-pjmj'j+[]j^",
-"@$$$$$@@,^u%^d,@bb!7&vpuujujujju7r!11g799v%%%v%&]!,2'11'2n79<1=<&1|''r1x|11v9'9v11@g9v<<aa99v&v9)22]p22))(v<'9e<vv%'|1'x|r<w4a4ew=4v(5))55::::tcwoe2v1v<voi:tt:==((}::i::;}wc:iky#(:tti;iiii:;;;;;ik:;ikii:i;;;it===ii;i:i;;ffiki:k;yf:0d-!~dj'~m-pjdj],^",
-"$%$%%@@$,^u]^^p]=:}ow<<c5()5(555oocwc}w444ew4wct}ocwo}}4=}:tecc4}}to}tcwcccotttt}4cctcoo5ci5}}=:to5:::5c}ctttt}=}cct:ttcittiitiito4}cccccct}tc}tcooecccic4}=tti}:}i:=ttt}::tiiitc}ecciii:=t}tii:ccct=ti}t}}=i;ccctcii;t=4=}tiitikcc:ii}u+d9jm[p6d-'jd['j^",
-"%%$$$@$%,^u'jdp]<4cto44vaeaae44waoiit4v<ww}ewew}<ci}}(4=}=}wve44oiitc}ww}cta<<oo4ti}w4weccooctct;;t}oo=ticvv<<<i;ic}}tc=tt<ww44;;tc44cwci<v<v<iyi}oocoiie9vv9w;;49t}t}ii99vv<iyktt}wot;<vvvv};;:t}cct;ivvae4;yitcttt;;4vv<}=;;:i;;i;;kaxdd'bd-]jm-@^mj!~^",
-"@g@@%%%%j^,!-d2)=4t{z{f;;;;;i<9vvef.zy;y;{y;}awa<;..zyyyyy;iv<<4ez..yy{zzz;o<w<9i.z{{{{{{{tveociz..z{yy{.y}444=;..z{{{z.zi<4wwi{.zyikz{.{e<=wt;..zzzzz..kwewck{z{zzzz{.zicict;zzzzzzz..;}owtk{z.zy;zz.zktcciy{zzzz....y;ii;y{..yhv...{kpdd'jd^!^dj'j_j!j[",
-"$1%%1$|@j^u'-d7v};;{zyyyfyfz{kii;yfz;;;;;;yy;ikiyy;y;iitct{y;;;f{yit4<woac{f;;:tz;kta99av#;k;ff{zw<<v9v91;zfyfy.{9999rrrvzfyf{z.t1rsbxrgvz{{zzz{rggxxr9xiz{zz{.{9rxrr99x{zzz...ixrrxxr1r.zzzz.zxg@|gxrxr{{{yz.ixr1xggx9{.zz..zs>/*b6bb95dd'jd^',d-!^d^7,[",
-"$$$|$|@@,d!2^d!14w/l333//3q9yzz..gll3333ll6=.{z.{>ll3l33l3ryzzz.v3l3lll3l*;yz{y;63lllllll_{y{{{;*llllllll<z{{{zv>llllllll.y{{yys3lllllll>.yyyyi_llllllllg.ffyytqllllllllt{;;;y|3llllllll;yfffiqllllllll>zy;;ix3llllllllg{;;yv*llllllll/9dd!jdj',dj],d^!,-",
-"||@@!%%$,^!'^^||<hllllllllh!4yi;y>llllllll'1y;;{wllllllll3]c;;;z_llllllll>wyk;ii/llllllll_zfk;;c3llllllllwykk;{g3llllllll.k;;;{qllllllll/.iik;;>llllllllh{;iky=/llllllll4y;k;{blllllllllt;kkiw>llllllll3;i;;tv3llllllll*{i;;v_3lllllllls[-!,d^!jd-]jd-pu[",
-"$$1%$|%%,^,@^^)=&/llllllllr;;fky<llllllll3z;{;;{6llllllll/.y;kk{*llllllll,.fk;;y3llllllllrz;8;;4lllllllll;y;iiz6lllllllll.ikii{qllllllll*.iii;;>llllllllxyti;yt3lllllllle;itkzv>l33lllllikiki{hllllllll/iti;y.>llllllllqyii;.:3lllllllls-^'!+^',^^!j^^!,^",
-"$$$$$@$@~^!]6jv$%*llllllllz.{yiyv3lllllll/.z{;i;6llllllll*.{fi;{*lllllllli.yi;ii3llllllllf.;kky<llllllll3zyikk.hllllllll/.;iik{qllllllll_.ikk;y*lllllllliyikiyiqlllllllly;iikz=>l33>>3l3yiii;.xllllllllq{kk;z]lllllllllxyi;yzv3lllllll3<jj'!-j]!d-'!-j]u[",
-"@@@@$$$@,^!'^^!|&1/llllll3{.yy;y=>lllllll>.zyyyzgllllllll_.{{f;.qllllllll;.y;;yi3llllllllzzfiizvllllllll3.{;;;.6llllllll>.;;;;{_llllllllh.k;;y;*llllllll;;;;kyyg3llllll*;i;i;fkqlllll/3/{;kk;.hllllllllqz;kk.x3llllllllg{;f;zv/lllllllgk7~!,^-',-j',dj]~j",
-"1%$%%%%$,^@,^^r11v>l3l3ll3{.zy;;k_lllllll*.{{yy{xllllllllq.{{;yzqllllllll;.yy;{;lllllllll{zffyzvllllllll3.{y;y._llllllll>.y;;yzqllllllllxzyfff;>llllllllty;;;;y7lllllllqy;;;y{zhlllllll3ff;;;._llllllll*z;;;.;>llllllll6{;y{.]/lllllllr}v']'j-2'-^2,-^]jj",
-"$@@@$@$@b^'','5ttv>33333/qfy;yyy{h///////n..z{{yv*//////><.y{yyzh///////qyy;;;;=*/>>/>/>,zfkttir*>>>>>>q,itc}tib*qqqqqq69;tiii;6q__qqqh9c}wtciwhqq*q__h!ktttiitrh_____7t;iiwcit,h^h^__69itittig____q__g<ictct=hq_h^_hh1ttww4or~^__qq_6v4a]],jj)'jj5'^j(!j",
-"@$$@@@@$j^p%g6hhq_66hbs[6h_hh_qq_hhh[6[^6_q*qqqq_6b6ss~~g6hqq_q_bggg7~~gb_qqqq_6xx~~~7xg6_qqqq_hg~sn~s~gh_qqqqq_[6hh^[[6qq****qqh[s[~7b_qqqqqq_6g77x~gbh__q_q_hbg0rrrrg6hh666bgrrv9<4wvrrgg@x1v44}4www4<1rx|r1=}(4ec449x|rrrr9veooc}ov91rrv7-j]!-j],jj),j",
-"$$$$$$$%@^!|&4=&=}4}w}}}4t=w<wt=wwttiiitttititiiitkitickiit;ttiy;;f;k;;f;yyy;y;;;;fy;k;;k;f;;;;;;;k;fk;;;;;y;;;f;;kfk;;fy;y;;;;k;iikiikiii;ittiittt}i;;i;;i;;;tiiiktci;k;iiiittiitiittctiikiikioitit}tciccitcwe<cceccewccwww4eaw44<<cecwwee2--]u--'u-j27j",
-"$$%$$%%$,j11&w<vv<wvvvvvvrvvvvv<v<a<v<vv<<ww<<<vvvwea4eew<4<w4w4wwww<4<4w44w4<<<9a<w<4ww4w444vv<<aaav<<<<w4<4<<va9vaaavvvv9rr99rrvv91911v919vvv9v1vvv1|v1%vv9ra1r1rr1r1rv1<v9vvv9vvvv1vvvv9vrr9v991r9999rr119r1v9v9arrvvvvvv9<vv<<<v99<eew})jj(],-)'--)pj",
-"@@@h@@@$@d!%<=<ww4w4ww4v4=4<v4444eee4wvvv4v<<ww4w4wwoowecwwwt}t}tw<ecwccwtww<4wcecw}}eaeaewww}wwaeceaowww<w<<4w<wwvwwwww<v<w444<<444<4w4v4wa4wvvawwa4w4<w4v<w4ww4<4w444<44<<44w44}v4<vv44<44<w4v<<<<<<vw44<4w444ww<eww4<<vea4ea<v<<wwwewww42j-)pjj]pjj2p~",
-"@$$@$%%$@^11&ww<444<ww<ww<<<<4<<w<a<<444444<<wwweoww4wccww}w}t}wwwccwcc4w<wweeweo4wc44wwww4wwwwwweaew44<44aaw4<a<wava<44<4<9<4<<<4vv44<<<a44a9<a<<a444<4<4w<<4<<<ww4www<v<<<4<4e4a<vv<<4v44<<4w44<aa444w<aa9wa<<<a<<4w<4<4w444wwwww<v4w}}}t)u-]]jj5)jj5pj",
-"$$$$%&$@6^'&v&www<<<aav<w<<<4<w4wwwe<<v4&<<44w4wa<4w4wowwwww}tw}c}w4w}tcwwwwwecoec}cweccwwwcww4wweeeee<eea4<4a<aaw9aa4<4<wwwww44<<4v<<a<<4w4wwwawwaa<vww44va<weav<<<<4ww4<wweaaaaaaww4<w4<vva<a4<wwav<vaeeeee4e<444a44<<w<<<444<44w4w4w4}co)uj)]j-]pj-)'j",
-"$$@@@@@@,61&<www4<4<wwww4<w<4w444wwvwwwww44<wwww4c}ww}cowct}wwcw}}t}ccc}}c}wceeocwececwwccwwww444waawwww44ww4<4wa<ww4aa4aa44vv<<4a<44w<4w4ww4a<aww444<4wwww<a4<44ew}ww44ewe<e4wa4waww44www44v<e4<9v<4ww4aaee44<av<v44w44<4v<<4v9awaeww4wwoc)uj)]jjp7j-22~",
-"$@$$@$$%$j!1%v<444<v4aa<ww<w<44<<awv4w<v44wwww<ww44}w4wwwwwwcwctcw}tcwwcwwwoooceoweeeoewcw44<ee<4ww44wwwwwwaaawa9vv<<wwaa<<<4wwww4w<4<wv444<<<aww<ww4e4v<vwcww4eoccw}cccw<e<weweeweewe<<444<4aaweaeewa44ewew4<<ww4w444<49944<44<wwwew<4}4wc)j-2p,j2p~j)pn",
-"$@$$$$&$,^v&<4ww44<<4av<<<aw494w4a4=w<44w4ewwowww=4w}wwccwwtiwwcc}ctccwwcw}ceeccccwccwccwwcowcw444wwwww44wa4waweww4<<wwvv<<44w444ww44www4444wwww<aewa<4aww4wwaewewwww4wwee49a4w4we<aaa44wwww4wav4aaa<4ewa4ew444ww444<4w4<4wew4aw}ww<vewwewe)0jpp,^()u-)2~",
-"@$$$$$%$,^'v<4w4www4<wav<<awwweaaaa44<<vw4<4www}w}}eowoecocwwcwwcc}w4ecccwcctoowccoott}}w}cw4ewwvwoee4wwwwweaaewwwww<<4www4w444<<44<<4awwwewwwewawea4aw4w44w44woeowwwweeccoww4eccwewwwa<wwwcww44<vwew<wweew4www4<4wwww<<<w<v4www4<w}4wwwwao20j)2uj]2u-52u",
-"$%%$%$$$@^1%<w4a4aae9w<<4wwae4444wwww44wew4oocetctcecccccweeotc}ccccwccwecotcoocwcccicccwoooeotoowcww4ww4w44w4aeww44www<4<w44ww<ww444awe4wee<aewe4ee44www<w}w4ccecccccow4}owwewwwweww4www<4wwww<wwowwwwe4<4awcceee<ww44<w444ww44w4<w4e=4<4c)uj))ujppuj)2n",
-"$%$@$%$$@j11<vvaa<4ww<a<<4<994<v<ww4a<a44wccowoccaewot}ccwcccceo}cwwcwccccw}coo}ooowcw}w}itcowocow}}}w44<4a4eowawawwww<wwvw4w4<<wwwwwwwe4eweewewa<ewewwwc4wcttwoooctcctcittcwoewww<wwwwwwaw}www<ewwwccc}www<4wcww}w4www4wwwwww4<ww44oe<w=wo)0j22jj2]uj22u",
-"$$@$$$$$,61%&4ww<wwww<<w4v444e44weewww<wwww}occoeccccccccotcc}cctcccwwwcccxxx9ctocrxxxcaxxr|r4wwc<rxxxxrcwxxrxxwwwwwxggxxrww<xxxxxrrr4wwe444warxxxgxxxvcwxxxvcwxxrxrxxxr4ct}ww<wwwwww44www4w<w44weewww444w44wwewww<44<4ewew<<ewwa<aweew44w()uj2]uj]2j-p2u",
-"$$$$%$%&|,'v&4<44ww4w<ww<va94444<wwcw4eww}}cwcccoewctco}oewwowcewwooo44w4ovg6gwitagbhr}rgsxgg9}4orssgb6riagggggrtwwaggggsrwwgggssggggxawwwwwwgggssbssggwcxgx9teggggxgggsg9t}}t444w4awwwwwwwwwowo}wwwwwec}weww4wwcwwwwww4<aw444aww<a4wweeweo)pj)(pj)2uj2)u",
-"$$$$$$@@,b1&&w44w44<wwwwwwa4a4eowwwe<w}wwwow}}ccccccco}c}c}ccw}ttccccwcccc=x6grtixghhwirgggggxt}i1ggxs6rw9sbssggwiirggsbgrt<gsbgxrxh6s9wwwwwvgssgxxx6bsv}gbb9icss[[6bs6s~g4}}}eowewwwew4we}wwwow4a<ww4w}owwee4ecwwww44w4w<w4ww4v<<v4w4}ww}5)pj))uj])p-p2u",
-"%%$$$%$$@j|1&<ww<<44<waa4<weaaew4wcwwct4wwweoawoowwtccot}}occccwccwww4}ccccv6sg}wgs6acc9ssxs6bewcgsbgbbrtvssggsgecwxshghbxtrsbs<4wassgvwowwc9bs6eww<gbsvtgbbrcwsh69aavrsgsvcceeewecwoow}oc}ctcceeeawwewco4wwe4wcww}w44www4ww<wwww}owooc}44o)0jp5uj2)uj2ep",
-"$$$%%&%%!,v&w&wwww4awa<w<9r94eww<44w4<4wwoo(ecctcctocct}}}teccco}c}wceowecccx6grxs6xwcc9s6rx6gvcvbbxxssrta6bsrgs9t4gbsr6sgtrsss9wwwwawwcoccw96bb9wwc}wwwtggbxcvbssaeaeag6s9toowccoecoowwwoo}weewcccweocwe4owwww}www}}cwwwwww4e4w44wwwwv<44c5pj2)uj2'uj))p",
-"$$$@$$$$@,]&44w=wwv<aw<4<<<www4www4}=t}<weoow4oowwcww}coctcww}ic}ccwwoeewwciessgs[bwocc9g6xrs6xcrssrxgsrt9hssa6gri9ssxrbsgt9hbsgxxxrrawcwctt4bsggxxrr9wctgbg|i9ssbeceeegbs9ceo}}ccoceow}ooctcwew}cc4}coeeeeeawww4wcwwww4a4wwwwww4aaeaav4w}}(pu2)pj)2p-220",
-"$$$$$$%$,~9%w44www<wwwaw44444aaowcw4}}}woeccecceccowctcicceccct}oooot}coccettx6sggxwcocrsbxe6srwgsscxbsrt9gggwgsgwxss99gsxcwg6sssggggxwcwwcwwghsggggggx4txssrca6ssoctowg6sxotcwow}4oo}wcowecwwwww44ww44e444woow4ww<ww=wwwwww<4(4<44o44}w=4()0u25pj22p-2(p",
-"$$%&%%$$,,]v==w4ww<ww4aww4<<<4awwwcwcwooooecoetooco}owceocccoccccecoowccoooivgb6sbb9cct9sbxwx[brggxcxs6rw<sbscrsg9xbgwxbsxicwrxgsss6sg99xxg9wwrxggbssgsrixbsxw9ssswcoeenbsrccctcec=}otooccccococcwecceotcowoo}w4}w<4444}cwcwew4<4o4ww444www(2j2)pj2(pj))p",
-"$@$$@@@$,~v&&<<=<4<44www<4wwww}}ww4w4}oooeewoc}tcctcccccc}}cceccccccc}ciceccxgbxxggxctcrggxc9sgxgsrcxsb9irgggcasgxgsxc9ggxcwwaaw<49gbsxrsgs9c4avawa<xssxtggbrt<gsscccicggs9ccctco}occctceeccow4wwwoooectowwcco}we4woww44wcooeee4owww4<4awoe5pn2)pj2)pj2ep",
-"@&%&%%&&!j&<&wwwwwvwwww4www}ttc}}ttw}tccce4o4oecocccccotct=4}ctc}ccwwoeecci9gss4v6h6r}t9gggcwsbs6sacgs6rt<bbh<4xggss9txssxcvgggcccwxgbx1gggv9ggxwcwwrsbxtgghxiv6bsciitrgsb4cccoeeoccweocccecc}=}}}cccccoow}o4w}}cectow<<4eweaeowoewow<<aoecepj)52n2(pjp5p",
-"@$%$$$$$@^[1w<ww<4wwaa<ww4<44<wccw4otcc}c}tooe4ecowccccittcicttccecccocecotggbxwtxggxci9ggxcwxgssgccgbbxcvbbxwcrggssairssxi<sgsrrrxxbgrwwwww<gggrr9rgssxtgggxt4sgxxxgxggbgictotooc}tcceccccttcc}ciccoccccwo4ww}4}wwaowcoavaeeeowo4wwa44weee52n2)pj2]un2(p",
-",^@$$$$%&!jj4w4}tww<<wwwwwwwwwww}cccc}t}cttcoccoccocccwcc=ccccctteciccccc}1g66wttvsggrt9sgxcc96ssrwwg6brtvs6gwtvsgsxwixgsxiwssggxxgg6swcwwwcwssggsgsshs9tgsbr}vhhggxggsg6xie4ec}}ooccccccc}w}}ccccooow}}cocico4=w4}wwwc4ccecwa9<w444www4oo55pnp)pn2k]n2(p",
-"$@@$&&&&%&'rv44w44wwwww4ww<www}wc}}owowtcwooc}ccoccwccccc}cctcc}wcccccc}cwxggrtcttgbsswrs6xcwasshvttgg6rivg6swtwg669twrshxccvggs6hbsg9wttcitc<xsss6[[grcwghhxtvbgbshh6sg0eitti}ccc}cceeec}c}tccooecoct}cw4aoo4wo}w4wo<<eoawo}ov<4}<4}ww<a9e820252u2(2np:'",
-"%',^%&&%$%%%www4ww<<44w4444w4w}wtc}o}w}=c}}tc}ccwttwt}ccccctwccccwcccwcw}wtttwcctwwwwwwwwwwciwwe4wwww44wwtwwawwwtwwwwiwwwwcwcww<wwewwccccccctweaweeaw44}t<<4www44aeaeewaawcc}}}cticccecccoocc}ccccicccooooe5ceoowe4(oooeocoowoavo<<w}4ea449e)u2)2jp('jp#]",
-"%$%,@@%$%%1%=w<<<4ww44ww}w44wwwwww<}}}woowcc}w}ccwtccwcccccttcccwcwcco}cctcwcwwcwwe4wwcwwwwwcww<wcwtwwwwwwwwwtttwwwwwwwwwwccccwwwwwwcitcciccccwcwwwwwcctttwtwitwowececcctttccccc}}ccccwcittcccccowwcoccc}}}}eocce4c=cocoo}}44}4}}}<www4ww<45)u252u2]2up52",
-"%$%$,j%&&&&&wwww44w}=wwwwtw}wcw4}}}cw}o}wwcwwowoc}itcccwwt}wwwwcccwwww}}ttwcwcwttcwcwwwcwcccwwwwctttcwwwccicwcwcwicccwwccttttccccccccccctcctcctcccccwww}}twctccwccccccitccccwowtcwwcceoeeececcccwoocoeco}}}ocowwo4owweeeoccw}wwwww<44444w4}(2up52up)2jp]0",
-"%%&&%!,$&&%&<vwwww4www444ww4<4oww4<w}ocoocceow<cewweewcewwwcccocccccccctwwiccccccwwcctccccccitttttwcicicccwwwcccwwcccitcttwcciciicccctctccttctwcwcw}ccccccwwwcccitcccicioocw}t49v<cccicciiicitccccco5oe4occc(oo}oco}o}cc4wwcccoww<v<4=}owee520p52n25],p52",
-"&&%&&%,,%&&%titw4w=}ww44wwt}4oo4cw<}}cioeooiikiiccewtitwc}}tticcccc4vv4cttiwcwccwccwctticcccccwtwtttiwewccciwctiicccccctwttticccccccccctcwcwccccwwcc}tcwcwwcwtcwccctticciccowwxbhhhbr<tccccecct}eeec5k;;;;itee44e}owew}}=w4wwwc4r1vvv<<4oea()u252uu(2~25]",
-"%&%%%%'7,1&&;{y;t4vwww4w4444<eewwwcwoowee#{y{{{{ffktcwctcctwwwcarshhhsxwwccccccccccwtwwceccicwctwtttwiwicccwcwwwceiicwwtttitccwiciiccttttcccccctttcttcwicccccocctcccccicccic}}gbgggshs4wwocce5o4}ck{{y{{{{{y;cct}owwooowc}}wwcwcw4=4<4wow=e520p52u2#2u05]",
-"@&&&&&&%u,&=yyyyyiwwwcwwwwwe<eooo}cwwee4k{{ffffffff;iwcccti}w}ws6gxgggg}cwttctcccwtcwcwwccciccctcccwiccccwcciwwwccciiicitttcctciccciiitctticcccicctcctiiwcwccotitctccctcccwcwwxgggggbhhrcccccttcwif{f;;ffffffkt}wo4we4oww}}}4=w}cw4weaeo}}}5)up52np#a,n5]",
-"*@&&&&&&!!s%i;f{yytw<<4<w}ooweewwwoowww;yf;;;;kfkfffkiw}ccww}r6hbgggggxwwccwwcwcctwc}wccwcccoewwcwicicwcwcccccccctcw9rr94citicccicw4<<wwtwccccctwwtwtitwcciccccccciitticiiitc<xggbbggxgx4occtccckyy;;yf;;f;f;;kt}}ccw<wwocwww}cw4994ccw}w}c)2n05)np(]pp5]",
-"*q%%%$&%%%u,t;fyf{;i<wwww}woocowwccc}<iy;;f;;f;ff;k;k;t}itccwxgxxgggggx4cctiiccttititcttcttccticccwcttccccttttttcaxxxxrxx9ccticierxxxrxx<twctitic}ttcccticccceoiccttctexxssbgg66gxgb@gxsx4ccit}i;ff;ffy;;f;;;f;icooooo}}}}wwwwweaa4w4wcooeeepup52u25]u05]",
-"q*$$$%%&&&vvif;;;ffiww4w4wwww4w4eow}oi;f;fyfff;f;ff;;kiwtwt<xgxx@ggxxbbgggggxxwcwwccccwcttcwcccwtccctiwiicwwccwtwxgbggssgxwcitccxgsgxxggxccccccccwcwcticcwcccccoo}wttivsgxgx@gxwt}1xggggg9cccco;ffffffffyyyyffy;cwwccocw}cwww4ww4w=}}v9wwwc8)p25202#(p,:)",
-"qq$%&&&&&&&&tk;;;ffkww4cww4}cc}ooccwaiy;;ff;;f;f;ff;;;iwc}tvgggggx%wtwxgxxxxgxaccttccwictctccwiotittccicicciiciiwggg4<agsxwccctcxggwtwxggctcttcccitcccwitccciitttc}ciitaxggxxx|<ccc<ggxgg1c}cctfffffff;;;y;;y;;;t}ooc}www}c}ccwwww4<w<vw}cc#)pp5)up5(uu(]",
-"*q]%&&&&&&%%i;ikf;f;icw}w444wwwooowww;ffffffkfffff;ff;;iwtwvgxxgx4cwt4rxrxxgxactwcccecctwttwwctcttwcweeaxxacirrr<gbxwwtxgxvtcweessgwkwshswcttcwctccctccictcccwocc}cttcctvgxrxgracwwt|gggsxwow}if;ff;;yy;;;;y;y;;i}cc}www}w4wewww=tw}w}}e4ec8)p05)up(]0j8)",
-"q^&'&&&&&&&&i;;;;;;;itw}}=}t}oowwwo4oy;ff;;f;{fffffff;;iwcwrgggg|wtwcvrxxxxgvwcccctccwccww}cttc}}ttwcccess9itggr<bgxtttrbgvtwcccrsxxvrx60tittttcciccitttttcciotticttcccc4r|xxgr4cwccrxxg6xw}cck{f;;yyyyy;;;y;;;;;4ctc}c}wwwcwc}w}}w}wwwwwwe5)pp5)up(]pu5)",
-"^=]@@&=&&&&=i;;;;;;;;}4w}w=}w}c}wctct{f;ffffff;fff;f;f;ktw<x6@xxrtwc}w1gxxrrwcwcwccccccccttctttt}ccccccwssgiwssvvbgrtitrb6vcccic9xsggssgattwtttcccttitccecccccctoeectttcrxxxggx4wcwtxx@ggxwc}ckf;yyffyyyyf;yy;f;kcoewcccccowww}}ciwccww}ccc8)pp)2up:)u-()",
-"v=gh$::&&&%&t;i;ki;;itww4w=ww4}ww44}cf;;;ff;ff;fff;f;fkt}tw|ggrxr}cwtvxgxgxxrwctctww}tcctttccttt}ttwccctrggi9gxwwggritivbbvcccccxggw<<ggxctccctitcttiticciccoccitceiicw1sgxgxgx4wctwxxggb1wwocif;yf;fyf;fyfff;y;i}tccwwwow}ow}w4wccwwo}w}tc#5225)pp:(p7#)",
-"]@$&==&&&%&&t;;i;k;;;}ww}woo44}4}}<wc;ffff;f;;fy;ffff;;t}w4vgxgxxwtww4|gxxxgs9ctcccwciitttccwcc}twcccwww<ss<xsxi<sgxtik|gbaiicwwggrccirsswctticciiitticecccwcwcoootttirgbgggggxwitc9gggbs9wccciyf;;;fyyyfy;fff;icwto44w<tcctc}}ecweeewcwcwa8)pp))up#5pu:)",
-"@h&=&&&&&=&&;;iiik;;tw}twwww4w}}}wwwoif;;fffffffffffk;;ttwwrbgxggrctiwxggxxxgg9twwiiccciiwcwcccccctiiiictgsrrgriwssg9w9xgbwc99twgggwitrggeciiiiccitctttiicccicicociiikvxbbgggbgxrrs6bggg|wiitcifffyyy;yy;fy;;;fk1<cc}oweowo}}}cwccewwwceecwi)p2()uu5(pn5)",
-"@%&$&&&==&&1tfikk;f;wwwww}}}c}w}}4}w}i;ffk;ffffff;;;f;twtttwrggggsgrrxgbgggb6gvitttcccccccicccctcwcciwcwtxbxssacwxgggxxgsgwwxsawxgsxrxgsgoitttttccitccccccccccooocicctwttt}}wvssssggggbb1wcccctkfffy;f;yy;;fy;;}aceoo}o}w}w44}44wccctcwwwwe55pp5)pp()pn()",
-"$&&==&=$@$$gtii;k;;icww44w4wwww}w=wowct;;;;;;;;f;ff;;;wtw}twvbgggggssggvwtw}tt}twwticecciicccccitciccctctrhbshactcxssssxxwcashawwxgbgggn9citcccciiiitcccictitwciititccww}t}tt}rxsgxggggrwtcicccc;f;;yf;;ff;;ff;tooeccoo}w}t}}wccc}wwwwccwwee)p055pp:(pn5(",
-"==&&$@%$%t|_i;;k;;itweect}w4wcw}}ow}}w}k;;;;;;fff;k;;tttitt}wrgggxxgggr}twt}}wct}tccctctwwc}cccwccttcttitw9wewtctww<99wwwwcc9<titt4wecaectctiiiiiiiiiiiiccctictcccciiitttittiwxgxggggbr4tcccccttiyyy;fyfffy;;;i}tooccicccitcccc}4oo4}t}ttce85pu)ppp#(pu8(",
-"&:&&&$&&=&*3;f;;;iw4vweecwcw4wcw}<eo}w}i;ff;ff;;ff;ic<wwtww}t<1bggggxxxwitttitttciiiic}tt}twcctttittciitttwwccwctwcwwwwctittcwiiwtwcccccwtitiiiiicccccticc}tcc}cciicitiittittwxgggb6x9wttticocctti;y;f;;;ff;;twwctooccicwcccw}cwww}w}}w}wcci5pu()u0()pj()",
-"h===&===&ql>k;;kicewwoooe}wtwww}}cwwwwwwwi;;;;kf;tccwccwt}wwwtwvxbbgggrww4ttccccwcecw4cttcttwwticwwwwtwwtcwccwwtttctcwwitww4cwttttwcwiccccccccccccccictcctittwtiiccctitititttwvxgxxvwwcttiitccc}}ciif;ffyff;t4w}ceccecw}cwc44cctt}c}t}wcoeee52p85pp#(2u()",
-"_@&&%&&=h//_;itcaecwtcwoec}c}}=4<wwtcw}wciti;itiiitwttttttt}tttwtvrxxxvctwtwittccccco}tttttcttwtccccttittwtcccttictttttwttccwttttccccccwcctcttcciiiiicccitictctciiiiiictctttttttiiictttttcccctcicttikkiikkiwo}}}wwwwoccocwwwcwcwccc}cwweocc55pp))p05(pu:<",
-"h_&&%&=$>3qgww<www<9woecw}wwww}w4wcc}tww4wtww<v44w}twwttwtttwcwwwttiwtctcwtittc}coccicoowcwwitctiicwtitttccwccwcwwcwticciicccittccccociiccttcitccccciccccccctoccctiitiicwtittcictiitiiiccitewcctttticcwewawct}cwtwt}c}ccccic}}owee<4wcoeeocc5pp()pp:(2,5(",
-"qq]%%&=@/>_xcwwwww<9wwtc}www}}w}t}wcwc}wcwwwwwwwwtwwwttttt}twtcttttttitiicccccttcciiicccccitctttiiiccccwttctitccccctctttiiicccccctcciiitctiicititcccccccttttcccciiiciiiicittciiciititiiitiiiiiiwccccwctciccwoccccccccctcwecctcw}wwwwccccccct52p()p0#()u#(",
-">q&%%&&_/*_xccwtt}w=twwwwc}=t4}}}ccwwwwtcwtt}wwctwctwtwtttttwctwitcitiiitcctciitcttitcwccoitciciiictwttiicttitwccccictttiictccciitctittiwccecccciiciiiciititcccttttcccticiccwiciiciictciiicoccc}ciiciccwwccocweccccccec}ccottctccccwwctwwoct(2p)5p055pj((",
-">qwv&=$q>q_gtwwcwwwwttwtccowt}twwwccww4wccccwwcccwtw}}ttwtttttcctttictttiiitciiticcictcccccccitciciiictiicicttccccciciciciiiitciitttcicit}tcciciciccitccc}cticttccttitctiiiiiiiiicciciciiciciccttiicoccctcc}cowotccccct}}ccccc}}}ttw}}ccwwc#52p850u((2j((",
-">b=%&&6q*q_hcwwwctwww}w44ccc}icwcctctwcwcccccccct}c}t}ttwwtwcitciiccttcccctictcccciiiciicciicctccccciiccccccicciccciccctccccticcccccttiiccccoiciciiiiiiciciitcttcictiikiicciiiiicccccccececiciiicwceoccttoccccw}c}wtwccooowo}cccc}}}ccw}}ctk520552p552u5(",
-"hi%@=%hq*q__iwcwwcw}}weeeceewcew}cwwt}wcccwcwwwcwtwtt}twcciticcctcictwiikk;iiccccikiiikiiicciiitkkiiicccccikkiitccccittcwiitiiiccccticciiikkiiiciiikkikikiiiiiikikikiiiikkiiiciitiiiccici8iicttttiicicccceiccciciow}}ccwcccc}cc}ctcw}}ww}tti5p2852p##2u5(",
-"=<66&@bh__*qiwcwccctwaeewwccowwwww}ctt}cicwc}wwwttttictttctctwittwtttiie9rxr9ekii1r11rrxrccct41r9r9accciii4r1r4ctiiwctttiiiiixritiittiiw1r9rraiitwxrxrrrrrioiw9vr9r9wtiiwrrxr9rvtccicccccciiocciiticccccceccccowowctcccww}c}cowtcc}coo}}}}t#(p0552u58)u((",
-"16@&1_[[h**gtcwcw}}}c}cccwccew}}wwwwwtcwcwwwwctct}tctwtttcwiittccctwtirrxgxgxxvii1gsxxxxx4tt4gxggxxx<ccii9rrggwitcwttwttwickag4ictiitc<rxxggxx9ki4gxrxxxxxiccrxxxxxrriiirx0xxxxxwicctiiticcccctiicccceceoctc}occccctcwctc}cwcwe}wccccccccwct5)p552u552u)(",
-"6b==n-jjjrc<iwccwcwt}cwcw}}cwccwwwctwwwwoccwttwcwtctttwittcttwcttttctixxxv4rggxiixsxw4wv4ttirggr49xxriitrgxsbg4tcitcicwitiii|xiiiccicixssv9agsgii<ggaeeeaeii4xgx<axnxciwxxxrrxsx9kccwccccitcccoocottciccccccoccttwiiicicicowcccwtt}}}woowwc5)2p55pp5)2u((",
-"%==1jj02)<&v}}oeecwcw}4wct}cw4}}}}tcwccwowwt}}w}wwcceicttcwttciititccwgbrtctvr9tixsrtwwciktigsgtitghgiirggrrssviciiticwcttiv6<icccicctxgxkikgggit4gbicwiciii9ggwkiasgak<ggaciensxkicccccciitccocciicccecetcicicccwwct}cwccccw}c}}cwtccccwwti520)52p5#2n((",
-"&=p-j25:====tctcccwtwwwtww=w4tt4w}wwwwcccccitt}cccccwccwcwtitcittkictwgg4t4ccw;t;xgrrrxraii;rsgw}wxbrii<gri4gx<iiitkitccit;gxiitttikiirgg<w4xsxktvgxrrr|1wiiaggaccrsgwiagswiiixsgkcctccciiicwcicccccccccocicicccc}cciwctt}wwwwwctwc}wt}cwoo58)p552p##2u55",
-"=%-u55======wwcttt4}=w}c}t44=4ww}wwwwwwcwt}t=}tccwwwccicwcwtwccctttciwggxxrxxrciigsgxgssg<it}xgxxxbgw;ii4ti4gsvcccttcttctivbwiiitiiic;c0gxxxxg}iiv6gggs6x1iti9xgxrxg9ikasgiikingnkcciiiictcttctc}}cticittccciccttcc<reiccctcctttc}tcttc}wcti5)p#52p#:)u(5",
-"9du8(&$&==tttwwct}tc}}t}w=w}4}}t=}}wwwwcwcwtwwwwccw}twtcwcwttccciticicggbxxggxrkixr9ww4ssrfiwsgxxxbg<ttttitagsvicctiicctitgritttcicwckagggxrggw;iarrvt<xxxcitrxxrrgsrtk9sniccixsgiticoctctcttctc}ctc}oooccccwcttc}ccocccccttwwwtwcw}t}}cccc552p)(20(}2n(5",
-"~p(]='&&=&@xcwwwwwcwwwccw}t}}t=cwwwwwcwttwtttcwccwtttcctcciwwcccittcicsg9iiwggrkitictwtssxftxgrtiivgxiiciitwgsriwciitctii4xwiiittiiwicxgxtctxggtiiiiicivggc;axgeiiwxx4;<ggciiigg0kicciciccttttcit}t}cocctttiwctwttcicccccocctttt}t}ccc}cctii#2p5(2p5:2u)5",
-"p(======4nnvtcw4t}ccwww4wt}wwwwcwcccc}ctcw}}wwwwctccwwwtwwcttccwccttiwgxv;;ixgritaww;iigggiwgg9ii;9xxtitiiiwgs4iccwctcittrriiittiitwitxgriikrxxic4<wtii9sgwirssikicxgrkesgekiixgrktiiictitcttttitcti}ccocwitttccccooccccicwccct=t=}w}c}c}cc##2u552u5:20)(",
-"(===&:=$-u5e}=w}t}twc4wc}tt}wwwtccwwcwcctwww4ceoeccccctccttcticccicctcgsx<wrbb1k}rxrw4agsrkcgsx<w4g6gwt}tttwgsvitciicttt<g4ttccccitiitxgg4aaxgsic9xx9twrggcivsx9ww9ggvkwgn099rgg9ititittiiiccc}}tt}cttccittttccccccctcciiccticttt}ttciccttci8)p552p5:)p((",
-"=====:[+2:}=}wctwcwcw444w}ww=}t}44aeewtcwwcwwecowcctticctiicciiwcoctttvbbgxxgg4ii1bgxgxsgaccrggxrgbsritttitwbbvkcceccttirxcttttttttiiirbgxxg6[xiiwsgxrxgs9iiwssgxxgggwiixggggxgxcicitctt}tccttittctccitiiiiicccccittciccicwwwctt}ttwccttott##2p5:22(#)u5#",
-"=&==&^,(::==}cocwtwwwwc}cwwwwwww<wwwewwccwowcccccctwctcci}iwcciccccccitvrxrrrwiittvxrxr9eciiw9rrrxr9titttttwxxacicccccc4g<twticttittttcarrrr0acitt<1rxrrvwttiwvrvrvvtitcia9rr99wiitiittttiit}titctiic}tiititcticwcctcccicwttccwt}}}t}twccctt#)2552p#5)p(#",
-"&&='du5==&=4}ccttwwwwcttw}wcw}cww}}w}wwctccwcccww}cwwttc}tcccccciccccciicciic}tcttwtccccccitccciitccitcwttttcccieciicccxrcioitccc}twctctccitcecctttitctttiititiiititiiiiiiiitittikticciiiiiccccc}tcitttccticcctccwcctcccitttttct}}t}iiccc}ci#)p]22p5:2u(5",
-"==^^':===&===4}}tcccw}t}}w}cewwctc}ctc}ccwweccttcciict}wwcctccicicccttttttttttwctittitciciccittttttttttcwctitticicicciwrwttcictcc}itttiicciicctcociitwcticttttttkiiiiiiiiiiitttiitiiiiiicct}c}tiicttcttccciciitwcwccocctcccwccwctct}wwcctcti#)p5()p:#(0)5",
-"]^^]:=========}tcwewwwwwttcwcw}}wwt}=4wwcceoowc}ccctctitwccicccccttttittcttcctttcctttccccccttttittctccctttcttcccccccctitttctcc}ctiwttcttcccccticcccitcctctwtcttwtciiiiiccttttiiiiciitciiiicct}tcwtccctcttiicccittcccctictttc}ccttwtccwccccci5)p5#]05#)p55",
-"j0(:&=&=&=&v}}wwcwcccct}w}wv9v<=t4}w}ttwoeeccoc}cccttcitcwceccccttcttiiticttcttcwtictcccccttctitititttwitcwticcccctitciiititttcttcctitttccccicccctctttttctccwtittiicctiiiiiiiiiciccccc}coitcictiiiicccccctccccwiiiccccttt}}t}twtittcccctccti#(25#)p(:(p#5",
-"'===&&====g9ct<}4wcwcc}}wwww<4v<4w}}}w4cecoooccwtctctctctcccceoccttctcccwwcwwctwitccccccccwccwttcwcwtccwccccwccccwwwcwcwccwwwc}}ctcccwcciccccctttttttcttcctttcttctcttiitiiiiticitiiit}}ccicttcikiitccocittwci}ticiccitttt}titttciicttctitct##(2(()p5k)p(5",
-"==&==&==$^jacctttcewwwwwtwwwww<vvw}w}}}ccowooowcctttwwcticceccwiitictttwititttitt}cccccwctccwctcwwtttcwwttwwwccctcwcwccccwcccct}}=tcttcicocccctctittttwicwctwwttttcctiiicwitttciiitiiiccccocccecoctciiitctc}tc}tciccccwtttcitccwcwcctt}tittki(p55)p:#(0)5",
-"=======xdn)cc}tccewwwt4<w44w}w4wwcwcw}}aecw4}ccccitctcittcctcwcccccwcctiiicttitttccccitttiitwcww}wcccwccwcccccwwcccctwtc}cccctttttttt}ctcciciictcitctitttiiiiitticiiiiiiiiittittkiitiiiccecccccccccttwcctttittccccctitttttcccitctttcttttttik#)p5#)p:#)p(:",
-"=&%&=&^j)#:4t=wccocww}wwccccw<4w}wtcwcw4ocww}cccciicw}cciitwtiicccittcctttccttttttittcttcwccttt}ttcctceccccociccccccctcc}cwo}ctttt}=ittiiiicicoctccciiiiiiitttccciitciiiiwiiciittctccccicccctcctcctwccc}tttttttcccitctiittcctitcitcittttt}ti#)p5#)p(;(u)5",
-"&&&=@-,(===<}}}wowwww}}cww44w44wwwww<4w}}}wctccwwwwwttctwcwwccewccowwc}cc}tttt}=w}wcccwcwcwwwcwwctwwoowcwwcewcwwwccwwww}tctccttttw}tt}ctcicwccccccwcccttiitwwcwwcwitciciiccccccctcwccccceo}ctccccticcwctccwc}c}}ticctctctttttcccciccitctttci55p5#)u:#)u]#",
-"=:&jj](]====tt}tcc}ttttwtwtcctctcttcc=ttcttcwcctwcitccciittcciccccticcttiiitctttttccticwccticcitccccccccccwcicoicitctwtt}iiittttctccctcwiicctitctciiiitttiiiiiiiiiiiiiiiiiciiicittcctiticiitititiiitiiiitictiitiitiiiiiiiitiicctciicititiiti#(p(#)p5#)p)k",
-"&$dj]=&&&==}itiitiit}tiitiitcttcccwtiiiitttiiiik;kkkiikkikkkk;k;;;kk;;;ki;;;;;;;;;k;i;ii;kkikkkkk;ikkkk;kki;;k;;;;;k;k;;;kk;;;;;;;;;;;;;;f;;;;;;kf;fk;k;;;;fk;;;ik;;;kfk;fk;f;kk;;;;;;;ff;;k;;f;;y;;;;;;;;;;;;ff;ff;;i;;;;;;;ik;;kkk;;;f;;;k#(25#)2:;(2(#",
-",^]:=======;;;;;;y;y;f;;;;f;;;;;;;f;yy;y;;yfy{{f{yyyfff{{{{{{{{{{{{{{{{{{{{{{y{y{{z{zzz{{{{{{{{{{{y{y{{{y{yy{{{{{{yy{{yy{{{{{zz{{{z{{{{{{{{{{{{zf{{{{{{{fff{{{y{z{{{z{{{{{{f{{{{{{y{{{{yy{{{{{{zz{{{{{{{z{{{{{{z{{z{{{{{{f{z{y{{{{z.{z{{{y;;t)p(:)p5#5p)5",
-"u]=&&&=&&==;z{{zz{{{{zz{z{y{{zzzz{{zzzz{z{z{{{{{{{z{zzz{zz{.{{{{{{z{{{{{{{{{{zz{{{{z{{{{{{{z{{{{zz{{{{{y{{{{z{{{z{zzz{zz{{z{{{{{z{{{{z{{{{z{zz{zz{{{{z{{zz{{z{zz{z{{{z{zzzzzzzzz{{{{zzz{zzzzzzzzzz{zz{{{{zzzz{z{{{y{{yz{zzzz{{{{y{{f{y{zzz{;#52#k)p(#)2)#",
-"<=&====&=&&=yy{{yf;kk;kff{{z{zz{{;;k;;;;fz.zz..z{i;kkik;fzzzzzz.f;k;ff;;{zzzzzz{f;k;;;;f{z{zzzz{;kkk;f;f{z.zz.z{f;;;;;;f{zzzzzzz{;;ff8kffzzzzzzzfkfk;;ff{zzzzzzzf;;kkkf{zz{..z.{kkfkfkkf{{zz{.z{fkk;f;kff{{{{zz{;;;;fff{z{zzzzz{;fffff;zzzy;i(258)p(5)p)5",
-"=&&&==&=&&&=;{zz{fcikkiif{.z.zz.{iii#iiifzzz.z.zfiki8iicf..zz.zzkiikk8ik{...zz.zkiikkki;..zzzz.zk8ci8ikf..z.zz.{ki8i8k8fzzzzzz.{f8ffi888fzz{{..zkikkkcifz..z.z.{ik;kfkkfzz..zz.{iicceii8fzzzzz.{keciieck{z{{zz.{cic8ieif.zzzz.{fc5e5ceiy.z;:k(2(8)p:k(0)#",
-"===&=&====&%=;yz;a00n0n0ez.z...y4~n~n0n0e....z.fannn0000i...z..fan0nn~n0f......fnn00099ef.....zfnn0n0n0ef..z..zk9000n00af.zzz..fe0000009f..z.zzf9000009cyz..z..f9nr0009i.zz....f000u00098.zzz..;900n00098..zz.zf0000009ez.zz..fin000n~0#{;))k(p(5)25i(2)#",
-"=:;:====&&=&&=;zf9sn0n00cz.z..zye02092p2i...z..{e0r00009c.z....{e009p200f....zzfr99000p9f...{z.f00900009f.zzzzz89000000akzz.z..fe00009098..z{zzfe2990099fz.zz.zf9000009e{zzzzz.f0p200009i.z..z.820000009;.zz..zf00000000zzzzz.{8nnnnn~05z8));525k)p(:)2)5",
-"=&q333*@=&&&%%=ir_[[-[[n){zzz..f9nsnjnnn)..z...f9sn~n~~0)..z...frs~s~snnf.zz..zfnnsnnjn0f......fsn[nsnjn8......f0ns~sjs08.z.zz{k0ssjsns08......k0[jnsnn~k....z.knnsssssn8z..zz{k~s~~[s[nc..zzzzknjs[n[nn8..zzz{esj[[[[s0{zzz{{fe-[-h-__h;52)#(2)#)p:;(225",
-"%q/qqqq*%=&&===4_*___d_mnifz{z.;n_-_-dh-x..zz..k0_-h--_-r...zzz8n-[_-_d_a.zz..zf[_d_-h-_e.z.{zzk-_d_d__he...zz.i[d_-_d_-9..z.z.8~_-_dd_[9.zzz.z8[__d-h-[a.zz.z.k[__-_-_ha{.z...k[_-d_-_-9...z{.5[_dd_-_hw.zzzzzc-_d_-___k.zz{{{e___q_qq*r#))#52(k)p:;52)#",
-"6>*qq***q==&===&_qq_____nfz{{z.;0__-____~..zz..f0_______0.{....is_______a..zz.zf[_-_____a.z....f[q_____q2.zz...i[q_____h0..z.zzig____-__r.....zk[__-____r..zz.zfhq______az..z..f[______[a.z.zz.isd-_-h-he.zz{.z8__-__-_[i..{{{z5__-_h__-ck228(2);)0(k(2)#",
-"h>qh__q>q!<&&&=cx[[[[--[p{z{{{zf9[[[s[-[r.....zfr_[-[[[[9.....zfn_[[[[[[o.z..z.f0[--[--[e.z.zzzfn_[h[[^ba..zzz.ks-[[[[[sa..z...8n-s-[[-[a.zzz.zfn_[[[[[[e..zz..8s-[[[[[se.zzzz.k~[[s[s6sezzzzz.knsss[[[so.z{zzz8n[ssss[gkzz{{{z8sgs~gnnx#8)5k52(8)p(:)2)5",
-"h*qq>*>>q!<$&==tw0nnnxn02{z{{zzfwnn0nnn09{zzzzzfennnnnnnaz.zzzzf9snsgnn~c..z.zz{9nngnns~e...zz{frnng~n~na..zz{.;9nnnnnn0c.zzz{zk9n0nnnnne..zz.{f9n0n0nnne.zzz.z{0000n0n0i.zzzz.;070000nri.z.zz.kr0000909f.zzzz{ir0090099fz.{{{ftp2r9rr9ak52)k#)(k(258(225",
-"6q__**>>h<=&&=ttie999a2aakfzz{z{8aaaaa92ef{....{ir990992afz..zz{i99999r9efz.{zzzc99r0r00c{..z.z{ar0r090pczzzz..fc090929ac..z.z.fe2922a2a8..zzz.ze2a22aaakzzzzz.faaaaa)ae;.zz.z.kae9aaaac;.zzz.{ieaee9aeof.zzz{fee)aaeeec{z{zz{kaeee5c5ikf#))k(2(#(p(k5)):",
-"gh__*>>/6:<v===t;fkf88888kf{z{z{zf{8f8f888{.z{z{{fff;f8fffzzz{z{{f888k8kf{.zzz{zfki8iiki;{{zzz{zkki8kkkkfz.{z{zz{ff88fff{zz{{zz{{888888{zzzz{zzz{fffffffzzzzzzz{f{f8ff8fzzzzzz.z{fkfk;{{z.zzzzzfffffffffz.zz.zz{{f{{{{zzzzzzzz{{{{ffff{ff#))#5)(#)2)::]):",
-"b__q>>>*1=&&====;ff.z{{zzz...zz{zz...zzf;y{zzz.zz..zz.z.z..zzzzzzzz{{.{z...zzzz.zz.....z.zzzzzz.{zz.{zzzz.z.z.zz....zzz..zz.zz....z...z.z.{zzz......zzzzzz{zzz....{zzz.z.zzzzz..z.zz....zzzzzz...zzzz{zz.{zzz...z.z.zzz{z{{z......z{{{zf##2)k52)5(p(:52]#",
-"g___*q_g:=%%====kf{{zz..z.z{zzzzz.zzz..z...z{{z.z....z..zz.{zzzz........zz.z{zzz.......z..z.zz{z..z.z.zz.zzzzzzz...z.zz..z{zzzz..z......zz{zzzz..zzz.....zzzzz..{8fzzz..zz{zzz........z.zzz{z{{.zz....z{z{z{{..........z{{{{z.....z.zzyy;#))##2(#(p5;:))5",
-"bhhh_h,==%@%===ik{ff{zzzz..zfzz{z..zz.zz...z{{{{......zzz.z{z{z{z.........{{{{{....z.z....{{{{fz...z.z{..z{{{{{z..zzz.z..{{{{f{.zzzzz.z.z{{{f{zz..zz....zfzf{zzzzz{{{...z{{{y{zzz..zz.z.{{{z{zzzzffz{zzz{{{{z{zz..{.{.z{{{{{{{.zz.{{ff;ff#));:2)#)p(;(22#",
-"h_h_*6t:$6$&=&==iktkffff{yf{f{ff{{f{{z{{{{f{{{{f{{{{fz{z{{{fff{{{y{f{{{z{{f{fff{f{{f{{{z{{f{fff{ffz{{{f{{{yy{{f{{{{f{{{{{{ff{f{{z{{{{{zz{f{f{{{{fzz{{{{z{fzf{{{{z{{ffff{{f{{{ff{{z{f{{{{{{{{{{f{{f{{{z{{{z{f{{{{y{{{{ff{{{{{{ff{ffffffff;#));#225(2(;:)2#",
-"x[_*q1%hh@===%=tikik;kffffffffffffkfffffyfffffffffffff{y{{f{ff;ffyfffffffffffff{ffff;fff{ffffffffff{ff{{yyyf{f{ff{{{{ff{{fzff{{f{fffff{{{ff{{{fz{f{ff{f{{{{{{{ffffzf{fff{{{f{z{{{{{{y{{f{{{{{z{{z{{ff{{{{zffff{ff{f{{{ffffff{{f{{f{ff;;f;5)(#5225)25#5)2#",
-"rnjnax_@&=====:;;i;iii;kk;k;fffff;fff;fyyyffffff;fffy;fffyfffyyyyyyfyy{{{ffffff{ff{f{f{f{{{yyyyfy;f{{fyf{{;fffffff{f{{ff{f{{{fff{{{z{ff{fz{f8fff{z{{{zf{{ffffffffffffffffffffff{{{{{{{{f{f{{{{{{{{{{{zffkeecikff;592e8ffk;f;fffff;;ii;ifi))#k:)25)25#()p:",
-"2jup&@&=:==&&&&==&&===:tic888k;;;;ffyyyyy{y{{fffkfy{{yy{yfy{{{{yz{{{{{yyy{y{{{yy{{{{ffk8ff{{{z{yzz{{{yy{{{8f88f8ffk8fff{{{{zz{{{z{{{{fffz{{{f88ff{z{zz{{zfffz{{{{{{f888f88f8f8ff{{y{{{{ff{{f{{{{{y{ff{fkecik;fyf5eike48;fyy{;ff;;;ik;i#22(k;;#2p5)p):=))#",
-"p-25::;===:;:;=&==&&:=;::58888;y;y;y;yyyy;yy;yf888ff{{y{{y{y{yyyy{{{{{yyyyy{y{{{yyy{{y;8ff{zzz{{{z{{zzyzzy88f8ff8f8ff8{z{{{{z{zzf{{{ff{z{zzzfff{888ffzzzzzffzzz{{{{f8f88888888ff{{zz{{fff{{{{{{;;fy{y{f:({zz{{{;akzz;e(;{y{y5929]p2))2225:;;#:))#5p5;:)2#",
-"0n(=====:%q//>@&===:=:=:))8585;yy;yyy;;;yy;yyff;8888;y{yyy{{{{{{{{yyyy{{yyy{{{y{{;yyyyk8f{{yyyy{y{{{zy{{{{kff88f8f8f8f8f{{{{{{fz{f{z{{{{{{{{z88eaeee5cf{{{;f{{{{{zff88f888f88888{{{{{;f{{{{{{k#eeci;{{;epr9'}kk(rky;k((yfy;59a)a0njn2))#;;::#522852(#5()#",
-"up):=:==@33>*q>h========2)5)855;;;;;;;yyy;;yyyy;#8888kf{yyyy{{{{yyyyy{{yyyyyyyyyyy{{yy#k{yyy{y{zz{{yz{yy{{yf8f8888f8f8ff{z{{zzzz{zzzz{{{zzzzzf5555e5e)5fz{kf{z{{{{f888888888888f{{{{8;{{{{{fkaa29a2a#y;<n~0rr]5)9kzy5aa{yy52e8iee)n-0)5;;;;:;:))5(p(k5)]#",
-"p):====%*>g@g_*q&==:=;y#2858885;yy;yyyyy{yyy{{{{85588##yy{yyz{z{{{zyyyy;yyyyyyyyyyyy{y;kyzy{{z{{z.{z{y{{yzzz.{88f8f88888f.z{{zzz{{{{{{{{{{{f{f88eee85ee8{fkkz{{z{{f8888888888888{{{;8fzzz{z;5ea22009(y#arkzfipcerkf85e2yy;9[hn22000j0#;;;::;#52(#52(k:))5",
-"p2==:=&@3qrn_q6q@:=@666,u2)))855;:;y;;;;;:;;:::#())8888#;y{;==}=:;{yyyyyyyyyyy;yyyy{{{;kyyyy:|xx'!1f{{yyy#0np22))22)222020rxr9r9;{yz{{{cs[snef8a)))iic5c{fk;zz{y{{f8888888888888{ff8fyz{yyz#9)ea0002ey;(ri.z5aicr888k#v{fknq>*0[__0nak:::;:::))#5)2(;:)]5",
-"p(====%h*_b6_q>*6&*3/>*+-----jj6,666h66@@6@@,b~s~nn0255]&:;:9x,71=yyyyyyyyyyyyyyyyyyyy;k;yy;<77r9(;y{{y{y;ea9a2022)a2a2a2r99aaekf{{{{{f;5(9vif8e2ai8i5e#fyk;{y{{y{88588888888888ffk8fyy{{{;e2e)a92r2e;;5a0n7pekc)5k;;ki;#(j_/>neea94:;;:::;(2(#:#))5:()):"};

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_curve.h Deleted

@@ -1,68 +0,0 @@
-#ifndef XS_CURVE_H
-#define XS_CURVE_H
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-/* Macros for type-classing this GtkWidget/object
- */
-#define XS_TYPE_CURVE (xs_curve_get_type())
-#define XS_CURVE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), XS_TYPE_CURVE, XSCurve))
-#define XS_CURVE_CLASS(luokka) (G_TYPE_CHECK_CLASS_CAST ((luokka), XS_TYPE_CURVE, XSCurveClass))
-#define XS_IS_CURVE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), XS_TYPE_CURVE))
-#define XS_IS_CURVE_CLASS(luokka) (G_TYPE_CHECK_CLASS_TYPE ((luokka), XS_TYPE_CURVE))
-#define XS_CURVE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), XS_TYPE_CURVE, XSCurveClass))
-
-
-/* Structures
- */
-typedef struct _XSCurve XSCurve;
-typedef struct _XSCurveClass XSCurveClass;
-
-typedef struct {
- gfloat x,y;
-} xs_point_t;
-
-typedef struct {
- gint x, y;
-} xs_int_point_t;
-
-#if 0
-struct _XSCurve {
- GtkDrawingArea graph;
-
- gint cursor_type;
- gfloat min_x;
- gfloat max_x;
- gfloat min_y;
- gfloat max_y;
- GdkPixmap *pixmap;
- gint grab_point; /* point currently grabbed */
-
- /* control points */
- gint nctlpoints; /* number of control points */
- xs_point_t *ctlpoints; /* array of control points */
-};
-
-struct _XSCurveClass {
- GtkDrawingAreaClass parent_class;
-};
-
-
-GType xs_curve_get_type (void);
-GtkWidget* xs_curve_new (void);
-void xs_curve_reset (XSCurve *curve);
-void xs_curve_set_range (XSCurve *curve,
- gfloat min_x, gfloat min_y,
- gfloat max_x, gfloat max_y);
-gboolean xs_curve_realloc_data (XSCurve *curve, gint npoints);
-void xs_curve_get_data (XSCurve *curve, xs_point_t ***points, gint **npoints);
-gboolean xs_curve_set_points (XSCurve *curve, xs_int_point_t *points, gint npoints);
-gboolean xs_curve_get_points (XSCurve *curve, xs_int_point_t **points, gint *npoints);
-#endif
-
-G_END_DECLS
-
-#endif /* XS_CURVE_H */

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_filter.c Deleted

@@ -1,82 +0,0 @@
-/*
- XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
-
- Audio rate-conversion filter
-
- Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
- (C) Copyright 1999-2007 Tecnic Software productions (TNSP)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include "xs_filter.h"
-
-/* Let's do some preprocessor magic :) */
-#define XS_FVAR(T, P, K) g ## K ## int ## P *sp_ ## T ## P , *dp_ ## T ## P
-
-#define XS_FILTER1(T, P, K, Q) \
- dataSize /= sizeof(g ## K ## int ## P); \
- sp_ ## T ## P = (g ## K ## int ## P *) srcBuf; \
- dp_ ## T ## P = (g ## K ## int ## P *) destBuf; \
- while (dataSize-- > 0) { \
- for (tmp = 0, i = 0; i < oversampleFactor; i++) \
- tmp += (gint32) ((gint ## P) (*(sp_ ## T ## P ++) Q)); \
- xs_filter_mbn = (tmp + xs_filter_mbn) / (oversampleFactor + 1); \
- *(dp_ ## T ## P ++) = ((g ## K ## int ## P) xs_filter_mbn) Q ; \
- }
-
-
-static gint32 xs_filter_mbn = 0;
-
-
-gint xs_filter_rateconv(void *destBuf, void *srcBuf, const gint audioFormat,
- const gint oversampleFactor, const gint bufSize)
-{
- static gint32 tmp;
- XS_FVAR(s, 8,);
- XS_FVAR(u, 8, u);
- XS_FVAR(s, 16,);
- XS_FVAR(u, 16, u);
- gint i;
- gint dataSize = bufSize;
-
- if (dataSize <= 0)
- return dataSize;
-
- switch (audioFormat) {
- case FMT_U8:
- XS_FILTER1(u, 8, u, ^0x80)
- break;
-
- case FMT_S8:
- XS_FILTER1(s, 8,,)
- break;
-
-
- case FMT_U16_BE:
- case FMT_U16_LE:
- XS_FILTER1(u, 16, u, ^0x8000)
- break;
-
- case FMT_S16_BE:
- case FMT_S16_LE:
- XS_FILTER1(s, 16,,)
- break;
-
- default:
- return -1;
- }
-
- return 0;
-}

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_filter.h Deleted

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_init.c Deleted

@@ -1,41 +0,0 @@
-/*
- XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
-
- Plugin initialization point
-
- Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
- (C) Copyright 1999-2007 Tecnic Software productions (TNSP)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include "xmms-sid.h"
-#include "xs_config.h"
-
-static const gchar *xs_sid_fmts[] = { "sid", "psid", NULL };
-
-AUD_INPUT_PLUGIN
-(
- .name = XS_PACKAGE_STRING, /* Plugin description */
- .domain = PACKAGE,
- .init = xs_init, /* Initialization */
- .cleanup = xs_close, /* Cleanup */
- .play = xs_play_file, /* Play given file */
- .stop = xs_stop, /* Stop playing */
- .pause = xs_pause, /* Pause playing */
- .probe_for_tuple = xs_probe_for_tuple,
-
- .extensions = xs_sid_fmts, /* File ext assist */
- .have_subtune = TRUE
-)

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_player.c Deleted

@@ -1,73 +0,0 @@
-#include "xs_player.h"
-
-#ifdef HAVE_SIDPLAY1
-#include "xs_sidplay1.h"
-#endif
-#ifdef HAVE_SIDPLAY2
-#include "xs_sidplay2.h"
-#endif
-
-
-/* List of emulator engines
- */
-static const xs_engine_t xs_enginelist[] = {
-#ifdef HAVE_SIDPLAY1
- {XS_ENG_SIDPLAY1,
- xs_sidplay1_probe,
- xs_sidplay1_init, xs_sidplay1_close,
- xs_sidplay1_initsong, xs_sidplay1_fillbuffer,
- xs_sidplay1_load, xs_sidplay1_delete,
- xs_sidplay1_getinfo, xs_sidplay1_updateinfo,
- NULL
- },
-#endif
-#ifdef HAVE_SIDPLAY2
- {XS_ENG_SIDPLAY2,
- xs_sidplay2_probe,
- xs_sidplay2_init, xs_sidplay2_close,
- xs_sidplay2_initsong, xs_sidplay2_fillbuffer,
- xs_sidplay2_load, xs_sidplay2_delete,
- xs_sidplay2_getinfo, xs_sidplay2_updateinfo,
- xs_sidplay2_flush
- },
-#endif
-};
-
-static const gint xs_nenginelist = (sizeof(xs_enginelist) / sizeof(xs_enginelist[0]));
-
-
-gboolean xs_init_emu_engine(int *configured, xs_status_t *status)
-{
- gint engine;
- gboolean initialized;
- 
- XSDEBUG("initializing emulator engine #%i...\n", *configured);
-
- engine = 0;
- initialized = FALSE;
- while (engine < xs_nenginelist && !initialized) {
- if (xs_enginelist[engine].plrIdent == *configured) {
- if (xs_enginelist[engine].plrInit(status)) {
- initialized = TRUE;
- status->sidPlayer = (xs_engine_t *) & xs_enginelist[engine];
- }
- }
- engine++;
- }
-
- XSDEBUG("init#1: %s, %i\n", initialized ? "OK" : "FAILED", engine);
-
- engine = 0;
- while (engine < xs_nenginelist && !initialized) {
- if (xs_enginelist[engine].plrInit(status)) {
- initialized = TRUE;
- status->sidPlayer = (xs_engine_t *) &xs_enginelist[engine];
- *configured = xs_enginelist[engine].plrIdent;
- } else
- engine++;
- }
-
- XSDEBUG("init#2: %s, %i\n", initialized ? "OK" : "FAILED", engine);
- return initialized;
-}
-

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_sidplay.h Deleted

@@ -1,155 +0,0 @@
-/*
- XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
-
- libSIDPlay skeleton functions used both by v1 and 2 of the backends
-
- Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
- (C) Copyright 2005-2009 Tecnic Software productions (TNSP)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-
-/* This function gets most of the information, though we do miss some
- * (those variables that are only set by libSIDPlay when tune is initialized).
- * Rest of the information is acquired in TFUNCTION2()
- */
-xs_tuneinfo_t *TFUNCTION(const gchar *sidFilename)
-{
- xs_tuneinfo_t *pResult;
- TTUNEINFO myInfo;
- TTUNE *myTune;
- guint8 *buf = NULL;
- size_t bufSize = 0;
-
- /* Load file */
- if (!sidFilename) return NULL;
-
- if (xs_fload_buffer(sidFilename, &buf, &bufSize) != 0)
- return NULL;
- 
- /* Check if the tune exists and is readable */
- if ((myTune = new TTUNE(buf, bufSize)) == NULL) {
- g_free(buf);
- return NULL;
- }
- g_free(buf);
-
- if (!myTune->getStatus()) {
- delete myTune;
- return NULL;
- }
-
- /* Get general tune information */
-#ifdef XS_SIDPLAY1_H
- myTune->getInfo(myInfo);
-#endif
-#ifdef XS_SIDPLAY2_H
- myInfo = myTune->getInfo();
-#endif
-
- /* Allocate tuneinfo structure and set information */
- pResult = xs_tuneinfo_new(sidFilename,
- myInfo.songs, myInfo.startSong,
- myInfo.infoString[0], myInfo.infoString[1], myInfo.infoString[2],
- myInfo.loadAddr, myInfo.initAddr, myInfo.playAddr,
- myInfo.dataFileLen, myInfo.formatString, myInfo.sidModel);
- 
- /* NOTICE! libSIDPlay[12] headers specifically state that sidModel,
- * songSpeed and clockSpeed are "undefined" before song initialization,
- * but in practice sidModel is known after getInfo() invocation...
- * This of course does not take the sub-tune specific changes into account,
- * but at least we have a reasonable guesstimate.
- */
-
- delete myTune;
-
- return pResult;
-}
-
-
-/* Updates the information of currently playing tune
- */
-gboolean TFUNCTION2(xs_status_t *myStatus)
-{
- TTUNEINFO myInfo;
- TTUNE *myTune;
- TENGINE *myEngine;
- xs_tuneinfo_t *i;
- 
- /* Check if we have required structures initialized */
- if (!myStatus || !myStatus->tuneInfo || !myStatus->sidEngine)
- return FALSE;
-
- myEngine = (TENGINE *) myStatus->sidEngine;
- myTune = myEngine->currTune;
- if (!myTune)
- return FALSE;
-
- /* Get currently playing tune information */
-#ifdef XS_SIDPLAY1_H
- myTune->getInfo(myInfo);
-#endif
-#ifdef XS_SIDPLAY2_H
- myInfo = myTune->getInfo();
-#endif
-
- /* NOTICE! Here we assume that libSIDPlay[12] headers define
- * SIDTUNE_SIDMODEL_* similarly to our enums in xs_config.h ...
- */
- i = myStatus->tuneInfo;
- i->sidModel = myInfo.sidModel;
-
- if ((myStatus->currSong > 0) && (myStatus->currSong <= i->nsubTunes)) {
- gint tmpSpeed = -1;
- 
- switch (myInfo.clockSpeed) {
- case SIDTUNE_CLOCK_PAL:
- tmpSpeed = XS_CLOCK_PAL;
- break;
- case SIDTUNE_CLOCK_NTSC:
- tmpSpeed = XS_CLOCK_NTSC;
- break;
- case SIDTUNE_CLOCK_ANY:
- tmpSpeed = XS_CLOCK_ANY;
- break;
- case SIDTUNE_CLOCK_UNKNOWN:
- switch (myInfo.songSpeed) {
- case SIDTUNE_SPEED_VBI:
- tmpSpeed = XS_CLOCK_VBI;
- break;
- case SIDTUNE_SPEED_CIA_1A:
- tmpSpeed = XS_CLOCK_CIA;
- break;
- default:
- tmpSpeed = myInfo.songSpeed;
- break;
- }
- default:
- tmpSpeed = myInfo.clockSpeed;
- break;
- }
- 
- i->subTunes[myStatus->currSong - 1].tuneSpeed = tmpSpeed;
- }
-
- return TRUE;
-}
-
-/* Undefine these */
-#undef TFUNCTION
-#undef TFUNCTION2
-#undef TTUNEINFO
-#undef TTUNE

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_sidplay1.cc Deleted

@@ -1,361 +0,0 @@
-/*
- XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
-
- libSIDPlay v1 support
-
- Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
- (C) Copyright 1999-2007 Tecnic Software productions (TNSP)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-#include "xmms-sid.h"
-
-#ifdef HAVE_SIDPLAY1
-
-#include <stdio.h>
-#include "xs_sidplay1.h"
-#include "xs_config.h"
-
-#include <sidplay/player.h>
-#include <sidplay/myendian.h>
-#include <sidplay/fformat.h>
-
-
-/* Maximum audio frequency supported by libSIDPlay v1 */
-#define SIDPLAY1_MAX_FREQ (48000)
-
-
-typedef struct {
- emuEngine *currEng;
- emuConfig currConfig;
- sidTune *currTune;
- guint8 *buf;
- size_t bufSize;
-} xs_sidplay1_t;
-
-
-/* We need to 'export' all this pseudo-C++ crap */
-extern "C" {
-
-
-/* Return song information
- */
-#define TFUNCTION xs_sidplay1_getinfo
-#define TFUNCTION2 xs_sidplay1_updateinfo
-#define TTUNEINFO sidTuneInfo
-#define TTUNE sidTune
-#define TENGINE xs_sidplay1_t
-#include "xs_sidplay.h"
-
-
-/* Check if we can play the given file
- */
-gboolean xs_sidplay1_probe(xs_file_t *f)
-{
- gchar tmpBuf[4];
-
- if (!f) return FALSE;
-
- if (xs_fread(tmpBuf, sizeof(gchar), 4, f) != 4)
- return FALSE;
-
- if (!strncmp(tmpBuf, "PSID", 4))
- return TRUE;
- else
- return FALSE;
-}
-
-
-/* Initialize SIDPlay1
- */
-gboolean xs_sidplay1_init(xs_status_t * status)
-{
- gint tmpFreq;
- xs_sidplay1_t *engine;
- assert(status != NULL);
-
- /* Allocate internal structures */
- engine = (xs_sidplay1_t *) g_malloc0(sizeof(xs_sidplay1_t));
- if (!engine) return FALSE;
-
- /* Initialize engine */
- engine->currEng = new emuEngine();
- if (!engine->currEng) {
- xs_error("[SIDPlay1] Could not initialize emulation engine.\n");
- g_free(engine);
- return FALSE;
- }
-
- /* Verify endianess */
- if (!engine->currEng->verifyEndianess()) {
- xs_error("[SIDPlay1] Endianess verification failed.\n");
- delete engine->currEng;
- g_free(engine);
- return FALSE;
- }
-
- status->sidEngine = engine;
-
- /* Get current configuration */
- engine->currEng->getConfig(engine->currConfig);
-
- /* Configure channel parameters */
- switch (status->audioChannels) {
-
- case XS_CHN_AUTOPAN:
- engine->currConfig.channels = SIDEMU_STEREO;
- engine->currConfig.autoPanning = SIDEMU_CENTEREDAUTOPANNING;
- engine->currConfig.volumeControl = SIDEMU_FULLPANNING;
- break;
-
- case XS_CHN_STEREO:
- engine->currConfig.channels = SIDEMU_STEREO;
- engine->currConfig.autoPanning = SIDEMU_NONE;
- engine->currConfig.volumeControl = SIDEMU_NONE;
- break;
-
- case XS_CHN_MONO:
- default:
- engine->currConfig.channels = SIDEMU_MONO;
- engine->currConfig.autoPanning = SIDEMU_NONE;
- engine->currConfig.volumeControl = SIDEMU_NONE;
- status->audioChannels = XS_CHN_MONO;
- break;
- }
-
-
- /* Memory mode settings */
- switch (xs_cfg.memoryMode) {
- case XS_MPU_TRANSPARENT_ROM:
- engine->currConfig.memoryMode = MPU_TRANSPARENT_ROM;
- break;
-
- case XS_MPU_PLAYSID_ENVIRONMENT:
- engine->currConfig.memoryMode = MPU_PLAYSID_ENVIRONMENT;
- break;
-
- case XS_MPU_BANK_SWITCHING:
- default:
- engine->currConfig.memoryMode = MPU_BANK_SWITCHING;
- xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING;
- break;
- }
-
-
- /* Audio parameters sanity checking and setup */
- engine->currConfig.bitsPerSample = status->audioBitsPerSample;
- tmpFreq = status->audioFrequency;
-
- if (status->oversampleEnable) {
- if ((tmpFreq * status->oversampleFactor) > SIDPLAY1_MAX_FREQ) {
- status->oversampleEnable = FALSE;
- } else {
- tmpFreq = (tmpFreq * status->oversampleFactor);
- }
- } else {
- if (tmpFreq > SIDPLAY1_MAX_FREQ)
- tmpFreq = SIDPLAY1_MAX_FREQ;
- }
-
- engine->currConfig.frequency = tmpFreq;
-
- switch (status->audioBitsPerSample) {
- case XS_RES_8BIT:
- switch (status->audioFormat) {
- case FMT_S8:
- status->audioFormat = FMT_S8;
- engine->currConfig.sampleFormat = SIDEMU_SIGNED_PCM;
- break;
-
- case FMT_U8:
- default:
- status->audioFormat = FMT_U8;
- engine->currConfig.sampleFormat = SIDEMU_UNSIGNED_PCM;
- break;
- }
- break;
-
- case XS_RES_16BIT:
- default:
- switch (status->audioFormat) {
- case FMT_U16_LE:
- case FMT_U16_BE:
- status->audioFormat = FMT_U16_NE;
- engine->currConfig.sampleFormat = SIDEMU_UNSIGNED_PCM;
- break;
-
- case FMT_S16_LE:
- case FMT_S16_BE:
- default:
- status->audioFormat = FMT_S16_NE;
- engine->currConfig.sampleFormat = SIDEMU_SIGNED_PCM;
- break;
- }
- break;
- }
-
- /* Clockspeed settings */
- switch (xs_cfg.clockSpeed) {
- case XS_CLOCK_NTSC:
- engine->currConfig.clockSpeed = SIDTUNE_CLOCK_NTSC;
- break;
-
- case XS_CLOCK_PAL:
- default:
- engine->currConfig.clockSpeed = SIDTUNE_CLOCK_PAL;
- xs_cfg.clockSpeed = XS_CLOCK_PAL;
- break;
- }
-
- engine->currConfig.forceSongSpeed = xs_cfg.forceSpeed;
-
-
- /* Configure rest of the emulation */
- /* if (xs_cfg.forceModel) */
- engine->currConfig.mos8580 = xs_cfg.mos8580;
- engine->currConfig.emulateFilter = xs_cfg.emulateFilters;
- engine->currConfig.filterFs = xs_cfg.sid1Filter.fs;
- engine->currConfig.filterFm = xs_cfg.sid1Filter.fm;
- engine->currConfig.filterFt = xs_cfg.sid1Filter.ft;
-
-
- /* Now set the emulator configuration */
- if (!engine->currEng->setConfig(engine->currConfig)) {
- xs_error("[SIDPlay1] Emulator engine configuration failed!\n");
- return FALSE;
- }
-
- /* Create sidtune object */
- engine->currTune = new sidTune(0);
- if (!engine->currTune) {
- xs_error("[SIDPlay1] Could not initialize SIDTune object.\n");
- return FALSE;
- }
-
- return TRUE;
-}
-
-
-/* Close SIDPlay1 engine
- */
-void xs_sidplay1_close(xs_status_t * status)
-{
- xs_sidplay1_t *engine;
- assert(status != NULL);
-
- engine = (xs_sidplay1_t *) status->sidEngine;
-
- /* Free internals */
- if (engine->currEng) {
- delete engine->currEng;
- engine->currEng = NULL;
- }
-
- if (engine->currTune) {
- delete engine->currTune;
- engine->currTune = NULL;
- }
-
- xs_sidplay1_delete(status);
-
- g_free(engine);
- status->sidEngine = NULL;
-}
-
-
-/* Initialize current song and sub-tune
- */
-gboolean xs_sidplay1_initsong(xs_status_t * status)
-{
- xs_sidplay1_t *engine;
- assert(status != NULL);
-
- engine = (xs_sidplay1_t *) status->sidEngine;
- if (!engine) return FALSE;
-
- if (!engine->currTune) {
- xs_error("[SIDPlay1] SID-tune struct pointer was NULL. This should not happen, report to XMMS-SID author.\n");
- return FALSE;
- }
-
- if (!engine->currTune->getStatus()) {
- xs_error("[SIDPlay1] SID-tune status check failed. This should not happen, report to XMMS-SID author.\n");
- return FALSE;
- }
-
- status->isInitialized = TRUE;
-
- return sidEmuInitializeSong(*engine->currEng, *engine->currTune, status->currSong);
-}
-
-
-/* Emulate and render audio data to given buffer
- */
-guint xs_sidplay1_fillbuffer(xs_status_t * status, gchar * audioBuffer, guint audioBufSize)
-{
- xs_sidplay1_t *engine;
- assert(status != NULL);
-
- engine = (xs_sidplay1_t *) status->sidEngine;
- if (!engine) return 0;
-
- sidEmuFillBuffer(*engine->currEng, *engine->currTune, audioBuffer, audioBufSize);
-
- return audioBufSize;
-}
-
-
-/* Load a given SID-tune file
- */
-gboolean xs_sidplay1_load(xs_status_t * status, const gchar * filename)
-{
- xs_sidplay1_t *engine;
- assert(status != NULL);
- status->isInitialized = FALSE;
-
- engine = (xs_sidplay1_t *) status->sidEngine;
- if (!engine) return FALSE;
-
- /* Try to get the tune */
- if (!filename) return FALSE;
-
- if (xs_fload_buffer(filename, &(engine->buf), &(engine->bufSize)) != 0)
- return FALSE;
-
- if (!engine->currTune->load(engine->buf, engine->bufSize))
- return FALSE;
-
- return TRUE;
-}
-
-
-/* Delete INTERNAL information
- */
-void xs_sidplay1_delete(xs_status_t * status)
-{
- xs_sidplay1_t *engine;
- assert(status != NULL);
-
- engine = (xs_sidplay1_t *) status->sidEngine;
- if (engine == NULL) return;
-
- g_free(engine->buf);
- engine->buf = NULL;
- engine->bufSize = 0;
-}
-
-
-} /* extern "C" */
-#endif /* HAVE_SIDPLAY1 */

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_sidplay1.h Deleted

audacious-plugins-3.3.4.tar.bz2/stamp-h.in Deleted

audacious-plugins-3.3.4.tar.bz2/acinclude.m4 -> audacious-plugins-3.4.2.tar.bz2/acinclude.m4 Changed

audacious-plugins-3.4.2.tar.bz2/autogen.sh Added

audacious-plugins-3.3.4.tar.bz2/config.guess -> audacious-plugins-3.4.2.tar.bz2/config.guess Changed

@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
-# Free Software Foundation, Inc.
+# Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2009-11-20'
+timestamp='2013-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -17,26 +15,22 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner. Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program. This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub. If it succeeds, it prints the system name on stdout, and
-# exits with 0. Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -56,8 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions. There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -139,12 +132,33 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format. This provides both forward
@@ -180,7 +194,7 @@
 		fi
 		;;
 	 *)
-	 os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -201,6 +215,10 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+ *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
 *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -223,7 +241,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -269,7 +287,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
 Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -295,12 +316,12 @@
 	echo s390-ibm-zvmoe
 	exit ;;
 *:OS400:*:*)
- echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
- arm:riscos:*:*|arm:RISCOS:*:*)
+ arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -394,23 +415,23 @@
 # MiNT. But MiNT is downward compatible to TOS, so this should
 # be no problem.
 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
- exit ;;
+	exit ;;
 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
- exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
- exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
- echo m68k-unknown-mint${UNAME_RELEASE}
- exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
 m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -480,8 +501,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
 AViiON:dgux:*:*)
- # DG/UX returns AViiON for all architectures
- UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -494,7 +515,7 @@
 	else
 	 echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
 M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -551,7 +572,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -594,52 +615,52 @@
 	 9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
- case "${sc_cpu_version}" in
- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
- 532) # CPU_PA_RISC2_0
- case "${sc_kernel_bits}" in
- 32) HP_ARCH="hppa2.0n" ;;
- 64) HP_ARCH="hppa2.0w" ;;
+		 sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		 case "${sc_cpu_version}" in
+		 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		 532) # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			 32) HP_ARCH="hppa2.0n" ;;
+			 64) HP_ARCH="hppa2.0w" ;;
 			 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
- esac ;;
- esac
+			esac ;;
+		 esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		 eval $set_cc_for_build
-		 sed 's/^ //' << EOF >$dummy.c
+		 sed 's/^		//' << EOF >$dummy.c
 
- #define _HPUX_SOURCE
- #include <stdlib.h>
- #include <unistd.h>
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
- int main ()
- {
- #if defined(_SC_KERNEL_BITS)
- long bits = sysconf(_SC_KERNEL_BITS);
- #endif
- long cpu = sysconf (_SC_CPU_VERSION);
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		 long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		 long cpu = sysconf (_SC_CPU_VERSION);
 
- switch (cpu)
- 	{
- 	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
- 	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
- 	case CPU_PA_RISC2_0:
- #if defined(_SC_KERNEL_BITS)
- 	 switch (bits)
- 		{
- 		case 64: puts ("hppa2.0w"); break;
- 		case 32: puts ("hppa2.0n"); break;
- 		default: puts ("hppa2.0"); break;
- 		} break;
- #else /* !defined(_SC_KERNEL_BITS) */
- 	 puts ("hppa2.0"); break;
- #endif
- 	default: puts ("hppa1.0"); break;
- 	}
- exit (0);
- }
+		 switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			 switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else /* !defined(_SC_KERNEL_BITS) */
+			 puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		 exit (0);
+		}
 EOF
 		 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		 test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -730,22 +751,22 @@
 	exit ;;
 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
- exit ;;
+	exit ;;
 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
- exit ;;
+	exit ;;
 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
- exit ;;
+	exit ;;
 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
- exit ;;
+	exit ;;
 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
- exit ;;
+	exit ;;
 CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -769,14 +790,14 @@
 	exit ;;
 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
 5000:UNIX_System_V:4.*:*)
- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -788,30 +809,35 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
 *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	 pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	 amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	 *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
 i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+ *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
 *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+ i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
 i*:windows32*:*)
- 	# uname -m includes "-pc" on this system.
- 	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
 i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
 *:Interix*:*)
- 	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	 x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -848,15 +874,22 @@
 	exit ;;
 *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
 *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
 i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+ aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+ aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
 alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
 	 EV5) UNAME_MACHINE=alphaev5 ;;
@@ -866,52 +899,56 @@
 	 EV6) UNAME_MACHINE=alphaev6 ;;
 	 EV67) UNAME_MACHINE=alphaev67 ;;
 	 EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+ arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	 | grep -q __ARM_EABI__
 	then
-	 echo ${UNAME_MACHINE}-unknown-linux-gnu
+	 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
-	 echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	 then
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
+	 else
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
+	 fi
 	fi
 	exit ;;
 avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
 crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
 frv:Linux:*:*)
- 	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+ hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
 ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -930,51 +967,63 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
+ or1k:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
 or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
 parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
 parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	 PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	 PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	 *) echo hppa-unknown-linux-gnu ;;
+	 PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	 PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	 *) echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
 ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
 ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+ ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+ ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
 s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
 sh64*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+ tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
 x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 xtensa*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
 i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -983,11 +1032,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
 i*86:UNIX_SV:4.2MP:2.*)
- # Unixware is an offshoot of SVR4, but it has its own version
- # number series starting with 2...
- # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope. -- rms.
- # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
 i*86:OS/2:*:*)
@@ -1019,7 +1068,7 @@
 	fi
 	exit ;;
 i*86:*:5:[678]*)
- 	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	 *486*)	 UNAME_MACHINE=i486 ;;
 	 *Pentium)	 UNAME_MACHINE=i586 ;;
@@ -1047,13 +1096,13 @@
 	exit ;;
 pc:*:*:*)
 	# Left here for compatibility:
- # uname -m prints for DJGPP always 'pc', but it prints nothing about
- # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
- exit ;;
+	exit ;;
 Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1088,8 +1137,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	 && { echo i486-ncr-sysv4; exit; } ;;
 NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1132,10 +1181,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel@ccMail.Census.GOV>
- echo i586-unisys-sysv4
- exit ;;
+ PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
 *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1161,11 +1210,11 @@
 	exit ;;
 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	 echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	 echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
- exit ;;
+	exit ;;
 BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1178,6 +1227,9 @@
 BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+ x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
 SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1204,19 +1256,21 @@
 	exit ;;
 *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	 i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		 grep IS_64BIT_ARCH >/dev/null
-		 then
-		 UNAME_PROCESSOR="x86_64"
-		 fi
-		fi ;;
-	 unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	 UNAME_PROCESSOR=powerpc
+	fi
+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+	 if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		grep IS_64BIT_ARCH >/dev/null
+	 then
+		case $UNAME_PROCESSOR in
+		 i386) UNAME_PROCESSOR=x86_64 ;;
+		 powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		esac
+	 fi
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
 *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1230,7 +1284,10 @@
 *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
- NSE-?:NONSTOP_KERNEL:*:*)
+ NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
+ NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
 NSR-?:NONSTOP_KERNEL:*:*)
@@ -1275,13 +1332,13 @@
 	echo pdp10-unknown-its
 	exit ;;
 SEI:*:*:SEIUX)
- echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
 *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
 *:*VMS:*:*)
- 	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	 A*) echo alpha-dec-vms ; exit ;;
 	 I*) echo ia64-dec-vms ; exit ;;
@@ -1299,11 +1356,11 @@
 i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+ x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
@@ -1321,11 +1378,11 @@
 #include <sys/param.h>
 printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
- "4"
+	"4"
 #else
-	 ""
+	""
 #endif
- ); exit (0);
+	); exit (0);
 #endif
 #endif

audacious-plugins-3.3.4.tar.bz2/config.h.in -> audacious-plugins-3.4.2.tar.bz2/config.h.in Changed

@@ -37,9 +37,6 @@
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
-/* Define if you have HardSID for libSIDPlay 2 */
-#undef HAVE_HARDSID_BUILDER
-
 /* Define if you have the iconv() function and it works. */
 #undef HAVE_ICONV
 
@@ -58,22 +55,6 @@
 /* Whether we have ne_set_connect_timeout */
 #undef HAVE_NE_SET_CONNECT_TIMEOUT
 
-/* Define if you have reSID for libSIDPlay 2 */
-#undef HAVE_RESID_BUILDER
-
-/* Define if you have and want to use libSIDPlay1 */
-#undef HAVE_SIDPLAY1
-
-/* Define if you have and want to use libSIDPlay2 */
-#undef HAVE_SIDPLAY2
-
-/* Define if using new libSIDPlay2 with COM-style API. */
-#undef HAVE_SIDPLAY2_COMI
-
-/* Define if using libSIDPlay+reSID with Antti Lankila's distortion patches.
- */
-#undef HAVE_SIDPLAY2_DISTORTION
-
 /* Define to 1 if you have the <soundcard.h> header file. */
 #undef HAVE_SOUNDCARD_H
 
@@ -134,9 +115,6 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* Define if building with IPv6 support */
-#undef USE_IPV6
-
 /* Version number of package */
 #undef VERSION

audacious-plugins-3.3.4.tar.bz2/config.rpath -> audacious-plugins-3.4.2.tar.bz2/config.rpath Changed

@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-# Copyright 1996-2010 Free Software Foundation, Inc.
+# Copyright 1996-2013 Free Software Foundation, Inc.
 # Taken from GNU libtool, 2001
 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -25,7 +25,7 @@
 # known workaround is to choose shorter directory names for the build
 # directory and/or the installation directory.
 
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
 # which needs '.lib').
 libext=a
 shrext=.so
@@ -57,13 +57,6 @@
 aix*)
 wl='-Wl,'
 ;;
- darwin*)
- case $cc_basename in
- xlc*)
- wl='-Wl,'
- ;;
- esac
- ;;
 mingw* | cygwin* | pw32* | os2* | cegcc*)
 ;;
 hpux9* | hpux10* | hpux11*)
@@ -72,9 +65,7 @@
 irix5* | irix6* | nonstopux*)
 wl='-Wl,'
 ;;
- newsos6)
- ;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
 case $cc_basename in
 ecc*)
 wl='-Wl,'
@@ -85,17 +76,26 @@
 lf95*)
 wl='-Wl,'
 ;;
- pgcc | pgf77 | pgf90)
+ nagfor*)
+ wl='-Wl,-Wl,,'
+ ;;
+ pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
 wl='-Wl,'
 ;;
 ccc*)
 wl='-Wl,'
 ;;
+ xl* | bgxl* | bgf* | mpixl*)
+ wl='-Wl,'
+ ;;
 como)
 wl='-lopt='
 ;;
 *)
 case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ F* | *Sun*Fortran*)
+ wl=
+ ;;
 *Sun\ C*)
 wl='-Wl,'
 ;;
@@ -103,13 +103,24 @@
 ;;
 esac
 ;;
+ newsos6)
+ ;;
+ *nto* | *qnx*)
+ ;;
 osf3* | osf4* | osf5*)
 wl='-Wl,'
 ;;
 rdos*)
 ;;
 solaris*)
- wl='-Wl,'
+ case $cc_basename in
+ f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+ wl='-Qoption ld '
+ ;;
+ *)
+ wl='-Wl,'
+ ;;
+ esac
 ;;
 sunos4*)
 wl='-Qoption ld '
@@ -171,15 +182,14 @@
 fi
 ;;
 amigaos*)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
- # that the semantics of dynamic libraries on AmigaOS, at least up
- # to version 4, is to share data among multiple programs linked
- # with the same dynamic library. Since this doesn't match the
- # behavior of shared libraries on other platforms, we cannot use
- # them.
- ld_shlibs=no
+ case "$host_cpu" in
+ powerpc)
+ ;;
+ m68k)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ esac
 ;;
 beos*)
 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -198,11 +208,13 @@
 ld_shlibs=no
 fi
 ;;
+ haiku*)
+ ;;
 interix[3-9]*)
 hardcode_direct=no
 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
 ;;
- gnu* | linux* | k*bsd*-gnu)
+ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 :
 else
@@ -325,10 +337,14 @@
 fi
 ;;
 amigaos*)
- hardcode_libdir_flag_spec='-L$libdir'
- hardcode_minus_L=yes
- # see comment about different semantics on the GNU ld section
- ld_shlibs=no
+ case "$host_cpu" in
+ powerpc)
+ ;;
+ m68k)
+ hardcode_libdir_flag_spec='-L$libdir'
+ hardcode_minus_L=yes
+ ;;
+ esac
 ;;
 bsdi[45]*)
 ;;
@@ -342,24 +358,15 @@
 ;;
 darwin* | rhapsody*)
 hardcode_direct=no
- if test "$GCC" = yes ; then
+ if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
 :
 else
- case $cc_basename in
- xlc*)
- ;;
- *)
- ld_shlibs=no
- ;;
- esac
+ ld_shlibs=no
 fi
 ;;
 dgux*)
 hardcode_libdir_flag_spec='-L$libdir'
 ;;
- freebsd1*)
- ld_shlibs=no
- ;;
 freebsd2.2*)
 hardcode_libdir_flag_spec='-R$libdir'
 hardcode_direct=yes
@@ -420,6 +427,8 @@
 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 hardcode_libdir_separator=:
 ;;
+ *nto* | *qnx*)
+ ;;
 openbsd*)
 if test -f /usr/libexec/ld.so; then
 hardcode_direct=yes
@@ -515,7 +524,12 @@
 library_names_spec='$libname$shrext'
 ;;
 amigaos*)
- library_names_spec='$libname.a'
+ case "$host_cpu" in
+ powerpc*)
+ library_names_spec='$libname$shrext' ;;
+ m68k)
+ library_names_spec='$libname.a' ;;
+ esac
 ;;
 beos*)
 library_names_spec='$libname$shrext'
@@ -534,8 +548,6 @@
 dgux*)
 library_names_spec='$libname$shrext'
 ;;
- freebsd1*)
- ;;
 freebsd* | dragonfly*)
 case "$host_os" in
 freebsd[123]*)
@@ -547,6 +559,9 @@
 gnu*)
 library_names_spec='$libname$shrext'
 ;;
+ haiku*)
+ library_names_spec='$libname$shrext'
+ ;;
 hpux9* | hpux10* | hpux11*)
 case $host_cpu in
 ia64*)
@@ -582,7 +597,7 @@
 ;;
 linux*oldld* | linux*aout* | linux*coff*)
 ;;
- linux* | k*bsd*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu)
 library_names_spec='$libname$shrext'
 ;;
 knetbsd*-gnu)
@@ -594,7 +609,7 @@
 newsos6)
 library_names_spec='$libname$shrext'
 ;;
- nto-qnx*)
+ *nto* | *qnx*)
 library_names_spec='$libname$shrext'
 ;;
 openbsd*)
@@ -625,6 +640,9 @@
 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 library_names_spec='$libname$shrext'
 ;;
+ tpf*)
+ library_names_spec='$libname$shrext'
+ ;;
 uts4*)
 library_names_spec='$libname$shrext'
 ;;

audacious-plugins-3.3.4.tar.bz2/config.sub -> audacious-plugins-3.4.2.tar.bz2/config.sub Changed

audacious-plugins-3.3.4.tar.bz2/configure -> audacious-plugins-3.4.2.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for audacious-plugins 3.3.4.
+# Generated by GNU Autoconf 2.69 for audacious-plugins 3.4.2.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -579,8 +579,8 @@
 # Identity of this package.
 PACKAGE_NAME='audacious-plugins'
 PACKAGE_TARNAME='audacious-plugins'
-PACKAGE_VERSION='3.3.4'
-PACKAGE_STRING='audacious-plugins 3.3.4'
+PACKAGE_VERSION='3.4.2'
+PACKAGE_STRING='audacious-plugins 3.4.2'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -642,6 +642,8 @@
 plugindir
 GLIB214_LIBS
 GLIB214_CFLAGS
+SOXR_LIBS
+SOXR_CFLAGS
 BS2B_LIBS
 BS2B_CFLAGS
 FILEWRITER_LIBS
@@ -672,14 +674,8 @@
 ALSA_LIBS
 ALSA_CFLAGS
 OSS_CFLAGS
-CXXCPP
-BUILDERS_LIBS
-BUILDERS_LDFLAGS
-BUILDERS_CFLAGS
-SIDPLAY2_CFLAGS
-SIDPLAY2_LIBS
-SIDPLAY1_CFLAGS
-SIDPLAY1_LIBS
+SIDPLAYFP_LIBS
+SIDPLAYFP_CFLAGS
 SAMPLERATE_LIBS
 SAMPLERATE_CFLAGS
 JACK_LIBS
@@ -718,9 +714,6 @@
 MPG123_CFLAGS
 PULSE_LIBS
 PULSE_CFLAGS
-USE_IPV6
-USE_IPV6_FALSE
-USE_IPV6_TRUE
 GIO_LIBS
 GIO_CFLAGS
 AUDACIOUS_LIBS
@@ -742,6 +735,7 @@
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
+SED
 MKDIR_P
 INSTALL_DATA
 INSTALL_SCRIPT
@@ -880,7 +874,6 @@
 with_libiconv_prefix
 with_libintl_prefix
 enable_gio
-enable_ipv6
 enable_console
 enable_xsf
 enable_pulse
@@ -905,15 +898,6 @@
 enable_ffaudio
 enable_jack
 enable_sid
-with_sidplay1
-with_sidplay1_inc
-with_sidplay1_lib
-with_sidplay2
-with_sidplay2_inc
-with_sidplay2_lib
-with_sidbuilders
-with_builders_inc
-with_builders_lib
 enable_oss4
 enable_alsa
 enable_sdlout
@@ -922,7 +906,7 @@
 enable_amidiplug_alsa
 enable_amidiplug_flsyn
 enable_cdaudio
-enable_scrobbler
+enable_scrobbler2
 enable_neon
 enable_mms
 enable_cue
@@ -932,9 +916,11 @@
 enable_bs2b
 enable_resample
 enable_speedpitch
+enable_soxr
 enable_gtkui
 enable_skins
 enable_lyricwiki
+enable_glspectrum
 '
 ac_precious_vars='build_alias
 host_alias
@@ -1005,7 +991,8 @@
 JACK_LIBS
 SAMPLERATE_CFLAGS
 SAMPLERATE_LIBS
-CXXCPP
+SIDPLAYFP_CFLAGS
+SIDPLAYFP_LIBS
 ALSA_CFLAGS
 ALSA_LIBS
 SDL_CFLAGS
@@ -1030,6 +1017,8 @@
 FLAC_LIBS
 BS2B_CFLAGS
 BS2B_LIBS
+SOXR_CFLAGS
+SOXR_LIBS
 GLIB214_CFLAGS
 GLIB214_LIBS'
 
@@ -1572,7 +1561,7 @@
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures audacious-plugins 3.3.4 to adapt to many kinds of systems.
+\`configure' configures audacious-plugins 3.4.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1639,7 +1628,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of audacious-plugins 3.3.4:";;
+ short | recursive ) echo "Configuration of audacious-plugins 3.4.2:";;
 esac
 cat <<\_ACEOF
 
@@ -1655,19 +1644,20 @@
 --disable-nls do not use Native Language Support
 --disable-rpath do not hardcode runtime library paths
 --disable-gio disable GIO support
- --enable-ipv6		 enable IPv6 support (default=no)
 --disable-console disable game music decoder (console)
 --disable-xsf disable Nintendo DS audio decoder (xsf)
 --disable-pulse disable PulseAudio output plugin (default=enabled)
 --disable-psf disable PlayStation (psf/psf2) audio decoder
 --disable-mp3 disable MP3 plugin (default=enabled)
 --disable-hotkey disable global hotkey plugin (default=enabled)
- --disable-gnomeshortcuts disable gnome shortcuts (default=enabled)
+ --disable-gnomeshortcuts
+ disable gnome shortcuts (default=enabled)
 --disable-lirc disable LIRC support (default=enabled)
 --disable-songchange disable song change plugin
 --disable-statusicon disable X11 Status Icon plugin (default=enabled)
 --disable-aosd disable Audacious OSD plugin (default=enabled)
- --disable-aosd-xcomp disable Audacious OSD X Composite Support (default=enabled)
+ --disable-aosd-xcomp disable Audacious OSD X Composite Support
+ (default=enabled)
 --disable-notify disable notify plugin (default=enabled)
 --disable-mpris2 disable MPRIS 2 support (default=enabled)
 --disable-adplug disable AdPlug plugin (default=enabled)
@@ -1675,7 +1665,7 @@
 --disable-flacng disable flac input plugin (default=enabled)
 --disable-wavpack disable WavPack input plugin (default=enabled)
 --disable-aac disable aac plugin (default=enabled)
- --disable-sndfile disable sndfile extensions. default=enabled
+ --disable-sndfile disable sndfile extensions. [default=enabled]
 --disable-modplug disable ModPlug plugin (default=enabled)
 --disable-ffaudio disable ffaudio plugin (default=enabled)
 --disable-jack disable JACK output plugin (default=enabled)
@@ -1685,22 +1675,31 @@
 --disable-sdlout disable SDL output plugin
 --disable-sndio disable sndio output plugin (default=enabled)
 --disable-amidiplug disable amidi-plug input plugin (default=check)
- --disable-amidiplug-alsa disable amidi-plug ALSA backend (default=enabled)
- --disable-amidiplug-flsyn disable amidi-plug FluidSynth backend (default=enabled)
+ --disable-amidiplug-alsa
+ disable amidi-plug ALSA backend (default=enabled)
+ --disable-amidiplug-flsyn
+ disable amidi-plug FluidSynth backend
+ (default=enabled)
 --disable-cdaudio disable cdaudio-ng input plugin (default=enabled)
- --disable-scrobbler disable Scrobbler plugin (default=enabled)
+ --disable-scrobbler2 disable Scrobbler 2 plugin (default=enabled)
 --disable-neon disable neon HTTP support (default=enabled)
 --disable-mms disable mms support. (default=enabled)
 --disable-cue disable cue support. (default=enabled)
 --disable-filewriter disable FileWriter output plugin (default=enabled)
- --disable-filewriter_mp3 disable FileWriter MP3 output part (default=enabled)
- --disable-filewriter_flac disable FileWriter FLAC output part (default=enabled)
+ --disable-filewriter_mp3
+ disable FileWriter MP3 output part (default=enabled)
+ --disable-filewriter_flac
+ disable FileWriter FLAC output part
+ (default=enabled)
 --disable-bs2b disable BS2B effect plugin (default=enabled)
 --disable-resample disable resample effect plugin (default=enabled)
 --disable-speedpitch disable Speed and Pitch effect plugin
+ --disable-soxr disable SoX Resampler effect plugin
+ (default=enabled)
 --disable-gtkui disable GTK interface (gtkui)
 --disable-skins disable Winamp Classic interface (skins)
 --disable-lyricwiki disable LyricWiki plugin (default=enabled)
+ --disable-glspectrum disable OpenGL Spectrum Analyzer (default=enabled)
 
 Optional Packages:
 --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1710,15 +1709,6 @@
 --without-libiconv-prefix don't search for libiconv in includedir and libdir
 --with-libintl-prefix[=DIR] search for libintl in DIR/include and DIR/lib
 --without-libintl-prefix don't search for libintl in includedir and libdir
- --with-sidplay1=PREFIX Enable libSIDPlay1 with install-PREFIX
- --with-sidplay1-inc=DIR Where the libSIDPlay1 headers are located
- --with-sidplay1-lib=DIR Where the libSIDPlay1 library is installed
- --with-sidplay2=PREFIX Enable libSIDPlay2 with install-PREFIX
- --with-sidplay2-inc=DIR Where the libSIDPlay2 headers are located
- --with-sidplay2-lib=DIR Where the libSIDPlay2 library is installed
- --with-sidbuilders=DIR What the SIDPlay2 builders install PREFIX is
- --with-builders-inc=DIR Where the SIDPlay2 builders headers are located
- --with-builders-lib=DIR Where the SIDPlay2 builders libraries are installed
 
 Some influential environment variables:
 CC C compiler command
@@ -1823,7 +1813,10 @@
 C compiler flags for SAMPLERATE, overriding pkg-config
 SAMPLERATE_LIBS
 linker flags for SAMPLERATE, overriding pkg-config
- CXXCPP C++ preprocessor
+ SIDPLAYFP_CFLAGS
+ C compiler flags for SIDPLAYFP, overriding pkg-config
+ SIDPLAYFP_LIBS
+ linker flags for SIDPLAYFP, overriding pkg-config
 ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
 ALSA_LIBS linker flags for ALSA, overriding pkg-config
 SDL_CFLAGS C compiler flags for SDL, overriding pkg-config
@@ -1850,6 +1843,8 @@
 FLAC_LIBS linker flags for FLAC, overriding pkg-config
 BS2B_CFLAGS C compiler flags for BS2B, overriding pkg-config
 BS2B_LIBS linker flags for BS2B, overriding pkg-config
+ SOXR_CFLAGS C compiler flags for SOXR, overriding pkg-config
+ SOXR_LIBS linker flags for SOXR, overriding pkg-config
 GLIB214_CFLAGS
 C compiler flags for GLIB214, overriding pkg-config
 GLIB214_LIBS
@@ -1921,7 +1916,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-audacious-plugins configure 3.3.4
+audacious-plugins configure 3.4.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2368,94 +2363,11 @@
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_decl
-
-# ac_fn_cxx_try_link LINENO
-# -------------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_link ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext conftest$ac_exeext
- if { { ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_link") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_retval=1
-fi
- # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
- # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
- # interfere with the next link command; also delete a directory that is
- # left behind by Apple's compiler. We do this before executing the actions.
- rm -rf conftest.dSYM conftest_ipa8_conftest.oo
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_link
-
-# ac_fn_cxx_try_cpp LINENO
-# ------------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_cpp ()
-{
- as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
- ac_status=$?
- if test -s conftest.err; then
- grep -v '^ *+' conftest.err >conftest.er1
- cat conftest.er1 >&5
- mv -f conftest.er1 conftest.err
- fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } > conftest.i && {
-	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
- }; then :
- ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_retval=1
-fi
- eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
- as_fn_set_status $ac_retval
-
-} # ac_fn_cxx_try_cpp
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by audacious-plugins $as_me 3.3.4, which was
+It was created by audacious-plugins $as_me 3.4.2, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
 $ $0 $@
@@ -2808,7 +2720,7 @@
 
 PACKAGE=audacious-plugins
 
-VERSION=3.3.4
+VERSION=3.4.2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2963,6 +2875,7 @@
 ac_config_headers="$ac_config_headers config.h"
 
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5165,7 +5078,7 @@
 
 
 if test "x$GCC" = "xyes"; then
- CFLAGS="$CFLAGS -std=gnu99 -Wall -pipe"
+ CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe"
 CXXFLAGS="$CXXFLAGS -Wall -pipe"
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C/C++ compiler supports -Wtype-limits" >&5
@@ -6527,6 +6440,8 @@
 
 
 
+CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+
 for ac_func in mkdtemp
 do :
 ac_fn_c_check_func "$LINENO" "mkdtemp" "ac_cv_func_mkdtemp"
@@ -6674,6 +6589,75 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+$as_echo_n "checking for a sed that does not truncate output... " >&6; }
+if ${ac_cv_path_SED+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for ac_i in 1 2 3 4 5 6 7; do
+ ac_script="$ac_script$as_nl$ac_script"
+ done
+ echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+ { ac_script=; unset ac_script;}
+ if test -z "$SED"; then
+ ac_path_SED_found=false
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_SED" || continue
+# Check for GNU ac_path_SED and select it if it is found.
+ # Check for GNU $ac_path_SED
+case `"$ac_path_SED" --version 2>&1` in
+*GNU*)
+ ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
+*)
+ ac_count=0
+ $as_echo_n 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ $as_echo '' >> "conftest.nl"
+ "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+ as_fn_arith $ac_count + 1 && ac_count=$as_val
+ if test $ac_count -gt ${ac_path_SED_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_SED="$ac_path_SED"
+ ac_path_SED_max=$ac_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
+esac
+
+ $ac_path_SED_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_SED"; then
+ as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5
+ fi
+else
+ ac_cv_path_SED=$SED
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+$as_echo "$ac_cv_path_SED" >&6; }
+ SED="$ac_cv_path_SED"
+ rm -f conftest.sed
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
@@ -8753,12 +8737,12 @@
 pkg_cv_AUDACIOUS_CFLAGS="$AUDACIOUS_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "audacious >= 3.3") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "audacious >= 3.4") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 3.3" 2>/dev/null`
+ pkg_cv_AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 3.4" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -8770,12 +8754,12 @@
 pkg_cv_AUDACIOUS_LIBS="$AUDACIOUS_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "audacious >= 3.3") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 3.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "audacious >= 3.4") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 3.3" 2>/dev/null`
+ pkg_cv_AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 3.4" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -8796,19 +8780,19 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audacious >= 3.3" 2>&1`
+	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audacious >= 3.4" 2>&1`
 else
-	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audacious >= 3.3" 2>&1`
+	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audacious >= 3.4" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$AUDACIOUS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Cannot find Audacious 3.3; have you installed Audacious yet?" "$LINENO" 5
+	as_fn_error $? "Cannot find Audacious 3.4; have you installed Audacious yet?" "$LINENO" 5
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	as_fn_error $? "Cannot find Audacious 3.3; have you installed Audacious yet?" "$LINENO" 5
+	as_fn_error $? "Cannot find Audacious 3.4; have you installed Audacious yet?" "$LINENO" 5
 
 else
 	AUDACIOUS_CFLAGS=$pkg_cv_AUDACIOUS_CFLAGS
@@ -8835,11 +8819,12 @@
 if test "${enable_gio+set}" = set; then :
 enableval=$enable_gio; enable_gio=$enableval
 else
- enable_gio=yes
+ enable_gio=auto
 fi
 
 
-if test "x$enable_gio" = "xyes"; then
+have_gio=no
+if test "x$enable_gio" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5
@@ -8899,58 +8884,40 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GIO_PKG_ERRORS" >&5
 
-	enable_gio=no
+	if test "x$enable_gio" = "xyes"; then
+ as_fn_error $? "Cannot find GIO development files (ver >= 2.22), but compilation of GIO support has been explicitly requested; please install GIO dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	enable_gio=no
+	if test "x$enable_gio" = "xyes"; then
+ as_fn_error $? "Cannot find GIO development files (ver >= 2.22), but compilation of GIO support has been explicitly requested; please install GIO dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
 	GIO_LIBS=$pkg_cv_GIO_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_gio=yes
-fi
-fi
-
-if test "x$enable_gio" = "xyes"; then
- TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS gio"
-
+	have_gio=yes
+ TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS gio"
 
-fi
 
-# Check whether --enable-ipv6 was given.
-if test "${enable_ipv6+set}" = set; then :
- enableval=$enable_ipv6; enable_ipv6=$enableval
-else
- enable_ipv6=no
 fi
-
-if test "x$enable_ipv6" = "xyes"; then
-
-$as_echo "#define USE_IPV6 /**/" >>confdefs.h
-
 fi
- if test "x$enable_ipv6" = "xyes"; then
- USE_IPV6_TRUE=
- USE_IPV6_FALSE='#'
-else
- USE_IPV6_TRUE='#'
- USE_IPV6_FALSE=
-fi
-
-
 
 
 # Check whether --enable-console was given.
 if test "${enable_console+set}" = set; then :
 enableval=$enable_console; enable_console=$enableval
 else
- enable_console="yes"
+ enable_console=auto
 fi
 
 
-if test $enable_console = yes ; then
+have_console=no
+if test "x$enable_console" != "xno"; then
 for ac_header in zlib.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
@@ -8958,21 +8925,19 @@
 cat >>confdefs.h <<_ACEOF
 #define HAVE_ZLIB_H 1
 _ACEOF
- enable_console=yes
+ have_console=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS console"
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find zlib.h; disabling game music decoder (console)" >&5
-$as_echo "$as_me: WARNING: Cannot find zlib.h; disabling game music decoder (console)" >&2;}
- enable_console=no
+ if test "x$enable_console" = "xyes"; then
+ as_fn_error $? "Cannot find zlib development files, but compilation of game music decoder (console) has been explicitly requested; please install zlib dev files and run configure again" "$LINENO" 5
+ fi
+
 fi
 
 done
 
 fi
 
-if test $enable_console = yes ; then
- INPUT_PLUGINS="$INPUT_PLUGINS console"
-fi
-
 
 # Check whether --enable-xsf was given.
 if test "${enable_xsf+set}" = set; then :
@@ -8982,7 +8947,7 @@
 fi
 
 
-if test $enable_xsf = yes ; then
+if test "x$enable_xsf" != "xno"; then
 INPUT_PLUGINS="$INPUT_PLUGINS xsf"
 fi
 
@@ -8992,12 +8957,13 @@
 if test "${enable_pulse+set}" = set; then :
 enableval=$enable_pulse; enable_pulse=$enableval
 else
- enable_pulse="yes"
+ enable_pulse=auto
 
 fi
 
 
-if test "x$enable_pulse" = "xyes"; then
+have_pulse=no
+if test "x$enable_pulse" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSE" >&5
@@ -9057,12 +9023,16 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$PULSE_PKG_ERRORS" >&5
 
-	have_pulse=no
+	if test "x$enable_pulse" = "xyes"; then
+ as_fn_error $? "Cannot find PulseAudio development files (ver >= 0.95), but compilation of PulseAudio output plugin has been explicitly requested; please install PulseAudio dev files and run configure again" "$LINENO" 5
+ fi
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_pulse=no
+	if test "x$enable_pulse" = "xyes"; then
+ as_fn_error $? "Cannot find PulseAudio development files (ver >= 0.95), but compilation of PulseAudio output plugin has been explicitly requested; please install PulseAudio dev files and run configure again" "$LINENO" 5
+ fi
 
 else
 	PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS
@@ -9075,7 +9045,6 @@
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** pulseaudio output plugin disabled per user request ***" >&5
 $as_echo "*** pulseaudio output plugin disabled per user request ***" >&6; }
- have_pulse=no
 fi
 
 
@@ -9087,7 +9056,7 @@
 fi
 
 
-if test "$enable_psf" = "yes"; then
+if test "x$enable_psf" != "xno"; then
 INPUT_PLUGINS="$INPUT_PLUGINS psf"
 fi
 
@@ -9096,11 +9065,12 @@
 if test "${enable_mp3+set}" = set; then :
 enableval=$enable_mp3; enable_mp3=$enableval
 else
- enable_mp3=yes
+ enable_mp3=auto
 fi
 
 
-if test $enable_mp3 = yes ; then
+have_mp3=no
+if test "x$enable_mp3" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPG123" >&5
@@ -9160,25 +9130,28 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$MPG123_PKG_ERRORS" >&5
 
-	enable_mp3=no
+	if test "x$enable_mp3" = "xyes"; then
+ as_fn_error $? "Cannot find libmpg123 development files (ver >= 1.12), but compilation of MP3 plugin has been explicitly requested; please install libmpg123 dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	enable_mp3=no
+	if test "x$enable_mp3" = "xyes"; then
+ as_fn_error $? "Cannot find libmpg123 development files (ver >= 1.12), but compilation of MP3 plugin has been explicitly requested; please install libmpg123 dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	MPG123_CFLAGS=$pkg_cv_MPG123_CFLAGS
 	MPG123_LIBS=$pkg_cv_MPG123_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_mp3=yes
+	have_mp3=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
 fi
-
- if test $enable_mp3 = yes ; then
- INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** libmpg123 not found; MP3 plugin disabled" >&5
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** libmpg123 not found; MP3 plugin disabled" >&5
 $as_echo "*** libmpg123 not found; MP3 plugin disabled" >&6; }
- fi
 fi
 
 
@@ -9186,12 +9159,13 @@
 if test "${enable_hotkey+set}" = set; then :
 enableval=$enable_hotkey; enable_hotkey=$enableval
 else
- enable_hotkey="yes"
+ enable_hotkey=auto
 
 fi
 
 
-if test "x$enable_hotkey" = "xyes"; then
+have_hotkey=no
+if test "x$enable_hotkey" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDKX11" >&5
@@ -9251,26 +9225,28 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GDKX11_PKG_ERRORS" >&5
 
-	have_hotkey="no"
+	if test "x$enable_hotkey" = "xyes"; then
+ as_fn_error $? "Cannot find gdk-x11-3.0 development files, but compilation of X11 Global Hotkey plugin has been explicitly requested; please install gdk-x11-3.0 dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_hotkey="no"
+	if test "x$enable_hotkey" = "xyes"; then
+ as_fn_error $? "Cannot find gdk-x11-3.0 development files, but compilation of X11 Global Hotkey plugin has been explicitly requested; please install gdk-x11-3.0 dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	GDKX11_CFLAGS=$pkg_cv_GDKX11_CFLAGS
 	GDKX11_LIBS=$pkg_cv_GDKX11_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_hotkey="yes"
+ GENERAL_PLUGINS="$GENERAL_PLUGINS hotkey"
 fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** X11 Global Hotkey plugin disabled per user request ***" >&5
 $as_echo "*** X11 Global Hotkey plugin disabled per user request ***" >&6; }
- have_hotkey="no"
-fi
-
-if test "x$have_hotkey" = "xyes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS hotkey"
 fi
 
 
@@ -9278,13 +9254,13 @@
 if test "${enable_gnomeshortcuts+set}" = set; then :
 enableval=$enable_gnomeshortcuts; enable_gnomeshortcuts=$enableval
 else
- enable_gnomeshortcuts="yes"
+ enable_gnomeshortcuts=auto
 
 fi
 
 
-if test "x$enable_gnomeshortcuts" = "xyes"; then
- have_gnomeshortcuts="yes"
+have_gnomeshortcuts=no
+if test "x$enable_gnomeshortcuts" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
@@ -9344,30 +9320,28 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$DBUS_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find dbus-glib >= 0.60; disabling Gnome shortcuts plugin." >&5
-$as_echo "$as_me: WARNING: Cannot find dbus-glib >= 0.60; disabling Gnome shortcuts plugin." >&2;}
- have_gnomeshortcuts=no
+	if test "x$enable_gnomeshortcuts" = "xyes"; then
+ as_fn_error $? "Cannot find dbus or dbus-glib development files (ver >= 0.60), but compilation of Gnome Shortcuts Plugin has been explicitly requested; please install dbus and dbus-glib dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find dbus-glib >= 0.60; disabling Gnome shortcuts plugin." >&5
-$as_echo "$as_me: WARNING: Cannot find dbus-glib >= 0.60; disabling Gnome shortcuts plugin." >&2;}
- have_gnomeshortcuts=no
+	if test "x$enable_gnomeshortcuts" = "xyes"; then
+ as_fn_error $? "Cannot find dbus or dbus-glib development files (ver >= 0.60), but compilation of Gnome Shortcuts Plugin has been explicitly requested; please install dbus and dbus-glib dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
 	DBUS_LIBS=$pkg_cv_DBUS_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_gnomeshortcuts=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS gnomeshortcuts"
 fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** Gnome Shortcuts Plugin disabled per user request ***" >&5
 $as_echo "*** Gnome Shortcuts Plugin disabled per user request ***" >&6; }
- have_gnomeshortcuts="no"
-fi
-
-if test "x$have_gnomeshortcuts" = "xyes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS gnomeshortcuts"
 fi
 
 
@@ -9375,11 +9349,12 @@
 if test "${enable_lirc+set}" = set; then :
 enableval=$enable_lirc; enable_lirc=$enableval
 else
- enable_lirc=yes
+ enable_lirc=auto
 fi
 
 
-if test $enable_lirc = yes ; then
+have_lirc=no
+if test "x$enable_lirc" != "xno"; then
 for ac_header in lirc/lirc_client.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "lirc/lirc_client.h" "ac_cv_header_lirc_lirc_client_h" "$ac_includes_default"
@@ -9387,29 +9362,29 @@
 cat >>confdefs.h <<_ACEOF
 #define HAVE_LIRC_LIRC_CLIENT_H 1
 _ACEOF
- enable_lirc=yes
+ have_lirc=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"
 else
- enable_lirc=no
+ if test "x$enable_lirc" = "xyes"; then
+ as_fn_error $? "Cannot find lirc development files, but compilation of LIRC support has been explicitly requested; please install lirc dev files and run configure again" "$LINENO" 5
+ fi
 fi
 
 done
 
 fi
 
-if test $enable_lirc = yes ; then
-	GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"
-fi
-
 
 # Check whether --enable-songchange was given.
 if test "${enable_songchange+set}" = set; then :
 enableval=$enable_songchange; enable_songchange=$enableval
 else
- enable_songchange="yes"
+ enable_songchange=auto
 fi
 
 
-if test $enable_songchange = yes ; then
+have_songchange=no
+if test "x$enable_songchange" != "xno"; then
 for ac_header in sys/wait.h
 do :
 ac_fn_c_check_header_mongrel "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default"
@@ -9417,21 +9392,19 @@
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_WAIT_H 1
 _ACEOF
- enable_songchange=yes
+ have_songchange=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS song_change"
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Cannot find sys/wait.h; disabling song change plugin" >&5
-$as_echo "$as_me: WARNING: Cannot find sys/wait.h; disabling song change plugin" >&2;}
- enable_songchange=no
+ if test "x$enable_songchange" = "xyes"; then
+ as_fn_error $? "Cannot find sys/wait.h header, but compilation of song change plugin has been explicitly requested" "$LINENO" 5
+ fi
+
 fi
 
 done
 
 fi
 
-if test $enable_songchange = yes ; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS song_change"
-fi
-
 
 # Check whether --enable-statusicon was given.
 if test "${enable_statusicon+set}" = set; then :
@@ -9441,7 +9414,7 @@
 fi
 
 
-if test "x$have_statusicon" = "xyes"; then
+if test "x$have_statusicon" != "xno"; then
 GENERAL_PLUGINS="$GENERAL_PLUGINS statusicon"
 fi
 
@@ -9450,22 +9423,13 @@
 if test "${enable_aosd+set}" = set; then :
 enableval=$enable_aosd; enable_aosd=$enableval
 else
- enable_aosd="yes"
+ enable_aosd=auto
 
 fi
 
 
-# Check whether --enable-aosd_xcomp was given.
-if test "${enable_aosd_xcomp+set}" = set; then :
- enableval=$enable_aosd_xcomp; enable_aosd_xcomp=$enableval
-else
- enable_aosd_xcomp="yes"
-
-fi
-
-
-if test "x$enable_aosd" = "xyes"; then
- have_aosd="yes"
+have_aosd=no
+if test "x$enable_aosd" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
@@ -9525,15 +9489,13 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$PANGO_PKG_ERRORS" >&5
 
-	have_aosd="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** pango >= 1.14.7 is required for Audacious OSD plugin ***" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** pango >= 1.14.7 is required for Audacious OSD plugin ***" >&5
 $as_echo "*** pango >= 1.14.7 is required for Audacious OSD plugin ***" >&6; }
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_aosd="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** pango >= 1.14.7 is required for Audacious OSD plugin ***" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** pango >= 1.14.7 is required for Audacious OSD plugin ***" >&5
 $as_echo "*** pango >= 1.14.7 is required for Audacious OSD plugin ***" >&6; }
 
 else
@@ -9542,8 +9504,6 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-fi
-
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAIRO" >&5
 $as_echo_n "checking for CAIRO... " >&6; }
@@ -9602,15 +9562,13 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$CAIRO_PKG_ERRORS" >&5
 
-	have_aosd="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** cairo >= 1.2.4 is required for Audacious OSD plugin ***" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** cairo >= 1.2.4 is required for Audacious OSD plugin ***" >&5
 $as_echo "*** cairo >= 1.2.4 is required for Audacious OSD plugin ***" >&6; }
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_aosd="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** cairo >= 1.2.4 is required for Audacious OSD plugin ***" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** cairo >= 1.2.4 is required for Audacious OSD plugin ***" >&5
 $as_echo "*** cairo >= 1.2.4 is required for Audacious OSD plugin ***" >&6; }
 
 else
@@ -9619,8 +9577,6 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-fi
-
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGOCAIRO" >&5
 $as_echo_n "checking for PANGOCAIRO... " >&6; }
@@ -9679,15 +9635,13 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$PANGOCAIRO_PKG_ERRORS" >&5
 
-	have_aosd="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** pangocairo >= 1.14.7 is required for Audacious OSD plugin ***" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** pangocairo >= 1.14.7 is required for Audacious OSD plugin ***" >&5
 $as_echo "*** pangocairo >= 1.14.7 is required for Audacious OSD plugin ***" >&6; }
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_aosd="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** pangocairo >= 1.14.7 is required for Audacious OSD plugin ***" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** pangocairo >= 1.14.7 is required for Audacious OSD plugin ***" >&5
 $as_echo "*** pangocairo >= 1.14.7 is required for Audacious OSD plugin ***" >&6; }
 
 else
@@ -9696,8 +9650,6 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-fi
-
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRENDER" >&5
 $as_echo_n "checking for XRENDER... " >&6; }
@@ -9756,15 +9708,13 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$XRENDER_PKG_ERRORS" >&5
 
-	have_aosd="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** X Render extension is required for Audacious OSD plugin ***" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** X Render extension is required for Audacious OSD plugin ***" >&5
 $as_echo "*** X Render extension is required for Audacious OSD plugin ***" >&6; }
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_aosd="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** X Render extension is required for Audacious OSD plugin ***" >&5
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: *** X Render extension is required for Audacious OSD plugin ***" >&5
 $as_echo "*** X Render extension is required for Audacious OSD plugin ***" >&6; }
 
 else
@@ -9772,10 +9722,40 @@
 	XRENDER_LIBS=$pkg_cv_XRENDER_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+	have_aosd=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS aosd"
+fi
+fi
+fi
+fi
+
+ if test "x$enable_aosd" = "xyes" -a "x$have_aosd" != "xyes"; then
+ as_fn_error $? "Compilation of OSD plugin has been explicitly requested; please install required dev files and run configure again" "$LINENO" 5
+ fi
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** Audacious OSD plugin disabled per user request ***" >&5
+$as_echo "*** Audacious OSD plugin disabled per user request ***" >&6; }
+fi
+
+# Check whether --enable-aosd_xcomp was given.
+if test "${enable_aosd_xcomp+set}" = set; then :
+ enableval=$enable_aosd_xcomp; enable_aosd_xcomp=$enableval
+else
+ enable_aosd_xcomp=auto
 
 fi
+
+
+if test "x$have_aosd" != "xyes"; then
 if test "x$enable_aosd_xcomp" = "xyes"; then
- have_aosd_xcomp="yes"
+ as_fn_error $? "Cannot enable X Composite support for Audacious OSD plugin which is disabled" "$LINENO" 5
+ else
+ enable_aosd_xcomp=no
+ fi
+fi
+
+have_aosd_xcomp=no
+if test "x$enable_aosd_xcomp" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCOMPOSITE" >&5
@@ -9835,52 +9815,43 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$XCOMPOSITE_PKG_ERRORS" >&5
 
-	have_aosd_xcomp="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** X Composite extension not found, composite support for Audacious OSD will not be compiled ***" >&5
-$as_echo "*** X Composite extension not found, composite support for Audacious OSD will not be compiled ***" >&6; }
+	if test "x$enable_aosd_xcomp" = "xyes"; then
+ as_fn_error $? "Cannot find X Composite development files, but compilation of X Composite support for Audacious OSD plugin has been explicitly requested; please install X Composite dev files and run configure again" "$LINENO" 5
+ fi
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_aosd_xcomp="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** X Composite extension not found, composite support for Audacious OSD will not be compiled ***" >&5
-$as_echo "*** X Composite extension not found, composite support for Audacious OSD will not be compiled ***" >&6; }
+	if test "x$enable_aosd_xcomp" = "xyes"; then
+ as_fn_error $? "Cannot find X Composite development files, but compilation of X Composite support for Audacious OSD plugin has been explicitly requested; please install X Composite dev files and run configure again" "$LINENO" 5
+ fi
 
 else
 	XCOMPOSITE_CFLAGS=$pkg_cv_XCOMPOSITE_CFLAGS
 	XCOMPOSITE_LIBS=$pkg_cv_XCOMPOSITE_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+	have_aosd_xcomp=yes
 
 $as_echo "#define HAVE_XCOMPOSITE /**/" >>confdefs.h
 
 fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** X Composite support for Audacious OSD plugin disabled per user request ***" >&5
-$as_echo "*** X Composite support for Audacious OSD plugin disabled per user request ***" >&6; }
- have_aosd_xcomp="no"
- fi
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** Audacious OSD plugin disabled per user request ***" >&5
-$as_echo "*** Audacious OSD plugin disabled per user request ***" >&6; }
- have_aosd="no"
-fi
-
-if test "x$have_aosd" = "xyes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS aosd"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** X Composite support for Audacious OSD plugin disabled per user request ***" >&5
+$as_echo "*** X Composite support for Audacious OSD plugin disabled per user request ***" >&6; }
 fi
 
 
-
 # Check whether --enable-notify was given.
 if test "${enable_notify+set}" = set; then :
 enableval=$enable_notify; enable_notify=$enableval
 else
- enable_notify="yes"
+ enable_notify=auto
 fi
 
 
-if test "x$enable_notify" = "xyes"; then
+have_notify=no
+if test "x$enable_notify" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5
@@ -9940,24 +9911,25 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$NOTIFY_PKG_ERRORS" >&5
 
-	have_notify="no"
+	if test "x$enable_notify" = "xyes"; then
+ as_fn_error $? "Cannot find libnotify development files (ver >= 0.7), but compilation of notify plugin has been explicitly requested; please install libnotify dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_notify="no"
+	if test "x$enable_notify" = "xyes"; then
+ as_fn_error $? "Cannot find libnotify development files (ver >= 0.7), but compilation of notify plugin has been explicitly requested; please install libnotify dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	NOTIFY_CFLAGS=$pkg_cv_NOTIFY_CFLAGS
 	NOTIFY_LIBS=$pkg_cv_NOTIFY_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_notify="yes"
+	have_notify=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS notify"
 fi
-else
- have_notify="no"
-fi
-
-if test "x$have_notify" = "xyes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS notify"
 fi
 
 
@@ -9965,11 +9937,12 @@
 if test "${enable_mpris2+set}" = set; then :
 enableval=$enable_mpris2; enable_mpris2=$enableval
 else
- enable_mpris2=yes
+ enable_mpris2=auto
 fi
 
 
-if test $enable_mpris2 = yes ; then
+have_mpris2=no
+if test "x$enable_mpris2" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO_UNIX" >&5
@@ -10029,38 +10002,41 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GIO_UNIX_PKG_ERRORS" >&5
 
-	enable_mpris2=no
+	if test "x$enable_mpris2" = "xyes"; then
+ as_fn_error $? "Cannot find GIO-UNIX development files (ver >= 2.30), but compilation of MPRIS 2 support has been explicitly requested; please install GIO-UNIX dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	enable_mpris2=no
+	if test "x$enable_mpris2" = "xyes"; then
+ as_fn_error $? "Cannot find GIO-UNIX development files (ver >= 2.30), but compilation of MPRIS 2 support has been explicitly requested; please install GIO-UNIX dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	GIO_UNIX_CFLAGS=$pkg_cv_GIO_UNIX_CFLAGS
 	GIO_UNIX_LIBS=$pkg_cv_GIO_UNIX_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_mpris2=yes
-fi
-fi
-
-if test $enable_mpris2 = yes ; then
-	GENERAL_PLUGINS="$GENERAL_PLUGINS mpris2"
+	have_mpris2=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS mpris2"
 
 
 fi
+fi
 
 
 # Check whether --enable-adplug was given.
 if test "${enable_adplug+set}" = set; then :
 enableval=$enable_adplug; enable_adplug=$enableval
 else
- enable_adplug="yes"
+ enable_adplug=auto
 
 fi
 
 
-if test "x$enable_adplug" = "xyes"; then
- have_adplug="yes"
+have_adplug=no
+if test "x$enable_adplug" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BINIO" >&5
@@ -10120,27 +10096,29 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$BINIO_PKG_ERRORS" >&5
 
-	have_adplug=no
+	if test "x$enable_adplug" = "xyes"; then
+ as_fn_error $? "Cannot find libbinio development files (ver >= 1.4), but compilation of AdPlug plugin has been explicitly requested; please install libbinio dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_adplug=no
+	if test "x$enable_adplug" = "xyes"; then
+ as_fn_error $? "Cannot find libbinio development files (ver >= 1.4), but compilation of AdPlug plugin has been explicitly requested; please install libbinio dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	BINIO_CFLAGS=$pkg_cv_BINIO_CFLAGS
 	BINIO_LIBS=$pkg_cv_BINIO_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+	have_adplug=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS adplug"
 
 fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** AdPlug plugin disabled per user request ***" >&5
 $as_echo "*** AdPlug plugin disabled per user request ***" >&6; }
- have_adplug="no"
-fi
-
-if test "x$have_adplug" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS adplug"
-
 fi
 
 
@@ -10148,11 +10126,12 @@
 if test "${enable_vorbis+set}" = set; then :
 enableval=$enable_vorbis; enable_vorbis=$enableval
 else
- enable_vorbis=yes
+ enable_vorbis=auto
 fi
 
 
-if test $enable_vorbis = yes ; then
+have_vorbis=no
+if test "x$enable_vorbis" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBIS" >&5
@@ -10212,22 +10191,25 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$VORBIS_PKG_ERRORS" >&5
 
-	enable_vorbis=no
+	if test "x$enable_vorbis" = "xyes"; then
+ as_fn_error $? "Cannot find ogg, vorbis, vorbisenc or vorbisfile development files (ver >= 1.0), but compilation of Ogg Vorbis decoding and encoding has been explicitly requested; please install ogg, vorbis, vorbisenc and vorbisfile dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	enable_vorbis=no
+	if test "x$enable_vorbis" = "xyes"; then
+ as_fn_error $? "Cannot find ogg, vorbis, vorbisenc or vorbisfile development files (ver >= 1.0), but compilation of Ogg Vorbis decoding and encoding has been explicitly requested; please install ogg, vorbis, vorbisenc and vorbisfile dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS
 	VORBIS_LIBS=$pkg_cv_VORBIS_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_vorbis=yes
-fi
+	have_vorbis=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
 fi
-
-if test $enable_vorbis = yes ; then
- INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
 fi
 
 
@@ -10235,12 +10217,13 @@
 if test "${enable_flacng+set}" = set; then :
 enableval=$enable_flacng; enable_flacng=$enableval
 else
- enable_flacng="yes"
+ enable_flacng=auto
 
 fi
 
 
-if test "x$enable_flacng" = "xyes"; then
+have_flacng=no
+if test "x$enable_flacng" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFLAC" >&5
@@ -10300,16 +10283,16 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBFLAC_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libFLAC 1.2.1+, FLAC support will not be built ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find libFLAC 1.2.1+, FLAC support will not be built ***" >&2;}
- have_flacng=no
+	if test "x$enable_flacng" = "xyes"; then
+ as_fn_error $? "Cannot find libFLAC development files (ver >= 1.2.1), but compilation of FLACng plugin has been explicitly requested; please install libFLAC dev files and run configure again" "$LINENO" 5
+ fi
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libFLAC 1.2.1+, FLAC support will not be built ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find libFLAC 1.2.1+, FLAC support will not be built ***" >&2;}
- have_flacng=no
+	if test "x$enable_flacng" = "xyes"; then
+ as_fn_error $? "Cannot find libFLAC development files (ver >= 1.2.1), but compilation of FLACng plugin has been explicitly requested; please install libFLAC dev files and run configure again" "$LINENO" 5
+ fi
 
 else
 	LIBFLAC_CFLAGS=$pkg_cv_LIBFLAC_CFLAGS
@@ -10317,15 +10300,11 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_flacng=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS flacng"
 fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** FLACng plugin disabled per user request ***" >&5
 $as_echo "*** FLACng plugin disabled per user request ***" >&6; }
- have_flacng=no
-fi
-
-if test "x$have_flacng" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS flacng"
 fi
 
 
@@ -10333,12 +10312,13 @@
 if test "${enable_wavpack+set}" = set; then :
 enableval=$enable_wavpack; enable_wavpack=$enableval
 else
- enable_wavpack="yes"
+ enable_wavpack=auto
 
 fi
 
 
-if test "x$enable_wavpack" = "xyes"; then
+have_wavpack=no
+if test "x$enable_wavpack" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAVPACK" >&5
@@ -10398,16 +10378,16 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$WAVPACK_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find WavPack 4.31+, WavPack support will not be built ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find WavPack 4.31+, WavPack support will not be built ***" >&2;}
- have_wavpack=no
+	if test "x$enable_wavpack" = "xyes"; then
+ as_fn_error $? "Cannot find WavPack development files (ver >= 4.31), but compilation of WavPack plugin has been explicitly requested; please install WavPack dev files and run configure again" "$LINENO" 5
+ fi
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find WavPack 4.31+, WavPack support will not be built ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find WavPack 4.31+, WavPack support will not be built ***" >&2;}
- have_wavpack=no
+	if test "x$enable_wavpack" = "xyes"; then
+ as_fn_error $? "Cannot find WavPack development files (ver >= 4.31), but compilation of WavPack plugin has been explicitly requested; please install WavPack dev files and run configure again" "$LINENO" 5
+ fi
 
 else
 	WAVPACK_CFLAGS=$pkg_cv_WAVPACK_CFLAGS
@@ -10415,15 +10395,11 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_wavpack=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS wavpack"
 fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** WavPack plugin disabled per user request ***" >&5
 $as_echo "*** WavPack plugin disabled per user request ***" >&6; }
- have_wavpack=no
-fi
-
-if test "x$have_wavpack" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS wavpack"
 fi
 
 
@@ -10431,45 +10407,25 @@
 if test "${enable_aac+set}" = set; then :
 enableval=$enable_aac; enable_aac=$enableval
 else
- enable_aac=yes
+ enable_aac=auto
 
 fi
 
 
-if test x$enable_aac = xyes; then
-	FAAD_LIBS="-lfaad"
-	FAAD_CFLAGS=
+have_aac=no
+if test "x$enable_aac" != "xno"; then
+ FAAD_LIBS="-lfaad"
+ FAAD_CFLAGS=
 
-	ac_fn_c_check_header_mongrel "$LINENO" "faad.h" "ac_cv_header_faad_h" "$ac_includes_default"
+ ac_fn_c_check_header_mongrel "$LINENO" "faad.h" "ac_cv_header_faad_h" "$ac_includes_default"
 if test "x$ac_cv_header_faad_h" = xyes; then :
-
-else
- enable_aac=no
-fi
-
-
-	if test x$enable_aac = xyes; then
-		ac_fn_c_check_decl "$LINENO" "FAAD2_VERSION" "ac_cv_have_decl_FAAD2_VERSION" "#include <neaacdec.h>
+ ac_fn_c_check_decl "$LINENO" "FAAD2_VERSION" "ac_cv_have_decl_FAAD2_VERSION" "#include <neaacdec.h>
 "
 if test "x$ac_cv_have_decl_FAAD2_VERSION" = xyes; then :
-
-else
- enable_aac=no
-fi
-
-	fi
-	if test x$enable_aac = xyes; then
-		ac_fn_c_check_decl "$LINENO" "NeAACDecInit2" "ac_cv_have_decl_NeAACDecInit2" "#include <neaacdec.h>
+ ac_fn_c_check_decl "$LINENO" "NeAACDecInit2" "ac_cv_have_decl_NeAACDecInit2" "#include <neaacdec.h>
 "
 if test "x$ac_cv_have_decl_NeAACDecInit2" = xyes; then :
-
-else
- enable_aac=no
-fi
-
-	fi
-	if test x$enable_aac = xyes; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NeAACDecInit2 in -lfaad" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NeAACDecInit2 in -lfaad" >&5
 $as_echo_n "checking for NeAACDecInit2 in -lfaad... " >&6; }
 if ${ac_cv_lib_faad_NeAACDecInit2+:} false; then :
 $as_echo_n "(cached) " >&6
@@ -10506,18 +10462,24 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_faad_NeAACDecInit2" >&5
 $as_echo "$ac_cv_lib_faad_NeAACDecInit2" >&6; }
 if test "x$ac_cv_lib_faad_NeAACDecInit2" = xyes; then :
- enable_aac=yes
-else
- enable_aac=no
+ have_aac=yes
+
+
+ INPUT_PLUGINS="$INPUT_PLUGINS aac"
 fi
 
-	fi
 fi
 
-if test x$enable_aac = xyes; then
+fi
 
 
- INPUT_PLUGINS="$INPUT_PLUGINS aac"
+fi
+
+
+
+ if test "x$enable_aac" = "xyes" -a "x$have_aac" != "xyes"; then
+ as_fn_error $? "Cannot find faad development files, but compilation of aac plugin has been explicitly requested; please install faad dev files and run configure again" "$LINENO" 5
+ fi
 fi
 
 
@@ -10525,12 +10487,13 @@
 if test "${enable_sndfile+set}" = set; then :
 enableval=$enable_sndfile; enable_sndfile=$enableval
 else
- enable_sndfile=yes
+ enable_sndfile=auto
 
 fi
 
 
-if test "x$enable_sndfile" = "xyes"; then
+have_sndfile=no
+if test "x$enable_sndfile" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5
@@ -10590,28 +10553,28 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$SNDFILE_PKG_ERRORS" >&5
 
-	enable_sndfile=no
+	if test "x$enable_sndfile" = "xyes"; then
+ as_fn_error $? "Cannot find libsndfile development files (ver >= 0.19), but compilation of libsndfile extensions has been explicitly requested; please install libsndfile dev files and run configure again" "$LINENO" 5
+ fi
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	enable_sndfile=no
+	if test "x$enable_sndfile" = "xyes"; then
+ as_fn_error $? "Cannot find libsndfile development files (ver >= 0.19), but compilation of libsndfile extensions has been explicitly requested; please install libsndfile dev files and run configure again" "$LINENO" 5
+ fi
 
 else
 	SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
 	SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_sndfile=yes
+	have_sndfile=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS sndfile"
 fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** libsndfile extensions disabled per user request ***" >&5
 $as_echo "*** libsndfile extensions disabled per user request ***" >&6; }
- enable_sndfile=no
-fi
-
-if test "x$enable_sndfile" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS sndfile"
 fi
 
 
@@ -10619,12 +10582,13 @@
 if test "${enable_modplug+set}" = set; then :
 enableval=$enable_modplug; enable_modplug=$enableval
 else
- enable_modplug="yes"
+ enable_modplug=auto
 
 fi
 
 
-if test $enable_modplug = yes ; then
+have_modplug=no
+if test "x$enable_modplug" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MODPLUG" >&5
@@ -10684,15 +10648,17 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$MODPLUG_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libmodplug; modplug plugin disabled ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find libmodplug; modplug plugin disabled ***" >&2;}
- have_modplug=no
+	if test "x$enable_modplug" = "xyes"; then
+ as_fn_error $? "Cannot find libmodplug development files, but compilation of ModPlug plugin has been explicitly requested; please install libmodplug dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libmodplug; modplug plugin disabled ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find libmodplug; modplug plugin disabled ***" >&2;}
- have_modplug=no
+	if test "x$enable_modplug" = "xyes"; then
+ as_fn_error $? "Cannot find libmodplug development files, but compilation of ModPlug plugin has been explicitly requested; please install libmodplug dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	MODPLUG_CFLAGS=$pkg_cv_MODPLUG_CFLAGS
 	MODPLUG_LIBS=$pkg_cv_MODPLUG_LIBS
@@ -10704,17 +10670,17 @@
 fi
 
 
-have_ffaudio="no"
 # Check whether --enable-ffaudio was given.
 if test "${enable_ffaudio+set}" = set; then :
 enableval=$enable_ffaudio; enable_ffaudio=$enableval
 else
- enable_ffaudio="yes"
+ enable_ffaudio=auto
 
 fi
 
 
-if test $enable_ffaudio = yes ; then
+have_ffaudio=no
+if test "x$enable_ffaudio" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5
@@ -10774,34 +10740,38 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$FFMPEG_PKG_ERRORS" >&5
 
-	have_ffaudio=no
+	if test "x$enable_ffaudio" = "xyes"; then
+ as_fn_error $? "Cannot find FFmpeg development files (libavcodec ver >= 53.40.0, libavformat ver >= 53.5.0, libavutil ver >= 50.42.0), but compilation of ffaudio plugin has been explicitly requested; please install FFmpeg dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_ffaudio=no
+	if test "x$enable_ffaudio" = "xyes"; then
+ as_fn_error $? "Cannot find FFmpeg development files (libavcodec ver >= 53.40.0, libavformat ver >= 53.5.0, libavutil ver >= 50.42.0), but compilation of ffaudio plugin has been explicitly requested; please install FFmpeg dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	FFMPEG_CFLAGS=$pkg_cv_FFMPEG_CFLAGS
 	FFMPEG_LIBS=$pkg_cv_FFMPEG_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_ffaudio=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
 fi
 fi
 
-if test "x$have_ffaudio" = "xyes"; then
- INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
-fi
-
 
 # Check whether --enable-jack was given.
 if test "${enable_jack+set}" = set; then :
 enableval=$enable_jack; enable_jack=$enableval
 else
- enable_jack=yes
+ enable_jack=auto
 fi
 
 
-if test $enable_jack = yes ; then
+have_jack=no
+if test "x$enable_jack" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
@@ -10862,7 +10832,6 @@
 	echo "$JACK_PKG_ERRORS" >&5
 
 
-
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
 $as_echo_n "checking for JACK... " >&6; }
@@ -10921,24 +10890,23 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$JACK_PKG_ERRORS" >&5
 
-	enable_jack=no
+	have_jack=no
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	enable_jack=no
+	have_jack=no
 else
 	JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
 	JACK_LIBS=$pkg_cv_JACK_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_jack=$enable_jack
+	have_jack=yes
 fi
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
-
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
 $as_echo_n "checking for JACK... " >&6; }
@@ -10997,17 +10965,17 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$JACK_PKG_ERRORS" >&5
 
-	enable_jack=no
+	have_jack=no
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	enable_jack=no
+	have_jack=no
 else
 	JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
 	JACK_LIBS=$pkg_cv_JACK_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_jack=$enable_jack
+	have_jack=yes
 fi
 
 else
@@ -11015,9 +10983,10 @@
 	JACK_LIBS=$pkg_cv_JACK_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_jack=$enable_jack
+	have_jack=yes
 fi
 
+ if test "x$have_jack" = "xyes"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5
@@ -11077,1339 +11046,134 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$SAMPLERATE_PKG_ERRORS" >&5
 
-	enable_jack=no
+	have_jack=no
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	enable_jack=no
+	have_jack=no
+
 else
 	SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
 	SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_jack=$enable_jack
+
 fi
+ fi
 
- if test $enable_jack = yes ; then
+ if test "x$have_jack" = "xyes"; then
 OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** JACK or libsamplerate not found; JACK output plugin disabled" >&5
-$as_echo "*** JACK or libsamplerate not found; JACK output plugin disabled" >&6; }
+ elif test "x$enable_jack" = "xyes"; then
+ as_fn_error $? "Cannot find JACK (ver >= 0.120.1 but < 1.0 or >= 1.9.7) or libsamplerate development files, but compilation of JACK output plugin has been explicitly requested; please install JACK and libsamplerate dev files and run configure again" "$LINENO" 5
 fi
 fi
 
 # Check whether --enable-sid was given.
 if test "${enable_sid+set}" = set; then :
- enableval=$enable_sid;
-else
- enable_sid="yes"
-fi
-
-
-if test "x$enable_sid" = "xyes"; then
-
-
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
+ enableval=$enable_sid; enable_sid=$enableval
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ enable_sid=auto
 fi
 
 
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
- if ${ac_cv_prog_CXXCPP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CXXCPP needs to be expanded
- for CXXCPP in "$CXX -E" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		 Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+have_sidplay=no
+if test "x$enable_sid" != "xno"; then
 
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
- break
-fi
-
- done
- ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
- CXXCPP=$ac_cv_prog_CXXCPP
-else
- ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
- # Use a header file that comes with gcc, so configuring glibc
- # with a fresh cross-compiler works.
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- # <limits.h> exists even on freestanding compilers.
- # On the NeXT, cc -E runs the code through the compiler's parser,
- # not just through cpp. "Syntax error" is here to catch this case.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		 Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
- # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
- # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
-fi
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-# xs_arg_with ( sidplay1:libSIDPlay1:XS_PATH_LIBSIDPLAY1 )
-
-# Check whether --with-sidplay1 was given.
-if test "${with_sidplay1+set}" = set; then :
- withval=$with_sidplay1; if test "x$withval" = "xyes"; then
- xs_use_sidplay1="yes"
- xs_sidplay1_library=""
- xs_sidplay1_includes=""
- else
- if test "x$withval" = "xno"; then
- xs_use_sidplay1="no"
- else
- xs_use_sidplay1="yes"
- xs_sidplay1_includes="$withval/include"
- xs_sidplay1_library="$withval/lib"
- fi
- fi
-
-else
- xs_use_sidplay1="try"
- xs_sidplay1_library=""
- xs_sidplay1_includes=""
-
-fi
-
-# Check whether --with-sidplay1-inc was given.
-if test "${with_sidplay1_inc+set}" = set; then :
- withval=$with_sidplay1_inc; xs_sidplay1_includes="$withval"
-fi
-
-# Check whether --with-sidplay1-lib was given.
-if test "${with_sidplay1_lib+set}" = set; then :
- withval=$with_sidplay1_lib; xs_sidplay1_library="$withval"
-fi
-
- xs_have_sidplay1="no"
- if test "x$xs_use_sidplay1" = "xtry"; then
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working SIDPlay1 library and headers" >&5
-$as_echo_n "checking for working SIDPlay1 library and headers... " >&6; }
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
- if test "x$xs_sidplay1_includes" != "x"; then
- xs_sidplay1_cxxflags="-I$xs_sidplay1_includes"
- else
- xs_sidplay1_cxxflags=""
- fi
-
- if test "x$xs_sidplay1_library" != "x"; then
- xs_sidplay1_ldflags="-L$xs_sidplay1_library"
- else
- xs_sidplay1_ldflags=""
- fi
-
- if ${xs_cv_have_sidplay1+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
-
-
-# xs_try_library ( sidplay1:$xs_sidplay1_cxxflags:$xs_sidplay1_ldflags:sidplay:sidplay/sidtune.h:sidTune* myTest = new sidTune(0); )
-
- xs_cxxflags_save="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $xs_sidplay1_cxxflags"
- xs_ldflags_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS $xs_sidplay1_ldflags"
- xs_libs_save="$LIBS"
- LIBS="$LIBS -lsidplay"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <sidplay/sidtune.h>
-int
-main ()
-{
-sidTune* myTest = new sidTune(0);
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- xs_sidplay1_works="yes"
-else
- xs_sidplay1_works="no"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$xs_cxxflags_save"
- LDFLAGS="$xs_ldflags_save"
- LIBS="$xs_libs_save"
-
-
- if test "x$xs_sidplay1_works" = "xyes"; then
- xs_cv_have_sidplay1="xs_have_sidplay1=yes \
- xs_sidplay1_cxxflags=\"$xs_sidplay1_cxxflags\" \
- xs_sidplay1_ldflags=\"$xs_sidplay1_ldflags\" "
- else
-
-
- xs_sidplay1_includes=""
- for i in $xs_sidplay1_includes /usr/include /usr/local/include /usr/lib/sidplay/include /usr/local/lib/sidplay/include /opt/sfw/include /opt/csw/include; do
- for j in sidplay/sidtune.h; do
- if test -r "$i/$j"; then
- xs_sidplay1_includes="$i"
- break 2
- fi
- done
- done
-
-
-
- xs_sidplay1_library=""
- for i in $xs_sidplay1_library /usr/lib /usr/lib/sidplay /usr/local/lib/sidplay /opt/sfw/lib /opt/csw/lib; do
- for j in libsidplay.a libsidplay.so libsidplay.so.1 libsidplay.so.1.36 libsidplay.so.1.37; do
- if test -r "$i/$j"; then
- xs_sidplay1_library="$i"
- break 2
- fi
- done
- done
-
-
- if test "x$xs_sidplay1_includes" = "x" || test "x$xs_sidplay1_library" = "x"; then
- xs_cv_have_sidplay1="xs_have_sidplay1=no \
- xs_sidplay1_ldflags=\"\" xs_sidplay1_cxxflags=\"\" "
- else
- xs_sidplay1_ldflags="-L$xs_sidplay1_library"
- xs_sidplay1_cxxflags="-I$xs_sidplay1_includes"
-
-
-# xs_try_library ( sidplay1:$xs_sidplay1_cxxflags:$xs_sidplay1_ldflags:sidplay:sidplay/sidtune.h:sidTune* myTest = new sidTune(0); )
-
- xs_cxxflags_save="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $xs_sidplay1_cxxflags"
- xs_ldflags_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS $xs_sidplay1_ldflags"
- xs_libs_save="$LIBS"
- LIBS="$LIBS -lsidplay"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <sidplay/sidtune.h>
-int
-main ()
-{
-sidTune* myTest = new sidTune(0);
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIDPLAYFP" >&5
+$as_echo_n "checking for SIDPLAYFP... " >&6; }
 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- xs_sidplay1_works="yes"
+if test -n "$SIDPLAYFP_CFLAGS"; then
+ pkg_cv_SIDPLAYFP_CFLAGS="$SIDPLAYFP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsidplayfp >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libsidplayfp >= 1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SIDPLAYFP_CFLAGS=`$PKG_CONFIG --cflags "libsidplayfp >= 1.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- xs_sidplay1_works="no"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$xs_cxxflags_save"
- LDFLAGS="$xs_ldflags_save"
- LIBS="$xs_libs_save"
-
-
- xs_cv_have_sidplay1="xs_have_sidplay1=$xs_sidplay1_works \
- xs_sidplay1_ldflags=\"$xs_sidplay1_ldflags\" \
- xs_sidplay1_cxxflags=\"$xs_sidplay1_cxxflags\" "
- fi
-
- fi
-
+ pkg_failed=yes
 fi
-
- eval "$xs_cv_have_sidplay1"
-
-# xs_lib_result ( sidplay1:-lsidplay: )
- if test "x$xs_have_sidplay1" = "xyes"; then
- if test "x$xs_sidplay1_cxxflags" != "x" || test "x$xs_sidplay1_ldflags" != "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xs_sidplay1_cxxflags -lsidplay $xs_sidplay1_ldflags " >&5
-$as_echo "$xs_sidplay1_cxxflags -lsidplay $xs_sidplay1_ldflags " >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- fi
-
- SIDPLAY1_LIBS="$xs_sidplay1_ldflags -lsidplay"
- SIDPLAY1_CFLAGS="$xs_sidplay1_cxxflags "
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- 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
-
-
- elif test "x$xs_use_sidplay1" = "xyes"; then
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working SIDPlay1 library and headers" >&5
-$as_echo_n "checking for working SIDPlay1 library and headers... " >&6; }
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
- if test "x$xs_sidplay1_includes" != "x"; then
- xs_sidplay1_cxxflags="-I$xs_sidplay1_includes"
- else
- xs_sidplay1_cxxflags=""
- fi
-
- if test "x$xs_sidplay1_library" != "x"; then
- xs_sidplay1_ldflags="-L$xs_sidplay1_library"
- else
- xs_sidplay1_ldflags=""
- fi
-
- if ${xs_cv_have_sidplay1+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
-
-
-# xs_try_library ( sidplay1:$xs_sidplay1_cxxflags:$xs_sidplay1_ldflags:sidplay:sidplay/sidtune.h:sidTune* myTest = new sidTune(0); )
-
- xs_cxxflags_save="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $xs_sidplay1_cxxflags"
- xs_ldflags_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS $xs_sidplay1_ldflags"
- xs_libs_save="$LIBS"
- LIBS="$LIBS -lsidplay"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <sidplay/sidtune.h>
-int
-main ()
-{
-sidTune* myTest = new sidTune(0);
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- xs_sidplay1_works="yes"
-else
- xs_sidplay1_works="no"
-
+ else
+ pkg_failed=untried
 fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$xs_cxxflags_save"
- LDFLAGS="$xs_ldflags_save"
- LIBS="$xs_libs_save"
-
-
- if test "x$xs_sidplay1_works" = "xyes"; then
- xs_cv_have_sidplay1="xs_have_sidplay1=yes \
- xs_sidplay1_cxxflags=\"$xs_sidplay1_cxxflags\" \
- xs_sidplay1_ldflags=\"$xs_sidplay1_ldflags\" "
- else
-
-
- xs_sidplay1_includes=""
- for i in $xs_sidplay1_includes /usr/include /usr/local/include /usr/lib/sidplay/include /usr/local/lib/sidplay/include /opt/sfw/include /opt/csw/include; do
- for j in sidplay/sidtune.h; do
- if test -r "$i/$j"; then
- xs_sidplay1_includes="$i"
- break 2
- fi
- done
- done
-
-
-
- xs_sidplay1_library=""
- for i in $xs_sidplay1_library /usr/lib /usr/lib/sidplay /usr/local/lib/sidplay /opt/sfw/lib /opt/csw/lib; do
- for j in libsidplay.a libsidplay.so libsidplay.so.1 libsidplay.so.1.36 libsidplay.so.1.37; do
- if test -r "$i/$j"; then
- xs_sidplay1_library="$i"
- break 2
- fi
- done
- done
-
-
- if test "x$xs_sidplay1_includes" = "x" || test "x$xs_sidplay1_library" = "x"; then
- xs_cv_have_sidplay1="xs_have_sidplay1=no \
- xs_sidplay1_ldflags=\"\" xs_sidplay1_cxxflags=\"\" "
- else
- xs_sidplay1_ldflags="-L$xs_sidplay1_library"
- xs_sidplay1_cxxflags="-I$xs_sidplay1_includes"
-
-
-# xs_try_library ( sidplay1:$xs_sidplay1_cxxflags:$xs_sidplay1_ldflags:sidplay:sidplay/sidtune.h:sidTune* myTest = new sidTune(0); )
-
- xs_cxxflags_save="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $xs_sidplay1_cxxflags"
- xs_ldflags_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS $xs_sidplay1_ldflags"
- xs_libs_save="$LIBS"
- LIBS="$LIBS -lsidplay"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <sidplay/sidtune.h>
-int
-main ()
-{
-sidTune* myTest = new sidTune(0);
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- xs_sidplay1_works="yes"
+if test -n "$SIDPLAYFP_LIBS"; then
+ pkg_cv_SIDPLAYFP_LIBS="$SIDPLAYFP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsidplayfp >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libsidplayfp >= 1.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SIDPLAYFP_LIBS=`$PKG_CONFIG --libs "libsidplayfp >= 1.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- xs_sidplay1_works="no"
-
+ pkg_failed=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$xs_cxxflags_save"
- LDFLAGS="$xs_ldflags_save"
- LIBS="$xs_libs_save"
-
-
- xs_cv_have_sidplay1="xs_have_sidplay1=$xs_sidplay1_works \
- xs_sidplay1_ldflags=\"$xs_sidplay1_ldflags\" \
- xs_sidplay1_cxxflags=\"$xs_sidplay1_cxxflags\" "
- fi
-
- fi
-
+ else
+ pkg_failed=untried
 fi
 
- eval "$xs_cv_have_sidplay1"
 
-# xs_lib_result ( sidplay1:-lsidplay: )
- if test "x$xs_have_sidplay1" = "xyes"; then
- if test "x$xs_sidplay1_cxxflags" != "x" || test "x$xs_sidplay1_ldflags" != "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xs_sidplay1_cxxflags -lsidplay $xs_sidplay1_ldflags " >&5
-$as_echo "$xs_sidplay1_cxxflags -lsidplay $xs_sidplay1_ldflags " >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- fi
 
- SIDPLAY1_LIBS="$xs_sidplay1_ldflags -lsidplay"
- SIDPLAY1_CFLAGS="$xs_sidplay1_cxxflags "
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+if test $pkg_failed = yes; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
- 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
-
-
- if test "x$xs_have_sidplay1" = "xno"; then
- as_fn_error $? "libSIDPlay1 library and/or headers were not found!" "$LINENO" 5
- fi
- fi
-
-if test "x$xs_have_sidplay1" = "xyes"; then
-	$as_echo "#define HAVE_SIDPLAY1 1" >>confdefs.h
-
-fi
-
-# xs_arg_with ( sidplay2:libSIDPlay2:XS_PATH_LIBSIDPLAY2 )
-
-# Check whether --with-sidplay2 was given.
-if test "${with_sidplay2+set}" = set; then :
- withval=$with_sidplay2; if test "x$withval" = "xyes"; then
- xs_use_sidplay2="yes"
- xs_sidplay2_library=""
- xs_sidplay2_includes=""
- else
- if test "x$withval" = "xno"; then
- xs_use_sidplay2="no"
- else
- xs_use_sidplay2="yes"
- xs_sidplay2_includes="$withval/include"
- xs_sidplay2_library="$withval/lib"
- fi
- fi
-
-else
- xs_use_sidplay2="try"
- xs_sidplay2_library=""
- xs_sidplay2_includes=""
-
-fi
-
-# Check whether --with-sidplay2-inc was given.
-if test "${with_sidplay2_inc+set}" = set; then :
- withval=$with_sidplay2_inc; xs_sidplay2_includes="$withval"
-fi
-
-# Check whether --with-sidplay2-lib was given.
-if test "${with_sidplay2_lib+set}" = set; then :
- withval=$with_sidplay2_lib; xs_sidplay2_library="$withval"
-fi
-
- xs_have_sidplay2="no"
- if test "x$xs_use_sidplay2" = "xtry"; then
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working SIDPlay2 library and headers" >&5
-$as_echo_n "checking for working SIDPlay2 library and headers... " >&6; }
 
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
- if test "x$PKG_CONFIG" != "x" && $PKG_CONFIG --atleast-version 2.1.0 libsidplay2; then
- xs_pkgcfg_knows="yes"
- else
- xs_pkgcfg_knows="no"
- fi
-
- if test "x$xs_sidplay2_library" != "x"; then
- xs_sidplay2_builders="$xs_sidplay2_library/sidplay/builders"
- elif test "x$xs_pkgcfg_knows" = "xyes" ; then
- xs_sidplay2_builders=`$PKG_CONFIG --variable=builders libsidplay2`
- fi
-
- if ${xs_cv_have_sidplay2+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- xs_sidplay2_ldflags="-lsidplay2"
-
-
-# xs_try_library ( sidplay2:$xs_sidplay2_cxxflags -DHAVE_UNIX:$xs_sidplay2_ldflags:sidplay2:sidplay/sidplay2.h:sidplay2 *myEngine; )
-
- xs_cxxflags_save="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $xs_sidplay2_cxxflags -DHAVE_UNIX"
- xs_ldflags_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS $xs_sidplay2_ldflags"
- xs_libs_save="$LIBS"
- LIBS="$LIBS -lsidplay2"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <sidplay/sidplay2.h>
-int
-main ()
-{
-sidplay2 *myEngine;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- xs_sidplay2_works="yes"
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
 else
- xs_sidplay2_works="no"
-
+ _pkg_short_errors_supported=no
 fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$xs_cxxflags_save"
- LDFLAGS="$xs_ldflags_save"
- LIBS="$xs_libs_save"
-
-
- if test "x$xs_sidplay2_works" = "xyes"; then
- xs_cv_have_sidplay2="xs_have_sidplay2=yes \
- xs_sidplay2_cxxflags=\"$xs_sidplay2_cxxflags\" \
- xs_sidplay2_ldflags=\"$xs_sidplay2_ldflags\" \
- xs_sidplay2_builders=\"$xs_sidplay2_builders\" "
- else
-
- if test "x$xs_sidplay2_includes" = "x"; then
- if test "x$xs_pkgcfg_knows" = "xyes" ; then
- xs_sidplay2_includes=`$PKG_CONFIG --variable=includedir libsidplay2`
- xs_sidplay2_cxxflags=`$PKG_CONFIG --cflags libsidplay2`
- else
-
- xs_sidplay2_includes=""
- for i in $xs_sidplay2_includes $xs_sidplay2_includes/include /usr/include /usr/local/include /usr/lib/sidplay/include /usr/local/lib/sidplay/include /opt/sfw/include /opt/csw/include; do
- for j in sidplay/sidplay2.h; do
- if test -r "$i/$j"; then
- xs_sidplay2_includes="$i"
- break 2
- fi
- done
- done
-
- xs_sidplay2_cxxflags="-I$xs_sidplay2_includes"
- fi
- else
- xs_sidplay2_cxxflags="-I$xs_sidplay2_includes"
- fi
- if test "x$xs_sidplay2_library" = "x"; then
- if test "x$xs_pkgcfg_knows" = "xyes" ; then
- xs_sidplay2_library=`$PKG_CONFIG --variable=libdir libsidplay2`
- xs_sidplay2_ldflags=`$PKG_CONFIG --libs libsidplay2`
- xs_sidplay2_builders=`$PKG_CONFIG --variable=builders libsidplay2`
+ if test $_pkg_short_errors_supported = yes; then
+	 SIDPLAYFP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsidplayfp >= 1.0" 2>&1`
 else
-
- xs_sidplay2_library=""
- for i in $xs_sidplay2_library $xs_sidplay2_library/lib $xs_sidplay2_library/src /usr/lib /usr/lib/sidplay /usr/local/lib/sidplay /opt/sfw/lib /opt/csw/lib; do
- for j in libsidplay2.la; do
- if test -r "$i/$j"; then
- xs_sidplay2_library="$i"
- break 2
- fi
- done
- done
-
- xs_sidplay2_ldflags="-L$xs_sidplay2_library -lsidplay2"
- xs_sidplay2_builders="$xs_sidplay2_library/sidplay/builders"
- fi
- else
- xs_sidplay2_ldflags="-L$xs_sidplay2_library -lsidplay2"
- fi
- if test "x$xs_sidplay2_includes" = "x" || test "x$xs_sidplay2_library" = "x"; then
- xs_cv_have_sidplay2="xs_have_sidplay2=no \
- xs_sidplay2_ldflags=\"\" xs_sidplay2_cxxflags=\"\" \
- xs_sidplay2_builders=\"\" "
- else
- xs_sidplay2_ldflags="-L$xs_sidplay2_library -lsidplay2"
- xs_sidplay2_cxxflags="-I$xs_sidplay2_includes"
-
-
-# xs_try_library ( sidplay2:$xs_sidplay2_cxxflags -DHAVE_UNIX:$xs_sidplay2_ldflags:sidplay2:sidplay/sidplay2.h:sidplay2 *myEngine; )
-
- xs_cxxflags_save="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $xs_sidplay2_cxxflags -DHAVE_UNIX"
- xs_ldflags_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS $xs_sidplay2_ldflags"
- xs_libs_save="$LIBS"
- LIBS="$LIBS -lsidplay2"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <sidplay/sidplay2.h>
-int
-main ()
-{
-sidplay2 *myEngine;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- xs_sidplay2_works="yes"
-else
- xs_sidplay2_works="no"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$xs_cxxflags_save"
- LDFLAGS="$xs_ldflags_save"
- LIBS="$xs_libs_save"
-
-
- xs_cv_have_sidplay2="xs_have_sidplay2=$xs_sidplay2_works \
- xs_sidplay2_ldflags=\"$xs_sidplay2_ldflags\" \
- xs_sidplay2_cxxflags=\"$xs_sidplay2_cxxflags\" \
- xs_sidplay2_builders=\"$xs_sidplay2_builders\" "
- fi
-
+	 SIDPLAYFP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsidplayfp >= 1.0" 2>&1`
 fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SIDPLAYFP_PKG_ERRORS" >&5
 
-fi
-
- eval "$xs_cv_have_sidplay2"
-
-# xs_lib_result ( sidplay2:: )
- if test "x$xs_have_sidplay2" = "xyes"; then
- if test "x$xs_sidplay2_cxxflags" != "x" || test "x$xs_sidplay2_ldflags" != "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xs_sidplay2_cxxflags $xs_sidplay2_ldflags " >&5
-$as_echo "$xs_sidplay2_cxxflags $xs_sidplay2_ldflags " >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- fi
+	if test "x$enable_sid" = "xyes"; then
+ as_fn_error $? "Cannot find sidplayfp, but compilation of SID input plugin has been explicitly requested; please install sidplayfp and run configure again" "$LINENO" 5
+ fi
 
- SIDPLAY2_LIBS="$xs_sidplay2_ldflags "
- SIDPLAY2_CFLAGS="$xs_sidplay2_cxxflags "
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
- fi
+	if test "x$enable_sid" = "xyes"; then
+ as_fn_error $? "Cannot find sidplayfp, but compilation of SID input plugin has been explicitly requested; please install sidplayfp and run configure again" "$LINENO" 5
+ 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
-
-
- elif test "x$xs_use_sidplay2" = "xyes"; then
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working SIDPlay2 library and headers" >&5
-$as_echo_n "checking for working SIDPlay2 library and headers... " >&6; }
-
- ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
- if test "x$PKG_CONFIG" != "x" && $PKG_CONFIG --atleast-version 2.1.0 libsidplay2; then
- xs_pkgcfg_knows="yes"
- else
- xs_pkgcfg_knows="no"
- fi
-
- if test "x$xs_sidplay2_library" != "x"; then
- xs_sidplay2_builders="$xs_sidplay2_library/sidplay/builders"
- elif test "x$xs_pkgcfg_knows" = "xyes" ; then
- xs_sidplay2_builders=`$PKG_CONFIG --variable=builders libsidplay2`
- fi
-
- if ${xs_cv_have_sidplay2+:} false; then :
- $as_echo_n "(cached) " >&6
 else
-
- xs_sidplay2_ldflags="-lsidplay2"
-
-
-# xs_try_library ( sidplay2:$xs_sidplay2_cxxflags -DHAVE_UNIX:$xs_sidplay2_ldflags:sidplay2:sidplay/sidplay2.h:sidplay2 *myEngine; )
-
- xs_cxxflags_save="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $xs_sidplay2_cxxflags -DHAVE_UNIX"
- xs_ldflags_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS $xs_sidplay2_ldflags"
- xs_libs_save="$LIBS"
- LIBS="$LIBS -lsidplay2"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <sidplay/sidplay2.h>
-int
-main ()
-{
-sidplay2 *myEngine;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- xs_sidplay2_works="yes"
-else
- xs_sidplay2_works="no"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$xs_cxxflags_save"
- LDFLAGS="$xs_ldflags_save"
- LIBS="$xs_libs_save"
-
-
- if test "x$xs_sidplay2_works" = "xyes"; then
- xs_cv_have_sidplay2="xs_have_sidplay2=yes \
- xs_sidplay2_cxxflags=\"$xs_sidplay2_cxxflags\" \
- xs_sidplay2_ldflags=\"$xs_sidplay2_ldflags\" \
- xs_sidplay2_builders=\"$xs_sidplay2_builders\" "
- else
-
- if test "x$xs_sidplay2_includes" = "x"; then
- if test "x$xs_pkgcfg_knows" = "xyes" ; then
- xs_sidplay2_includes=`$PKG_CONFIG --variable=includedir libsidplay2`
- xs_sidplay2_cxxflags=`$PKG_CONFIG --cflags libsidplay2`
- else
-
- xs_sidplay2_includes=""
- for i in $xs_sidplay2_includes $xs_sidplay2_includes/include /usr/include /usr/local/include /usr/lib/sidplay/include /usr/local/lib/sidplay/include /opt/sfw/include /opt/csw/include; do
- for j in sidplay/sidplay2.h; do
- if test -r "$i/$j"; then
- xs_sidplay2_includes="$i"
- break 2
- fi
- done
- done
-
- xs_sidplay2_cxxflags="-I$xs_sidplay2_includes"
- fi
- else
- xs_sidplay2_cxxflags="-I$xs_sidplay2_includes"
- fi
- if test "x$xs_sidplay2_library" = "x"; then
- if test "x$xs_pkgcfg_knows" = "xyes" ; then
- xs_sidplay2_library=`$PKG_CONFIG --variable=libdir libsidplay2`
- xs_sidplay2_ldflags=`$PKG_CONFIG --libs libsidplay2`
- xs_sidplay2_builders=`$PKG_CONFIG --variable=builders libsidplay2`
- else
-
- xs_sidplay2_library=""
- for i in $xs_sidplay2_library $xs_sidplay2_library/lib $xs_sidplay2_library/src /usr/lib /usr/lib/sidplay /usr/local/lib/sidplay /opt/sfw/lib /opt/csw/lib; do
- for j in libsidplay2.la; do
- if test -r "$i/$j"; then
- xs_sidplay2_library="$i"
- break 2
- fi
- done
- done
-
- xs_sidplay2_ldflags="-L$xs_sidplay2_library -lsidplay2"
- xs_sidplay2_builders="$xs_sidplay2_library/sidplay/builders"
- fi
- else
- xs_sidplay2_ldflags="-L$xs_sidplay2_library -lsidplay2"
- fi
- if test "x$xs_sidplay2_includes" = "x" || test "x$xs_sidplay2_library" = "x"; then
- xs_cv_have_sidplay2="xs_have_sidplay2=no \
- xs_sidplay2_ldflags=\"\" xs_sidplay2_cxxflags=\"\" \
- xs_sidplay2_builders=\"\" "
- else
- xs_sidplay2_ldflags="-L$xs_sidplay2_library -lsidplay2"
- xs_sidplay2_cxxflags="-I$xs_sidplay2_includes"
-
-
-# xs_try_library ( sidplay2:$xs_sidplay2_cxxflags -DHAVE_UNIX:$xs_sidplay2_ldflags:sidplay2:sidplay/sidplay2.h:sidplay2 *myEngine; )
-
- xs_cxxflags_save="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $xs_sidplay2_cxxflags -DHAVE_UNIX"
- xs_ldflags_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS $xs_sidplay2_ldflags"
- xs_libs_save="$LIBS"
- LIBS="$LIBS -lsidplay2"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <sidplay/sidplay2.h>
-int
-main ()
-{
-sidplay2 *myEngine;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- xs_sidplay2_works="yes"
-else
- xs_sidplay2_works="no"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$xs_cxxflags_save"
- LDFLAGS="$xs_ldflags_save"
- LIBS="$xs_libs_save"
-
-
- xs_cv_have_sidplay2="xs_have_sidplay2=$xs_sidplay2_works \
- xs_sidplay2_ldflags=\"$xs_sidplay2_ldflags\" \
- xs_sidplay2_cxxflags=\"$xs_sidplay2_cxxflags\" \
- xs_sidplay2_builders=\"$xs_sidplay2_builders\" "
- fi
-
- fi
-
-fi
-
- eval "$xs_cv_have_sidplay2"
-
-# xs_lib_result ( sidplay2:: )
- if test "x$xs_have_sidplay2" = "xyes"; then
- if test "x$xs_sidplay2_cxxflags" != "x" || test "x$xs_sidplay2_ldflags" != "x"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xs_sidplay2_cxxflags $xs_sidplay2_ldflags " >&5
-$as_echo "$xs_sidplay2_cxxflags $xs_sidplay2_ldflags " >&6; }
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+	SIDPLAYFP_CFLAGS=$pkg_cv_SIDPLAYFP_CFLAGS
+	SIDPLAYFP_LIBS=$pkg_cv_SIDPLAYFP_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
- fi
-
- SIDPLAY2_LIBS="$xs_sidplay2_ldflags "
- SIDPLAY2_CFLAGS="$xs_sidplay2_cxxflags "
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- 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
-
-
- if test "x$xs_have_sidplay2" = "xno"; then
- as_fn_error $? "libSIDPlay2 library and/or headers were not found!" "$LINENO" 5
- fi
- fi
-
-if test "x$xs_have_sidplay2" = "xyes"; then
-	$as_echo "#define HAVE_SIDPLAY2 1" >>confdefs.h
-
-	ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIDPlay2 builders directory" >&5
-$as_echo_n "checking for SIDPlay2 builders directory... " >&6; }
-
-
-
- builders_includedir="$xs_sidplay2_includes"
- builders_libdir="$xs_sidplay2_builders"
-
- if test "x$builders_libdir" = "x"; then
- eval "builders_libdir=$libdir/sidplay/builders"
- fi
-
-
-# Check whether --with-sidbuilders was given.
-if test "${with_sidbuilders+set}" = set; then :
- withval=$with_sidbuilders; builders_includedir="$withval/include"
- builders_libdir="$withval/lib/sidplay/builders"
-fi
-
-
-
-# Check whether --with-builders-inc was given.
-if test "${with_builders_inc+set}" = set; then :
- withval=$with_builders_inc; builders_includedir="$withval"
-fi
-
-
-
-# Check whether --with-builders-lib was given.
-if test "${with_builders_lib+set}" = set; then :
- withval=$with_builders_lib; builders_libdir="$withval"
-fi
-
-
- if test "x$builders_includedir" != "x"; then
- BUILDERS_CFLAGS="-I$builders_includedir"
- fi
-
- if test "x$builders_libdir" != "x"; then
- BUILDERS_LDFLAGS="-L$builders_libdir"
- fi
-
- if test -d "$builders_libdir"; then
- xs_have_sidbuilders_dir="yes"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $builders_libdir" >&5
-$as_echo "$builders_libdir" >&6; }
- else
- xs_have_sidbuilders_dir="no"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xs_have_sidbuilders_dir" >&5
-$as_echo "$xs_have_sidbuilders_dir" >&6; }
- as_fn_error $? "$builders_libdir not found!
-Check --help on how to specify SIDPlay2 and/or builders library and
-header path, or set --exec-prefix to the same prefix as your installation
-of libsidplay2.
- " "$LINENO" 5
- fi
-
-
-
-
- xs_builders_available="no"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for reSID builder module" >&5
-$as_echo_n "checking for reSID builder module... " >&6; }
-
-# xs_try_library ( builders:$BUILDERS_CFLAGS:$BUILDERS_LDFLAGS:resid-builder:sidplay/builders/resid.h:ReSIDBuilder *sid; )
-
- xs_cxxflags_save="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $BUILDERS_CFLAGS"
- xs_ldflags_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BUILDERS_LDFLAGS"
- xs_libs_save="$LIBS"
- LIBS="$LIBS -lresid-builder"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <sidplay/builders/resid.h>
-int
-main ()
-{
-ReSIDBuilder *sid;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- xs_builders_works="yes"
-else
- xs_builders_works="no"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$xs_cxxflags_save"
- LDFLAGS="$xs_ldflags_save"
- LIBS="$xs_libs_save"
-
- if test "x$xs_builders_works" = "xyes"; then
- xs_builders_available="yes"
- xs_builders="reSID $xs_builders"
- $as_echo "#define HAVE_RESID_BUILDER 1" >>confdefs.h
-
- BUILDERS_LIBS="$BUILDERS_LIBS -lresid-builder"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xs_builders_works" >&5
-$as_echo "$xs_builders_works" >&6; }
-
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for HardSID builder module" >&5
-$as_echo_n "checking for HardSID builder module... " >&6; }
-
-# xs_try_library ( builders:$BUILDERS_CFLAGS:$BUILDERS_LDFLAGS:hardsid-builder:sidplay/builders/hardsid.h:HardSIDBuilder *sid; )
-
- xs_cxxflags_save="$CXXFLAGS"
- CXXFLAGS="$CXXFLAGS $BUILDERS_CFLAGS"
- xs_ldflags_save="$LDFLAGS"
- LDFLAGS="$LDFLAGS $BUILDERS_LDFLAGS"
- xs_libs_save="$LIBS"
- LIBS="$LIBS -lhardsid-builder"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
- #include <sidplay/builders/hardsid.h>
-int
-main ()
-{
-HardSIDBuilder *sid;
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
- xs_builders_works="yes"
-else
- xs_builders_works="no"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- CXXFLAGS="$xs_cxxflags_save"
- LDFLAGS="$xs_ldflags_save"
- LIBS="$xs_libs_save"
-
- if test "x$xs_builders_works" = "xyes"; then
- xs_builders_available="yes"
- xs_builders="HardSID $xs_builders"
- $as_echo "#define HAVE_HARDSID_BUILDER 1" >>confdefs.h
-
- BUILDERS_LIBS="$BUILDERS_LIBS -lhardsid-builder"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $xs_builders_works" >&5
-$as_echo "$xs_builders_works" >&6; }
-
-
-	if test "x$xs_builders_available" = "xno"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No builder modules were found in the sidbuilders directory!" >&5
-$as_echo "$as_me: WARNING: No builder modules were found in the sidbuilders directory!" >&2;};
-		xs_have_sidplay2=no
-	fi
-fi
-
-if test "x$xs_have_sidplay2" = "xyes"; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libSIDPlay2 API style" >&5
-$as_echo_n "checking libSIDPlay2 API style... " >&6; }
-	tmp_CPPFLAGS="$CPPFLAGS"
-	if test -d "$xs_sidplay2_includes"; then
-		CPPFLAGS="$CPPFLAGS -I${xs_sidplay2_includes}"
-	fi
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sidplay/sidplay2.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "::Iid" >/dev/null 2>&1; then :
- xs_have_sidplay2_api="yes"
-else
-
-		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sidplay/sidplay2.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "SIDIID" >/dev/null 2>&1; then :
- xs_have_sidplay2_api="yes"
-else
- xs_have_sidplay2_api="(old style API)"
-fi
-rm -f conftest*
-
-
-
-fi
-rm -f conftest*
-
-	if test "x$xs_have_sidplay2_api" = "xyes"; then
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-		#include <sidplay/sidunknown.h>
-int
-main ()
-{
-ISidUnknown *i;
- ;
- return 0;
-}
-
-_ACEOF
-if ac_fn_cxx_try_link "$LINENO"; then :
-
-		xs_have_sidplay2_api="(new COMI style API)"
-
-$as_echo "#define HAVE_SIDPLAY2_COMI 1" >>confdefs.h
-
-
-else
-
-		xs_have_sidplay2_api="(broken version!)"
-
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xs_have_sidplay2_api" >&5
-$as_echo "$xs_have_sidplay2_api" >&6; }
-
-	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 libSIDPlay2+reSID distortion patch" >&5
-$as_echo_n "checking libSIDPlay2+reSID distortion patch... " >&6; }
-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sidplay/sidtypes.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "minimumfetresistance" >/dev/null 2>&1; then :
-
-		xs_have_distortion="yes"
-
-$as_echo "#define HAVE_SIDPLAY2_DISTORTION 1" >>confdefs.h
-
-
-else
-
-		xs_have_distortion="no"
-
-fi
-rm -f conftest*
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xs_have_distortion" >&5
-$as_echo "$xs_have_distortion" >&6; }
-	CPPFLAGS="$tmp_CPPFLAGS"
-fi
-
-if test "x$xs_have_sidplay1" = "xyes" || test "x$xs_have_sidplay2" = "xyes"; then
 	have_sidplay=yes
-
-	else have_sidplay=no
-
+ INPUT_PLUGINS="$INPUT_PLUGINS sid"
 fi
-
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** SID plugin disabled per user request ***" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** SID plugin disabled per user request ***" >&5
 $as_echo "*** SID plugin disabled per user request ***" >&6; }
- have_sidplay=no
-fi
-
-if test "x$have_sidplay" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS sid"
 fi
 
 
 # Check whether --enable-oss4 was given.
 if test "${enable_oss4+set}" = set; then :
- enableval=$enable_oss4; enable_oss4="$enableval"
+ enableval=$enable_oss4; enable_oss4=$enableval
 else
- enable_oss4="yes"
+ enable_oss4=auto
 fi
 
 
-OSS_CFLAGS=""
-
-if test "$enable_oss4" = "yes" ; then
+OSS_CFLAGS=
+have_oss4=no
+if test "x$enable_oss4" != "xno" ; then
 if test -f "/etc/oss.conf"; then
 . "/etc/oss.conf"
 OSS_CFLAGS="-I$OSSLIBDIR/include"
@@ -12446,35 +11210,35 @@
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 $EGREP "yes" >/dev/null 2>&1; then :
- enable_oss4="yes"
+ have_oss4=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
+
 else
- enable_oss4="no"
+ if test "x$enable_oss4" = "xyes"; then
+ as_fn_error $? "Cannot find OSS4 development files, but compilation of OSS4 output plugin has been explicitly requested; please install OSS4 dev files and run configure again" "$LINENO" 5
+ fi
+
 fi
 rm -f conftest*
 
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_oss4" >&5
-$as_echo "$enable_oss4" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_oss4" >&5
+$as_echo "$have_oss4" >&6; }
 CPPFLAGS="$OLD_CPPFLAGS"
 fi
 
 
-
-if test "$enable_oss4" = "yes"; then
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
-fi
-
-
 # Check whether --enable-alsa was given.
 if test "${enable_alsa+set}" = set; then :
 enableval=$enable_alsa; enable_alsa=$enableval
 else
- enable_alsa=yes
+ enable_alsa=auto
 
 fi
 
 
-if test "x$enable_alsa" = "xyes"; then
+have_alsa=no
+if test "x$enable_alsa" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
@@ -12534,26 +11298,26 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$ALSA_PKG_ERRORS" >&5
 
-	have_alsa=no
+	if test "x$enable_alsa" = "xyes"; then
+ as_fn_error $? "Cannot find ALSA development files (ver >= 1.0.16), but compilation of ALSA output plugin has been explicitly requested; please install ALSA dev files and run configure again" "$LINENO" 5
+ fi
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_alsa=no
+	if test "x$enable_alsa" = "xyes"; then
+ as_fn_error $? "Cannot find ALSA development files (ver >= 1.0.16), but compilation of ALSA output plugin has been explicitly requested; please install ALSA dev files and run configure again" "$LINENO" 5
+ fi
 else
 	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
 	ALSA_LIBS=$pkg_cv_ALSA_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_alsa=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS alsa"
 fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** ALSA output plugin disabled per user request ***" >&5
 $as_echo "*** ALSA output plugin disabled per user request ***" >&6; }
- have_alsa=no
-fi
-
-if test "x$have_alsa" = "xyes"; then
-	OUTPUT_PLUGINS="$OUTPUT_PLUGINS alsa"
 fi
 
 
@@ -12561,11 +11325,71 @@
 if test "${enable_sdlout+set}" = set; then :
 enableval=$enable_sdlout; enable_sdlout=$enableval
 else
- enable_sdlout=yes
+ enable_sdlout=auto
+fi
+
+
+have_sdlout=no
+if test "x$enable_sdlout" != "xno"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
+$as_echo_n "checking for SDL... " >&6; }
+
+if test -n "$SDL_CFLAGS"; then
+ pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= 2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sdl2 >= 2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= 2.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$SDL_LIBS"; then
+ pkg_cv_SDL_LIBS="$SDL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl2 >= 2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sdl2 >= 2.0") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= 2.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
 fi
 
 
-if test $enable_sdlout = yes ; then
+
+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
+	 SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl2 >= 2.0" 2>&1`
+ else
+	 SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl2 >= 2.0" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SDL_PKG_ERRORS" >&5
+
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
@@ -12625,45 +11449,127 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$SDL_PKG_ERRORS" >&5
 
-	enable_sdlout=no
+	if test "x$enable_sdlout" = "xyes"; then
+ as_fn_error $? "Cannot find SDL development files (ver >= 1.2.11), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again" "$LINENO" 5
+ fi
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	enable_sdlout=no
+	if test "x$enable_sdlout" = "xyes"; then
+ as_fn_error $? "Cannot find SDL development files (ver >= 1.2.11), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again" "$LINENO" 5
+ fi
 else
 	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
 	SDL_LIBS=$pkg_cv_SDL_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_sdlout=yes
+	have_sdlout=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"
 fi
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
+$as_echo_n "checking for SDL... " >&6; }
+
+if test -n "$SDL_CFLAGS"; then
+ pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.11\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.11") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.11" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
 fi
+if test -n "$SDL_LIBS"; then
+ pkg_cv_SDL_LIBS="$SDL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sdl >= 1.2.11\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sdl >= 1.2.11") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.11" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
 
-if test $enable_sdlout = yes ; then
-	OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"
+
+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
+	 SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.11" 2>&1`
+ else
+	 SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= 1.2.11" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SDL_PKG_ERRORS" >&5
+
+	if test "x$enable_sdlout" = "xyes"; then
+ as_fn_error $? "Cannot find SDL development files (ver >= 1.2.11), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again" "$LINENO" 5
+ fi
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	if test "x$enable_sdlout" = "xyes"; then
+ as_fn_error $? "Cannot find SDL development files (ver >= 1.2.11), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again" "$LINENO" 5
+ fi
+else
+	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+	SDL_LIBS=$pkg_cv_SDL_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_sdlout=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"
+fi
+else
+	SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+	SDL_LIBS=$pkg_cv_SDL_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_sdlout=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"
+fi
 fi
 
 
 # Check whether --enable-sndio was given.
 if test "${enable_sndio+set}" = set; then :
- enableval=$enable_sndio; have_sndio=$enableval
+ enableval=$enable_sndio; enable_sndio=$enableval
 else
- have_sndio=yes
+ enable_sndio=auto
 
 fi
 
 
-if test "x$have_sndio" = "xyes"; then
+have_sndio=no
+if test "x$enable_sndio" != "xno"; then
 ac_fn_c_check_header_mongrel "$LINENO" "sndio.h" "ac_cv_header_sndio_h" "$ac_includes_default"
 if test "x$ac_cv_header_sndio_h" = xyes; then :
-
-else
- have_sndio=no
-fi
-
-
- if test x$have_sndio = xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sio_open in -lsndio" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sio_open in -lsndio" >&5
 $as_echo_n "checking for sio_open in -lsndio... " >&6; }
 if ${ac_cv_lib_sndio_sio_open+:} false; then :
 $as_echo_n "(cached) " >&6
@@ -12700,18 +11606,21 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sndio_sio_open" >&5
 $as_echo "$ac_cv_lib_sndio_sio_open" >&6; }
 if test "x$ac_cv_lib_sndio_sio_open" = xyes; then :
- haves_sndio=yes
-else
- have_sndio=no
+ have_sndio=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio"
+ SNDIO_LIBS="-lsndio"
+
+
 fi
 
- fi
+
 fi
 
-if test "x$have_sndio" = "xyes"; then
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio"
- SNDIO_LIBS="-lsndio"
 
+
+ if test "x$enable_sndio" = "xyes" -a "x$have_sndio" != "xyes"; then
+ as_fn_error $? "Cannot find sndio development files, but compilation of sndio output plugin has been explicitly requested; please install sndio dev files and run configure again" "$LINENO" 5
+ fi
 fi
 
 
@@ -12996,12 +11905,13 @@
 if test "${enable_cdaudio+set}" = set; then :
 enableval=$enable_cdaudio; enable_cdaudio_ng=$enableval
 else
- enable_cdaudio_ng=yes
+ enable_cdaudio_ng=auto
 
 fi
 
 
-if test "$enable_cdaudio_ng" = "yes"; then
+have_cdaudio_ng=no
+if test "x$enable_cdaudio_ng" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDIO" >&5
@@ -13011,12 +11921,12 @@
 pkg_cv_CDIO_CFLAGS="$CDIO_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= 0.70\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcdio >= 0.70") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= 0.70 libcdio_cdda >= 0.70\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcdio >= 0.70 libcdio_cdda >= 0.70") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_CDIO_CFLAGS=`$PKG_CONFIG --cflags "libcdio >= 0.70" 2>/dev/null`
+ pkg_cv_CDIO_CFLAGS=`$PKG_CONFIG --cflags "libcdio >= 0.70 libcdio_cdda >= 0.70" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13028,12 +11938,12 @@
 pkg_cv_CDIO_LIBS="$CDIO_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= 0.70\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcdio >= 0.70") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= 0.70 libcdio_cdda >= 0.70\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcdio >= 0.70 libcdio_cdda >= 0.70") 2>&5
 ac_status=$?
 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_CDIO_LIBS=`$PKG_CONFIG --libs "libcdio >= 0.70" 2>/dev/null`
+ pkg_cv_CDIO_LIBS=`$PKG_CONFIG --libs "libcdio >= 0.70 libcdio_cdda >= 0.70" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13054,117 +11964,27 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 CDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcdio >= 0.70" 2>&1`
+	 CDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcdio >= 0.70 libcdio_cdda >= 0.70" 2>&1`
 else
-	 CDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcdio >= 0.70" 2>&1`
+	 CDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcdio >= 0.70 libcdio_cdda >= 0.70" 2>&1`
 fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CDIO_PKG_ERRORS" >&5
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***" >&5
 $as_echo "$as_me: WARNING: *** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***" >&2;}
- enable_cdaudio_ng=no
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***" >&5
 $as_echo "$as_me: WARNING: *** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***" >&2;}
- enable_cdaudio_ng=no
-
-else
-	CDIO_CFLAGS=$pkg_cv_CDIO_CFLAGS
-	CDIO_LIBS=$pkg_cv_CDIO_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-fi
-
-if test "$enable_cdaudio_ng" = "yes"; then
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDIO" >&5
-$as_echo_n "checking for CDIO... " >&6; }
-
-if test -n "$CDIO_CFLAGS"; then
- pkg_cv_CDIO_CFLAGS="$CDIO_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio_cdda >= 0.70\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcdio_cdda >= 0.70") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_CDIO_CFLAGS=`$PKG_CONFIG --cflags "libcdio_cdda >= 0.70" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$CDIO_LIBS"; then
- pkg_cv_CDIO_LIBS="$CDIO_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio_cdda >= 0.70\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcdio_cdda >= 0.70") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_CDIO_LIBS=`$PKG_CONFIG --libs "libcdio_cdda >= 0.70" 2>/dev/null`
-		 test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-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
-	 CDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcdio_cdda >= 0.70" 2>&1`
- else
-	 CDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcdio_cdda >= 0.70" 2>&1`
- fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CDIO_PKG_ERRORS" >&5
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libcdio_cdda 0.70 or newer, cdaudio-ng will not be built ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find libcdio_cdda 0.70 or newer, cdaudio-ng will not be built ***" >&2;}
- enable_cdaudio_ng=no
-
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libcdio_cdda 0.70 or newer, cdaudio-ng will not be built ***" >&5
-$as_echo "$as_me: WARNING: *** Cannot find libcdio_cdda 0.70 or newer, cdaudio-ng will not be built ***" >&2;}
- enable_cdaudio_ng=no
 
 else
 	CDIO_CFLAGS=$pkg_cv_CDIO_CFLAGS
 	CDIO_LIBS=$pkg_cv_CDIO_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	CDIO_LIBS=`pkg-config --libs libcdio_cdda`
- CDIO_CFLAGS=`pkg-config --cflags libcdio_cdda`
-
-
-fi
-fi
-
-if test "$enable_cdaudio_ng" = "yes"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDDB" >&5
@@ -13226,40 +12046,44 @@
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libcddb 1.2.1 or newer, cdaudio-ng will not be built ***" >&5
 $as_echo "$as_me: WARNING: *** Cannot find libcddb 1.2.1 or newer, cdaudio-ng will not be built ***" >&2;}
- enable_cdaudio_ng=no
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Cannot find libcddb 1.2.1 or newer, cdaudio-ng will not be built ***" >&5
 $as_echo "$as_me: WARNING: *** Cannot find libcddb 1.2.1 or newer, cdaudio-ng will not be built ***" >&2;}
- enable_cdaudio_ng=no
 
 else
 	CDDB_CFLAGS=$pkg_cv_CDDB_CFLAGS
 	CDDB_LIBS=$pkg_cv_CDDB_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	INPUT_PLUGINS="$INPUT_PLUGINS cdaudio-ng"
- GENERAL_PLUGINS="$GENERAL_PLUGINS cd-menu-items"
- CDDB_LIBS=`pkg-config --libs libcddb`
- CDDB_CFLAGS=`pkg-config --cflags libcddb`
+	have_cdaudio_ng=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS cdaudio-ng"
+ GENERAL_PLUGINS="$GENERAL_PLUGINS cd-menu-items"
+
+
 
 
 fi
 fi
 
+ if test "x$enable_cdaudio_ng" = "xyes" -a "x$have_cdaudio_ng" != "xyes"; then
+ as_fn_error $? "Compilation of cdaudio-ng input plugin has been explicitly requested; please install required dev files and run configure again" "$LINENO" 5
+ fi
+fi
 
 
-# Check whether --enable-scrobbler was given.
-if test "${enable_scrobbler+set}" = set; then :
- enableval=$enable_scrobbler; have_scrobbler=$enableval
+# Check whether --enable-scrobbler2 was given.
+if test "${enable_scrobbler2+set}" = set; then :
+ enableval=$enable_scrobbler2; enable_scrobbler2=$enableval
 else
- have_scrobbler="yes"
+ enable_scrobbler2=auto
 fi
 
 
-if test "x$have_scrobbler" = "xyes"; then
+have_scrobbler2=no
+if test "x$enable_scrobbler2" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5
@@ -13319,36 +12143,40 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$CURL_PKG_ERRORS" >&5
 
-	have_scrobbler="no"
+	if test "x$enable_scrobbler2" = "xyes"; then
+ as_fn_error $? "Cannot find libcurl development files (ver >= 7.9.7), but compilation of Scrobbler 2 plugin has been explicitly requested; please install libcurl dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_scrobbler="no"
+	if test "x$enable_scrobbler2" = "xyes"; then
+ as_fn_error $? "Cannot find libcurl development files (ver >= 7.9.7), but compilation of Scrobbler 2 plugin has been explicitly requested; please install libcurl dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
 	CURL_LIBS=$pkg_cv_CURL_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_scrobbler="$have_scrobbler"
-fi
+	have_scrobbler2=yes
 
 
+ GENERAL_PLUGINS="$GENERAL_PLUGINS scrobbler2"
 fi
-
-if test "x$have_scrobbler" = "xyes"; then
-	GENERAL_PLUGINS="$GENERAL_PLUGINS scrobbler"
 fi
 
 
 # Check whether --enable-neon was given.
 if test "${enable_neon+set}" = set; then :
- enableval=$enable_neon; have_neon=$enableval
+ enableval=$enable_neon; enable_neon=$enableval
 else
- have_neon=yes
+ enable_neon=auto
 fi
 
 
-if test "x$have_neon" = "xyes"; then
+have_neon=no
+if test "x$enable_neon" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NEON" >&5
@@ -13408,19 +12236,25 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$NEON_PKG_ERRORS" >&5
 
-	have_neon="no"
+	if test "x$enable_neon" = "xyes"; then
+ as_fn_error $? "Cannot find neon development files (ver >= 0.26), but compilation of neon HTTP support has been explicitly requested; please install neon dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_neon="no"
+	if test "x$enable_neon" = "xyes"; then
+ as_fn_error $? "Cannot find neon development files (ver >= 0.26), but compilation of neon HTTP support has been explicitly requested; please install neon dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	NEON_CFLAGS=$pkg_cv_NEON_CFLAGS
 	NEON_LIBS=$pkg_cv_NEON_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon"
-fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ne_set_connect_timeout in -lneon" >&5
+	have_neon=yes
+ TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ne_set_connect_timeout in -lneon" >&5
 $as_echo_n "checking for ne_set_connect_timeout in -lneon... " >&6; }
 if ${ac_cv_lib_neon_ne_set_connect_timeout+:} false; then :
 $as_echo_n "(cached) " >&6
@@ -13462,23 +12296,22 @@
 
 fi
 
-else
- have_neon="no"
-fi
 
 
+fi
+fi
 
 
 # Check whether --enable-mms was given.
 if test "${enable_mms+set}" = set; then :
- enableval=$enable_mms; have_mms=$enableval
+ enableval=$enable_mms; enable_mms=$enableval
 else
- have_mms=yes
+ enable_mms=auto
 fi
 
 
-if test "x$have_mms" = "xyes"; then
- have_mms=yes
+have_mms=no
+if test "x$enable_mms" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MMS" >&5
@@ -13538,20 +12371,26 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$MMS_PKG_ERRORS" >&5
 
-	have_mms="no"
+	if test "x$enable_mms" = "xyes"; then
+ as_fn_error $? "Cannot find libmms development files (ver >= 0.3), but compilation of mms support has been explicitly requested; please install libmms dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_mms="no"
+	if test "x$enable_mms" = "xyes"; then
+ as_fn_error $? "Cannot find libmms development files (ver >= 0.3), but compilation of mms support has been explicitly requested; please install libmms dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	MMS_CFLAGS=$pkg_cv_MMS_CFLAGS
 	MMS_LIBS=$pkg_cv_MMS_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS mms"
+	have_mms=yes
+ TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS mms"
 fi
 else
- have_mms=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** mms plugin disabled by request ***" >&5
 $as_echo "*** mms plugin disabled by request ***" >&6; }
 fi
@@ -13616,21 +12455,37 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$XML_PKG_ERRORS" >&5
 
-	have_xml=no
+	as_fn_error $? "Package requirements (libxml-2.0) were not met:
+
+$XML_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables XML_CFLAGS
+and XML_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_xml=no
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables XML_CFLAGS
+and XML_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
 else
 	XML_CFLAGS=$pkg_cv_XML_CFLAGS
 	XML_LIBS=$pkg_cv_XML_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	have_xml=yes
-fi
 
-if test $have_xml = "no" ; then
- as_fn_error $? "Please install libxml-2.0." "$LINENO" 5
 fi
 
 CONTAINER_PLUGINS="$CONTAINER_PLUGINS xspf"
@@ -13639,14 +12494,14 @@
 
 # Check whether --enable-cue was given.
 if test "${enable_cue+set}" = set; then :
- enableval=$enable_cue; have_cue=$enableval
+ enableval=$enable_cue; enable_cue=$enableval
 else
- have_cue=yes
+ enable_cue=auto
 fi
 
 
-if test "x$have_cue" = "xyes"; then
- have_cue=yes
+have_cue=no
+if test "x$enable_cue" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUE" >&5
@@ -13706,20 +12561,26 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$CUE_PKG_ERRORS" >&5
 
-	have_cue="no"
+	if test "x$enable_cue" = "xyes"; then
+ as_fn_error $? "Cannot find libcue development files, but compilation of cue support has been explicitly requested; please install libcue dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_cue="no"
+	if test "x$enable_cue" = "xyes"; then
+ as_fn_error $? "Cannot find libcue development files, but compilation of cue support has been explicitly requested; please install libcue dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	CUE_CFLAGS=$pkg_cv_CUE_CFLAGS
 	CUE_LIBS=$pkg_cv_CUE_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	CONTAINER_PLUGINS="$CONTAINER_PLUGINS cue"
+	have_cue=yes
+ CONTAINER_PLUGINS="$CONTAINER_PLUGINS cue"
 fi
 else
- have_cue=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** cue plugin disabled by request ***" >&5
 $as_echo "*** cue plugin disabled by request ***" >&6; }
 fi
@@ -13734,8 +12595,10 @@
 fi
 
 
-if test "x$enable_filewriter" = "xyes"; then
-	OUTPUT_PLUGINS="$OUTPUT_PLUGINS filewriter"
+have_filewriter=no
+if test "x$enable_filewriter" != "xno"; then
+ have_filewriter=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS filewriter"
 fi
 
 
@@ -13743,19 +12606,21 @@
 if test "${enable_filewriter_mp3+set}" = set; then :
 enableval=$enable_filewriter_mp3; enable_filewriter_mp3=$enableval
 else
- enable_filewriter_mp3=yes
+ enable_filewriter_mp3=auto
 
 fi
 
 
-if test "x$enable_filewriter_mp3" = "xyes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lame_get_id3v2_tag in -lmp3lame" >&5
+have_lame=no
+if test "x$have_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lame_get_id3v2_tag in -lmp3lame" >&5
 $as_echo_n "checking for lame_get_id3v2_tag in -lmp3lame... " >&6; }
 if ${ac_cv_lib_mp3lame_lame_get_id3v2_tag+:} false; then :
 $as_echo_n "(cached) " >&6
 else
 ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmp3lame -lm $LIBS"
+LIBS="-lmp3lame -lm
+ $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
@@ -13787,20 +12652,22 @@
 $as_echo "$ac_cv_lib_mp3lame_lame_get_id3v2_tag" >&6; }
 if test "x$ac_cv_lib_mp3lame_lame_get_id3v2_tag" = xyes; then :
 have_lame=yes
-else
- have_lame=no
-fi
-
- if test "x$have_lame" = "xyes"; then
 
 $as_echo "#define FILEWRITER_MP3 1" >>confdefs.h
 
-	 FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
- fi
+ FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
+else
+ if test "x$enable_filewriter_mp3" = "xyes"; then
+ as_fn_error $? "Cannot find lame development files, but compilation of FileWriter MP3 output part has been explicitly requested; please install lame dev files and run configure again" "$LINENO" 5
+ fi
+fi
+
 fi
 
 
-if test $enable_vorbis = yes ; then
+have_vorbisenc=no
+if test "x$have_filewriter" = "xyes" -a "x$have_vorbis" = "xyes"; then
+ have_vorbisenc=yes
 
 $as_echo "#define FILEWRITER_VORBIS 1" >>confdefs.h
 
@@ -13812,12 +12679,13 @@
 if test "${enable_filewriter_flac+set}" = set; then :
 enableval=$enable_filewriter_flac; enable_filewriter_flac=$enableval
 else
- enable_filewriter_flac=yes
+ enable_filewriter_flac=auto
 
 fi
 
 
-if test "x$enable_filewriter_flac" = "xyes"; then
+have_writer_flac=no
+if test "x$have_filewriter" = "xyes" -a "x$enable_filewriter_flac" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5
@@ -13877,12 +12745,16 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$FLAC_PKG_ERRORS" >&5
 
-	have_writer_flac=no
+	if test "x$enable_filewriter_flac" = "xyes"; then
+ as_fn_error $? "Cannot find libflac development files (ver >= 1.1.3), but compilation of FileWriter FLAC output part has been explicitly requested; please install libflac dev files and run configure again" "$LINENO" 5
+ fi
 
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_writer_flac=no
+	if test "x$enable_filewriter_flac" = "xyes"; then
+ as_fn_error $? "Cannot find libflac development files (ver >= 1.1.3), but compilation of FileWriter FLAC output part has been explicitly requested; please install libflac dev files and run configure again" "$LINENO" 5
+ fi
 
 else
 	FLAC_CFLAGS=$pkg_cv_FLAC_CFLAGS
@@ -13890,36 +12762,29 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_writer_flac=yes
-fi
- if test "x$have_writer_flac" = "xyes"; then
 
 $as_echo "#define FILEWRITER_FLAC 1" >>confdefs.h
 
-	 FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS `pkg-config --cflags flac`"
-	 FILEWRITER_LIBS="$FILEWRITER_LIBS `pkg-config --libs flac`"
- fi
+ FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $FLAC_CFLAGS"
+ FILEWRITER_LIBS="$FILEWRITER_LIBS $FLAC_LIBS"
 fi
-
-if test "x$enable_filewriter" != "xyes"; then
- have_lame=no
- have_vorbisenc=no
- have_writer_flac=no
- FILEWRITER_LIBS=""
 fi
 
 
 
 
+
 # Check whether --enable-bs2b was given.
 if test "${enable_bs2b+set}" = set; then :
 enableval=$enable_bs2b; enable_bs2b=$enableval
 else
- enable_bs2b=yes
+ enable_bs2b=auto
 
 fi
 
 
-if test "x$enable_bs2b" = "xyes"; then
+have_bs2b=no
+if test "x$enable_bs2b" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BS2B" >&5
@@ -13979,40 +12844,42 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$BS2B_PKG_ERRORS" >&5
 
-	have_bs2b=no
+	if test "x$enable_bs2b" = "xyes"; then
+ as_fn_error $? "Cannot find libbs2b development files (ver >= 3.0.0), but compilation of BS2B effect plugin has been explicitly requested; please install libbs2b dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	have_bs2b=no
+	if test "x$enable_bs2b" = "xyes"; then
+ as_fn_error $? "Cannot find libbs2b development files (ver >= 3.0.0), but compilation of BS2B effect plugin has been explicitly requested; please install libbs2b dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	BS2B_CFLAGS=$pkg_cv_BS2B_CFLAGS
 	BS2B_LIBS=$pkg_cv_BS2B_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	have_bs2b=yes
+ EFFECT_PLUGINS="$EFFECT_PLUGINS bs2b"
 fi
 else
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** BS2B effect plugin disabled per user request ***" >&5
 $as_echo "*** BS2B effect plugin disabled per user request ***" >&6; }
- have_bs2b=no
 fi
 
-if test "x$have_bs2b" = "xyes"; then
-	EFFECT_PLUGINS="$EFFECT_PLUGINS bs2b"
-fi
-
-
 
 # Check whether --enable-resample was given.
 if test "${enable_resample+set}" = set; then :
 enableval=$enable_resample; enable_resample=$enableval
 else
- enable_resample=yes
+ enable_resample=auto
 
 fi
 
 
-if test "x$enable_resample" = "xyes"; then
+have_resample=no
+if test "x$enable_resample" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5
@@ -14072,34 +12939,38 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$SAMPLERATE_PKG_ERRORS" >&5
 
-	enable_resample=no
+	if test "x$enable_resample" = "xyes"; then
+ as_fn_error $? "Cannot find libsamplerate development files, but compilation of resample effect plugin has been explicitly requested; please install libsamplerate dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	enable_resample=no
+	if test "x$enable_resample" = "xyes"; then
+ as_fn_error $? "Cannot find libsamplerate development files, but compilation of resample effect plugin has been explicitly requested; please install libsamplerate dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
 	SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_resample=yes
+	have_resample=yes
+ EFFECT_PLUGINS="$EFFECT_PLUGINS resample"
 fi
 fi
 
-if test "x$enable_resample" = "xyes"; then
-	EFFECT_PLUGINS="$EFFECT_PLUGINS resample"
-fi
-
 
 # Check whether --enable-speedpitch was given.
 if test "${enable_speedpitch+set}" = set; then :
 enableval=$enable_speedpitch; enable_speedpitch="$enableval"
 else
- enable_speedpitch="yes"
+ enable_speedpitch=auto
 fi
 
 
-if test "x$enable_speedpitch" = "xyes"; then
+have_speedpitch=no
+if test "x$enable_speedpitch" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5
@@ -14159,22 +13030,117 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$SAMPLERATE_PKG_ERRORS" >&5
 
-	enable_speedpitch=no
+	if test "x$enable_speedpitch" = "xyes"; then
+ as_fn_error $? "Cannot find libsamplerate development files, but compilation of Speed and Pitch effect plugin has been explicitly requested; please install libsamplerate dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	enable_speedpitch=no
+	if test "x$enable_speedpitch" = "xyes"; then
+ as_fn_error $? "Cannot find libsamplerate development files, but compilation of Speed and Pitch effect plugin has been explicitly requested; please install libsamplerate dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
 	SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_speedpitch=yes
+	have_speedpitch=yes
+ EFFECT_PLUGINS="$EFFECT_PLUGINS speed-pitch"
 fi
 fi
 
-if test "x$enable_speedpitch" = "xyes"; then
-	EFFECT_PLUGINS="$EFFECT_PLUGINS speed-pitch"
+
+# Check whether --enable-soxr was given.
+if test "${enable_soxr+set}" = set; then :
+ enableval=$enable_soxr; enable_soxr=$enableval
+else
+ enable_soxr=auto
+
+fi
+
+
+have_soxr=no
+if test "x$enable_soxr" != "xno"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOXR" >&5
+$as_echo_n "checking for SOXR... " >&6; }
+
+if test -n "$SOXR_CFLAGS"; then
+ pkg_cv_SOXR_CFLAGS="$SOXR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "soxr") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SOXR_CFLAGS=`$PKG_CONFIG --cflags "soxr" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$SOXR_LIBS"; then
+ pkg_cv_SOXR_LIBS="$SOXR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"soxr\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "soxr") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_SOXR_LIBS=`$PKG_CONFIG --libs "soxr" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+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
+	 SOXR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "soxr" 2>&1`
+ else
+	 SOXR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "soxr" 2>&1`
+ fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$SOXR_PKG_ERRORS" >&5
+
+	if test "x$enable_soxr" = "xyes"; then
+ as_fn_error $? "Cannot find soxr development files, but compilation of SoX Resampler effect plugin has been explicitly requested; please install soxr dev files and run configure again" "$LINENO" 5
+ fi
+
+elif test $pkg_failed = untried; then
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	if test "x$enable_soxr" = "xyes"; then
+ as_fn_error $? "Cannot find soxr development files, but compilation of SoX Resampler effect plugin has been explicitly requested; please install soxr dev files and run configure again" "$LINENO" 5
+ fi
+
+else
+	SOXR_CFLAGS=$pkg_cv_SOXR_CFLAGS
+	SOXR_LIBS=$pkg_cv_SOXR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_soxr=yes
+ EFFECT_PLUGINS="$EFFECT_PLUGINS sox-resampler"
+fi
 fi
 
 
@@ -14186,7 +13152,7 @@
 fi
 
 
-if test $enable_gtkui = yes ; then
+if test "x$enable_gtkui" != "xno"; then
 GENERAL_PLUGINS="$GENERAL_PLUGINS gtkui"
 fi
 
@@ -14199,7 +13165,7 @@
 fi
 
 
-if test $enable_skins = yes ; then
+if test "x$enable_skins" != "xno"; then
 GENERAL_PLUGINS="$GENERAL_PLUGINS skins"
 fi
 
@@ -14208,11 +13174,12 @@
 if test "${enable_lyricwiki+set}" = set; then :
 enableval=$enable_lyricwiki; enable_lyricwiki=$enableval
 else
- enable_lyricwiki=yes
+ enable_lyricwiki=auto
 fi
 
 
-if test "x$enable_lyricwiki" = "xyes"; then
+have_lyricwiki=no
+if test "x$enable_lyricwiki" != "xno"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB214" >&5
@@ -14272,22 +13239,84 @@
 	# Put the nasty error message in config.log where it belongs
 	echo "$GLIB214_PKG_ERRORS" >&5
 
-	enable_lyricwiki=no
+	if test "x$enable_lyricwiki" = "xyes"; then
+ as_fn_error $? "Cannot find GLib development files (ver >= 2.14), but compilation of LyricWiki plugin has been explicitly requested; please install GLib dev files and run configure again" "$LINENO" 5
+ fi
+
 elif test $pkg_failed = untried; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-	enable_lyricwiki=no
+	if test "x$enable_lyricwiki" = "xyes"; then
+ as_fn_error $? "Cannot find GLib development files (ver >= 2.14), but compilation of LyricWiki plugin has been explicitly requested; please install GLib dev files and run configure again" "$LINENO" 5
+ fi
+
 else
 	GLIB214_CFLAGS=$pkg_cv_GLIB214_CFLAGS
 	GLIB214_LIBS=$pkg_cv_GLIB214_LIBS
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	enable_lyricwiki=yes
+	have_lyricwiki=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"
 fi
 fi
 
-if test "x$enable_lyricwiki" = "xyes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"
+
+# Check whether --enable-glspectrum was given.
+if test "${enable_glspectrum+set}" = set; then :
+ enableval=$enable_glspectrum; enable_glspectrum=$enableval
+else
+ enable_glspectrum=auto
+fi
+
+
+have_glspectrum=no
+if test "x$enable_glspectrum" != "xno"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glXChooseVisual in -lGL" >&5
+$as_echo_n "checking for glXChooseVisual in -lGL... " >&6; }
+if ${ac_cv_lib_GL_glXChooseVisual+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ ac_check_lib_save_LIBS=$LIBS
+LIBS="-lGL $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 glXChooseVisual ();
+int
+main ()
+{
+return glXChooseVisual ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_GL_glXChooseVisual=yes
+else
+ ac_cv_lib_GL_glXChooseVisual=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_GL_glXChooseVisual" >&5
+$as_echo "$ac_cv_lib_GL_glXChooseVisual" >&6; }
+if test "x$ac_cv_lib_GL_glXChooseVisual" = xyes; then :
+ have_glspectrum=yes
+ VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS gl-spectrum"
+else
+ if test "x$enable_glspectrum" = "xyes"; then
+ as_fn_error $? "Cannot find GLX development files, but compilation of OpenGL Spectrum Analyzer has been explicitly requested; please install GLX dev files and run configure again" "$LINENO" 5
+ fi
+
+fi
+
 fi
 
 
@@ -14317,10 +13346,13 @@
 fi
 
 if test -z "$datadir"; then
-	datadir="${prefix}/share"
+ datadir="${prefix}/share"
 fi
 
-localedir="$datadir/locale"
+localedir="$datarootdir/locale"
+
+
+
 
 
 
@@ -14330,6 +13362,8 @@
 
 
 
+CPPFLAGS="$CPPFLAGS -include config.h"
+
 
 
 ac_config_files="$ac_config_files buildsys.mk extra.mk"
@@ -14461,10 +13495,6 @@
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-if test -z "${USE_IPV6_TRUE}" && test -z "${USE_IPV6_FALSE}"; then
- as_fn_error $? "conditional \"USE_IPV6\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -14862,7 +13892,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by audacious-plugins $as_me 3.3.4, which was
+This file was extended by audacious-plugins $as_me 3.4.2, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
@@ -14928,7 +13958,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-audacious-plugins config.status 3.3.4
+audacious-plugins config.status 3.4.2
 configured by $0, generated by GNU Autoconf 2.69,
 with options \\"\$ac_cs_config\\"
 
@@ -15681,7 +14711,7 @@
 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"`
 # Find all dependency output files, they are included files with
 # $(DEPDIR) in their names. We invoke sed twice because it is the
@@ -15875,43 +14905,42 @@
 fi
 
 
+
+
 echo
 echo "Configuration:"
 echo
-echo " Install path: ${audacious_plugin_root}"
+echo " Install path: $plugindir"
 echo
 echo " Output Plugins"
 echo " --------------"
-echo " Open Sound System (oss4): $enable_oss4"
+echo " Open Sound System (oss4): $have_oss4"
 echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
 echo " Sndio (sndio): $have_sndio"
 echo " PulseAudio (pulse): $have_pulse"
-echo " Jack Audio Connection Kit (jack): $enable_jack"
-echo " Simple DirectMedia Layer (sdlout): $enable_sdlout"
-echo " FileWriter: $enable_filewriter"
+echo " Jack Audio Connection Kit (jack): $have_jack"
+echo " Simple DirectMedia Layer (sdlout): $have_sdlout"
+echo " FileWriter: $have_filewriter"
 echo " -> FileWriter MP3 output part: $have_lame"
-echo " -> FileWriter Vorbis output part: $enable_vorbis"
+echo " -> FileWriter Vorbis output part: $have_vorbisenc"
 echo " -> FileWriter FLAC output part: $have_writer_flac"
 echo
 echo " Input Plugins"
 echo " -------------"
-echo " MPEG-1 Layer I/II/III (mpg123): $enable_mp3"
-echo " MPEG-2/4 AAC (aac): $enable_aac"
+echo " MPEG-1 Layer I/II/III (mpg123): $have_mp3"
+echo " MPEG-2/4 AAC (aac): $have_aac"
 echo " FFaudio (ffaudio): $have_ffaudio"
 echo " Module decoder (modplug): $have_modplug"
 echo " MIDI modular plugin (amidi-plug): $enable_amidiplug"
 echo " -> ALSA backend: $enable_amidiplug_alsa"
 echo " -> FluidSynth backend: $enable_amidiplug_fluidsynth"
-echo " CD Digital Audio (cdaudio_ng): $enable_cdaudio_ng"
-echo " sndfile extensions: $enable_sndfile"
+echo " CD Digital Audio (cdaudio_ng): $have_cdaudio_ng"
+echo " sndfile extensions: $have_sndfile"
 echo " Tone Generator: yes"
-echo " Ogg Vorbis (vorbis): $enable_vorbis"
+echo " Ogg Vorbis (vorbis): $have_vorbis"
 echo " Free Lossless Audio Codec (flacng): $have_flacng"
-echo " Commodore 64 audio (SID): $have_sidplay $xs_have_sidplay2_api"
-echo " -> libSIDPlay1 support: $xs_have_sidplay1"
-echo " -> libSIDPlay2 support: $xs_have_sidplay2"
-echo " -> distortion patched libSIDPlay2: $xs_have_distortion"
-echo " Game music (spc, nsf & gbs): $enable_console"
+echo " Commodore 64 audio (SID): $have_sidplay"
+echo " Game music (spc, nsf & gbs): $have_console"
 echo " PlayStation (psf/psf2) audio: $enable_psf"
 echo " Nintendo DS audio (xsf): $enable_xsf"
 echo " AdLib synthesizer (adplug): $have_adplug"
@@ -15922,18 +14951,18 @@
 echo " -------"
 echo " Alarm: yes"
 echo " Album Art: yes"
-echo " Linux Infrared Remote Control (LIRC) $enable_lirc"
-echo " MPRIS 2 Server: $enable_mpris2"
+echo " Linux Infrared Remote Control (LIRC) $have_lirc"
+echo " MPRIS 2 Server: $have_mpris2"
 echo " Search Tool: yes"
-echo " Song Change: $enable_songchange"
+echo " Song Change: $have_songchange"
 echo " Status Icon: $have_statusicon"
 echo " Audacious OSD: $have_aosd"
 echo " -> X Composite support: $have_aosd_xcomp"
 echo " libnotify OSD: $have_notify"
 echo " Global Hotkey Plugin: $have_hotkey"
 echo " Gnome Shortcuts Plugin: $have_gnomeshortcuts"
-echo " AudioScrobbler Client: $have_scrobbler"
-echo " LyricWiki viewer: $enable_lyricwiki"
+echo " Scrobbler 2.0: $have_scrobbler2"
+echo " LyricWiki viewer: $have_lyricwiki"
 echo
 echo " Effect"
 echo " ------"
@@ -15945,19 +14974,21 @@
 echo " LADSPA Host: yes"
 echo " Voice Removal: yes"
 echo " Bauer stereophonic-to-binaural (bs2b): $have_bs2b"
-echo " Sample Rate Converter (resample): $enable_resample"
-echo " Speed and Pitch: $enable_speedpitch"
+echo " Sample Rate Converter (resample): $have_resample"
+echo " Speed and Pitch: $have_speedpitch"
+echo " SoX Resampler: $have_soxr"
 echo
 echo " Visualization"
 echo " -------------"
 echo " Blur Scope: yes"
 echo " Cairo Spectrum Analyzer: yes"
+echo " OpenGL Spectrum Analyzer: $have_glspectrum"
 echo
 echo " Transport"
 echo " ---------"
 echo " neon-based http/https: $have_neon"
 echo " libmms-based mms: $have_mms"
-echo " GIO: $enable_gio"
+echo " GIO: $have_gio"
 echo
 echo " Container"
 echo " ---------"

audacious-plugins-3.3.4.tar.bz2/configure.ac -> audacious-plugins-3.4.2.tar.bz2/configure.ac Changed

@@ -5,7 +5,7 @@
 dnl Initialize
 dnl ==========
 AC_PREREQ([2.59])
-AC_INIT([audacious-plugins], [3.3.4])
+AC_INIT([audacious-plugins], [3.4.2])
 AC_COPYRIGHT([(C) 2005-2013 Audacious Team])
 
 AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])
@@ -16,12 +16,17 @@
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 
 AUD_COMMON_PROGS
 
 BUILDSYS_INIT
 BUILDSYS_SHARED_LIB
 
+dnl Disable deprecation warnings for stable branch
+dnl ==============================================
+CFLAGS="$CFLAGS -Wno-deprecated-declarations"
+
 dnl Headers and functions
 dnl =====================
 AC_CHECK_FUNCS([mkdtemp])
@@ -38,9 +43,9 @@
 dnl Check for Audacious
 dnl ===================
 
-PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.3],
+PKG_CHECK_MODULES(AUDACIOUS, [audacious >= 3.4],
 [],
- [AC_MSG_ERROR([Cannot find Audacious 3.3; have you installed Audacious yet?])]
+ [AC_MSG_ERROR([Cannot find Audacious 3.4; have you installed Audacious yet?])]
 )
 
 CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
@@ -61,55 +66,48 @@
 dnl =============
 
 AC_ARG_ENABLE(gio,
- AS_HELP_STRING([--disable-gio], [disable GIO support]),
- enable_gio=$enableval, enable_gio=yes)
-
-if test "x$enable_gio" = "xyes"; then
- PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.22], [enable_gio=yes], [enable_gio=no])
-fi
-
-if test "x$enable_gio" = "xyes"; then
- TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS gio"
- AC_SUBST(GIO_CFLAGS)
- AC_SUBST(GIO_LIBS)
-fi
-
-dnl IPv6 support
-dnl ========================
-AC_ARG_ENABLE(ipv6,
-	[ --enable-ipv6		 enable IPv6 support (default=no)],
-			enable_ipv6=$enableval, enable_ipv6=no)
-if test "x$enable_ipv6" = "xyes"; then
- AC_DEFINE(USE_IPV6,, [Define if building with IPv6 support] )
+ [AS_HELP_STRING([--disable-gio], [disable GIO support])],
+ [enable_gio=$enableval], [enable_gio=auto])
+
+have_gio=no
+if test "x$enable_gio" != "xno"; then
+ PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.22],
+ [have_gio=yes
+ TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS gio"
+ AC_SUBST(GIO_CFLAGS)
+ AC_SUBST(GIO_LIBS)],
+ [if test "x$enable_gio" = "xyes"; then
+ AC_MSG_ERROR([Cannot find GIO development files (ver >= 2.22), but compilation of GIO support has been explicitly requested; please install GIO dev files and run configure again])
+ fi]
+ )
 fi
-AM_CONDITIONAL(USE_IPV6,test "x$enable_ipv6" = "xyes")
-AC_SUBST(USE_IPV6)
 
 dnl Console
 dnl =======
 
 AC_ARG_ENABLE(console,
- [ --disable-console disable game music decoder (console)],
- [enable_console=$enableval], [enable_console="yes"])
-
-if test $enable_console = yes ; then
- AC_CHECK_HEADERS([zlib.h], [enable_console=yes],
- [AC_MSG_WARN([Cannot find zlib.h; disabling game music decoder (console)])
- enable_console=no])
-fi
-
-if test $enable_console = yes ; then
- INPUT_PLUGINS="$INPUT_PLUGINS console"
+ [AS_HELP_STRING([--disable-console], [disable game music decoder (console)])],
+ [enable_console=$enableval], [enable_console=auto])
+
+have_console=no
+if test "x$enable_console" != "xno"; then
+ AC_CHECK_HEADERS([zlib.h],
+ [have_console=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS console"],
+ [if test "x$enable_console" = "xyes"; then
+ AC_MSG_ERROR([Cannot find zlib development files, but compilation of game music decoder (console) has been explicitly requested; please install zlib dev files and run configure again])
+ fi]
+ )
 fi
 
 dnl XSF
 dnl =======
 
 AC_ARG_ENABLE(xsf,
- [ --disable-xsf disable Nintendo DS audio decoder (xsf)],
+ [AS_HELP_STRING([--disable-xsf], [disable Nintendo DS audio decoder (xsf)])],
 [enable_xsf=$enableval], [enable_xsf="yes"])
 
-if test $enable_xsf = yes ; then
+if test "x$enable_xsf" != "xno"; then
 INPUT_PLUGINS="$INPUT_PLUGINS xsf"
 fi
 
@@ -118,243 +116,260 @@
 dnl ==========
 
 AC_ARG_ENABLE( pulse,
- [ --disable-pulse disable PulseAudio output plugin (default=enabled)],
+ [AS_HELP_STRING([--disable-pulse], [disable PulseAudio output plugin (default=enabled)])],
 [enable_pulse=$enableval],
- [enable_pulse="yes"]
+ [enable_pulse=auto]
 )
 
-if test "x$enable_pulse" = "xyes"; then
+have_pulse=no
+if test "x$enable_pulse" != "xno"; then
 PKG_CHECK_MODULES(PULSE, [libpulse >= 0.9.5],
 [have_pulse=yes
 OUTPUT_PLUGINS="$OUTPUT_PLUGINS pulse_audio"],
- [have_pulse=no]
+ [if test "x$enable_pulse" = "xyes"; then
+ AC_MSG_ERROR([Cannot find PulseAudio development files (ver >= 0.95), but compilation of PulseAudio output plugin has been explicitly requested; please install PulseAudio dev files and run configure again])
+ fi]
 )
 else
 AC_MSG_RESULT([*** pulseaudio output plugin disabled per user request ***])
- have_pulse=no
 fi
 
 dnl PSF
 dnl ===
 
 AC_ARG_ENABLE(psf,
- [ --disable-psf disable PlayStation (psf/psf2) audio decoder],
+ [AS_HELP_STRING([--disable-psf], [disable PlayStation (psf/psf2) audio decoder])],
 [enable_psf=$enableval],
 [enable_psf=yes])
 
-if test "$enable_psf" = "yes"; then
+if test "x$enable_psf" != "xno"; then
 INPUT_PLUGINS="$INPUT_PLUGINS psf"
 fi
 
 dnl *** MP3
 
 AC_ARG_ENABLE(mp3,
- AS_HELP_STRING([--disable-mp3], [disable MP3 plugin (default=enabled)]),
- [enable_mp3=$enableval], [enable_mp3=yes])
+ [AS_HELP_STRING([--disable-mp3], [disable MP3 plugin (default=enabled)])],
+ [enable_mp3=$enableval], [enable_mp3=auto])
 
-if test $enable_mp3 = yes ; then
+have_mp3=no
+if test "x$enable_mp3" != "xno"; then
 PKG_CHECK_MODULES(MPG123, [libmpg123 >= 1.12],
- [enable_mp3=yes], [enable_mp3=no])
-
- if test $enable_mp3 = yes ; then
- INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
- else
- AC_MSG_RESULT([*** libmpg123 not found; MP3 plugin disabled])
- fi
+ [have_mp3=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS mpg123"],
+ [if test "x$enable_mp3" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libmpg123 development files (ver >= 1.12), but compilation of MP3 plugin has been explicitly requested; please install libmpg123 dev files and run configure again])
+ fi]
+ )
+else
+ AC_MSG_RESULT([*** libmpg123 not found; MP3 plugin disabled])
 fi
 
 dnl *** Global Hotkey general plugin (only built on X11)
 
 AC_ARG_ENABLE(hotkey,
- [ --disable-hotkey disable global hotkey plugin (default=enabled)],
+ [AS_HELP_STRING([--disable-hotkey], [disable global hotkey plugin (default=enabled)])],
 [enable_hotkey=$enableval],
- [enable_hotkey="yes"]
+ [enable_hotkey=auto]
 )
 
-if test "x$enable_hotkey" = "xyes"; then
- PKG_CHECK_MODULES(GDKX11, [gdk-x11-3.0], [have_hotkey="yes"], [have_hotkey="no"])
+have_hotkey=no
+if test "x$enable_hotkey" != "xno"; then
+ PKG_CHECK_MODULES(GDKX11, [gdk-x11-3.0],
+ [have_hotkey="yes"
+ GENERAL_PLUGINS="$GENERAL_PLUGINS hotkey"],
+ [if test "x$enable_hotkey" = "xyes"; then
+ AC_MSG_ERROR([Cannot find gdk-x11-3.0 development files, but compilation of X11 Global Hotkey plugin has been explicitly requested; please install gdk-x11-3.0 dev files and run configure again])
+ fi]
+ )
 else
 AC_MSG_RESULT([*** X11 Global Hotkey plugin disabled per user request ***])
- have_hotkey="no"
-fi
-
-if test "x$have_hotkey" = "xyes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS hotkey"
 fi
 
 dnl *** Gnome Shortcuts Plugin
 
 AC_ARG_ENABLE(gnomeshortcuts,
- [ --disable-gnomeshortcuts disable gnome shortcuts (default=enabled)],
+ [AS_HELP_STRING([--disable-gnomeshortcuts], [disable gnome shortcuts (default=enabled)])],
 [enable_gnomeshortcuts=$enableval],
- [enable_gnomeshortcuts="yes"]
+ [enable_gnomeshortcuts=auto]
 )
 
-if test "x$enable_gnomeshortcuts" = "xyes"; then
- have_gnomeshortcuts="yes"
+have_gnomeshortcuts=no
+if test "x$enable_gnomeshortcuts" != "xno"; then
 PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60 dbus-glib-1 >= 0.60],
- [have_gnomeshortcuts=yes],
- [AC_MSG_WARN([Cannot find dbus-glib >= 0.60; disabling Gnome shortcuts plugin.])
- have_gnomeshortcuts=no])
+ [have_gnomeshortcuts=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS gnomeshortcuts"],
+ [if test "x$enable_gnomeshortcuts" = "xyes"; then
+ AC_MSG_ERROR([Cannot find dbus or dbus-glib development files (ver >= 0.60), but compilation of Gnome Shortcuts Plugin has been explicitly requested; please install dbus and dbus-glib dev files and run configure again])
+ fi]
+ )
 else
 AC_MSG_RESULT([*** Gnome Shortcuts Plugin disabled per user request ***])
- have_gnomeshortcuts="no"
-fi
-
-if test "x$have_gnomeshortcuts" = "xyes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS gnomeshortcuts"
 fi
 
 dnl Linux Infrared Remote Control (LIRC)
 dnl ====================================
 
 AC_ARG_ENABLE(lirc,
- AS_HELP_STRING([--disable-lirc], [disable LIRC support (default=enabled)]),
- [enable_lirc=$enableval], [enable_lirc=yes])
+ [AS_HELP_STRING([--disable-lirc], [disable LIRC support (default=enabled)])],
+ [enable_lirc=$enableval], [enable_lirc=auto])
 
-if test $enable_lirc = yes ; then
- AC_CHECK_HEADERS([lirc/lirc_client.h], [enable_lirc=yes], [enable_lirc=no])
-fi
-
-if test $enable_lirc = yes ; then
-	GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"
+have_lirc=no
+if test "x$enable_lirc" != "xno"; then
+ AC_CHECK_HEADERS([lirc/lirc_client.h],
+ [have_lirc=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"],
+ [if test "x$enable_lirc" = "xyes"; then
+ AC_MSG_ERROR([Cannot find lirc development files, but compilation of LIRC support has been explicitly requested; please install lirc dev files and run configure again])
+ fi])
 fi
 
 dnl Song Change
 dnl ===========
 
 AC_ARG_ENABLE(songchange,
- [ --disable-songchange disable song change plugin],
- [enable_songchange=$enableval], [enable_songchange="yes"])
-
-if test $enable_songchange = yes ; then
- AC_CHECK_HEADERS([sys/wait.h], [enable_songchange=yes],
- [AC_MSG_WARN([Cannot find sys/wait.h; disabling song change plugin])
- enable_songchange=no])
-fi
-
-if test $enable_songchange = yes ; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS song_change"
+ [AS_HELP_STRING([--disable-songchange], [disable song change plugin])],
+ [enable_songchange=$enableval], [enable_songchange=auto])
+
+have_songchange=no
+if test "x$enable_songchange" != "xno"; then
+ AC_CHECK_HEADERS([sys/wait.h],
+ [have_songchange=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS song_change"],
+ [if test "x$enable_songchange" = "xyes"; then
+ AC_MSG_ERROR([Cannot find sys/wait.h header, but compilation of song change plugin has been explicitly requested])
+ fi]
+ )
 fi
 
 dnl Status Icon
 dnl ===========
 
 AC_ARG_ENABLE(statusicon,
- [ --disable-statusicon disable X11 Status Icon plugin (default=enabled)],
+ [AS_HELP_STRING([--disable-statusicon], [disable X11 Status Icon plugin (default=enabled)])],
 [have_statusicon=$enableval], [have_statusicon="yes"])
 
-if test "x$have_statusicon" = "xyes"; then
+if test "x$have_statusicon" != "xno"; then
 GENERAL_PLUGINS="$GENERAL_PLUGINS statusicon"
 fi
 
 dnl *** Audacious OSD plugin (pangocairo-based)
 
 AC_ARG_ENABLE(aosd,
- [ --disable-aosd disable Audacious OSD plugin (default=enabled)],
+ [AS_HELP_STRING([--disable-aosd], [disable Audacious OSD plugin (default=enabled)])],
 [enable_aosd=$enableval],
- [enable_aosd="yes"]
+ [enable_aosd=auto]
 )
 
+have_aosd=no
+if test "x$enable_aosd" != "xno"; then
+ PKG_CHECK_MODULES(PANGO, [pango >= 1.14.7],
+ [PKG_CHECK_MODULES(CAIRO, [cairo >= 1.2.4],
+ [PKG_CHECK_MODULES(PANGOCAIRO,[pangocairo >= 1.14.7],
+ [PKG_CHECK_MODULES(XRENDER, [xrender],
+ [have_aosd=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS aosd"],
+ [AC_MSG_RESULT([*** X Render extension is required for Audacious OSD plugin ***])]
+ )],
+ [AC_MSG_RESULT([*** pangocairo >= 1.14.7 is required for Audacious OSD plugin ***])]
+ )],
+ [AC_MSG_RESULT([*** cairo >= 1.2.4 is required for Audacious OSD plugin ***])]
+ )],
+ [AC_MSG_RESULT([*** pango >= 1.14.7 is required for Audacious OSD plugin ***])]
+ )
+
+ if test "x$enable_aosd" = "xyes" -a "x$have_aosd" != "xyes"; then
+ AC_MSG_ERROR([Compilation of OSD plugin has been explicitly requested; please install required dev files and run configure again])
+ fi
+else
+ AC_MSG_RESULT([*** Audacious OSD plugin disabled per user request ***])
+fi
+
 AC_ARG_ENABLE(aosd_xcomp,
- [ --disable-aosd-xcomp disable Audacious OSD X Composite Support (default=enabled)],
+ [AS_HELP_STRING([--disable-aosd-xcomp], [disable Audacious OSD X Composite Support (default=enabled)])],
 [enable_aosd_xcomp=$enableval],
- [enable_aosd_xcomp="yes"]
+ [enable_aosd_xcomp=auto]
 )
 
-if test "x$enable_aosd" = "xyes"; then
- have_aosd="yes"
- PKG_CHECK_MODULES(PANGO,[pango >= 1.14.7],,
- [have_aosd="no"
- AC_MSG_RESULT([*** pango >= 1.14.7 is required for Audacious OSD plugin ***])]
- )
- PKG_CHECK_MODULES(CAIRO,[cairo >= 1.2.4],,
- [have_aosd="no"
- AC_MSG_RESULT([*** cairo >= 1.2.4 is required for Audacious OSD plugin ***])]
- )
- PKG_CHECK_MODULES(PANGOCAIRO,[pangocairo >= 1.14.7],,
- [have_aosd="no"
- AC_MSG_RESULT([*** pangocairo >= 1.14.7 is required for Audacious OSD plugin ***])]
- )
- PKG_CHECK_MODULES(XRENDER, xrender,,
- [have_aosd="no"
- AC_MSG_RESULT([*** X Render extension is required for Audacious OSD plugin ***])]
- )
+if test "x$have_aosd" != "xyes"; then
 if test "x$enable_aosd_xcomp" = "xyes"; then
- have_aosd_xcomp="yes"
- PKG_CHECK_MODULES(XCOMPOSITE, xcomposite,
- [AC_DEFINE([HAVE_XCOMPOSITE],[],[X Composite extension available])],
- [have_aosd_xcomp="no"
- AC_MSG_RESULT([*** X Composite extension not found, composite support for Audacious OSD will not be compiled ***])]
- )
+ AC_MSG_ERROR([Cannot enable X Composite support for Audacious OSD plugin which is disabled])
 else
- AC_MSG_RESULT([*** X Composite support for Audacious OSD plugin disabled per user request ***])
- have_aosd_xcomp="no"
+ enable_aosd_xcomp=no
 fi
-else
- AC_MSG_RESULT([*** Audacious OSD plugin disabled per user request ***])
- have_aosd="no"
 fi
 
-if test "x$have_aosd" = "xyes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS aosd"
+have_aosd_xcomp=no
+if test "x$enable_aosd_xcomp" != "xno"; then
+ PKG_CHECK_MODULES(XCOMPOSITE, [xcomposite],
+ [have_aosd_xcomp=yes
+ AC_DEFINE([HAVE_XCOMPOSITE],[],[X Composite extension available])],
+ [if test "x$enable_aosd_xcomp" = "xyes"; then
+ AC_MSG_ERROR([Cannot find X Composite development files, but compilation of X Composite support for Audacious OSD plugin has been explicitly requested; please install X Composite dev files and run configure again])
+ fi]
+ )
+else
+ AC_MSG_RESULT([*** X Composite support for Audacious OSD plugin disabled per user request ***])
 fi
 
-
 dnl notify: libnotify-based OSD
 dnl ===========================
 
 AC_ARG_ENABLE(notify,
- [ --disable-notify disable notify plugin (default=enabled)],
- [enable_notify=$enableval], [enable_notify="yes"])
-
-if test "x$enable_notify" = "xyes"; then
- PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.7], [have_notify="yes"], [have_notify="no"])
-else
- have_notify="no"
-fi
-
-if test "x$have_notify" = "xyes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS notify"
+ [AS_HELP_STRING([--disable-notify], [disable notify plugin (default=enabled)])],
+ [enable_notify=$enableval], [enable_notify=auto])
+
+have_notify=no
+if test "x$enable_notify" != "xno"; then
+ PKG_CHECK_MODULES(NOTIFY, [libnotify >= 0.7],
+ [have_notify=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS notify"],
+ [if test "x$enable_notify" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libnotify development files (ver >= 0.7), but compilation of notify plugin has been explicitly requested; please install libnotify dev files and run configure again])
+ fi]
+ )
 fi
 
 dnl MPRIS 2 (requires GDBus)
 dnl ========================
 
 AC_ARG_ENABLE(mpris2,
- AS_HELP_STRING([--disable-mpris2], [disable MPRIS 2 support (default=enabled)]),
- [enable_mpris2=$enableval], [enable_mpris2=yes])
+ [AS_HELP_STRING([--disable-mpris2], [disable MPRIS 2 support (default=enabled)])],
+ [enable_mpris2=$enableval], [enable_mpris2=auto])
 
-if test $enable_mpris2 = yes ; then
+have_mpris2=no
+if test "x$enable_mpris2" != "xno"; then
 PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= 2.30],
- [enable_mpris2=yes], [enable_mpris2=no])
-fi
-
-if test $enable_mpris2 = yes ; then
-	GENERAL_PLUGINS="$GENERAL_PLUGINS mpris2"
-	AC_SUBST(GIO_UNIX_CFLAGS)
-	AC_SUBST(GIO_UNIX_LIBS)
+ [have_mpris2=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS mpris2"
+ AC_SUBST(GIO_UNIX_CFLAGS)
+ AC_SUBST(GIO_UNIX_LIBS)],
+ [if test "x$enable_mpris2" = "xyes"; then
+ AC_MSG_ERROR([Cannot find GIO-UNIX development files (ver >= 2.30), but compilation of MPRIS 2 support has been explicitly requested; please install GIO-UNIX dev files and run configure again])
+ fi]
+ )
 fi
 
 dnl *** AdPlug requirement (libbinio)
 
 AC_ARG_ENABLE(adplug,
- [ --disable-adplug disable AdPlug plugin (default=enabled)],
+ [AS_HELP_STRING([--disable-adplug], [disable AdPlug plugin (default=enabled)])],
 [enable_adplug=$enableval],
- [enable_adplug="yes"]
+ [enable_adplug=auto]
 )
 
-if test "x$enable_adplug" = "xyes"; then
- have_adplug="yes"
- PKG_CHECK_MODULES(BINIO,[libbinio >= 1.4],,[have_adplug=no])
+have_adplug=no
+if test "x$enable_adplug" != "xno"; then
+ PKG_CHECK_MODULES(BINIO, [libbinio >= 1.4],
+ [have_adplug=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS adplug"
+ AC_SUBST(BINIO_CFLAGS)],
+ [if test "x$enable_adplug" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libbinio development files (ver >= 1.4), but compilation of AdPlug plugin has been explicitly requested; please install libbinio dev files and run configure again])
+ fi]
+ )
 else
 AC_MSG_RESULT([*** AdPlug plugin disabled per user request ***])
- have_adplug="no"
-fi
-
-if test "x$have_adplug" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS adplug"
-	AC_SUBST(BINIO_CFLAGS)
 fi
 
 dnl Ogg Vorbis
@@ -362,202 +377,208 @@
 dnl This test is reused later to enable/disable Vorbis support in filewriter.
 
 AC_ARG_ENABLE(vorbis,
- AS_HELP_STRING([--disable-vorbis], [disable Ogg Vorbis decoding and encoding]),
- [enable_vorbis=$enableval], [enable_vorbis=yes])
-
-if test $enable_vorbis = yes ; then
- PKG_CHECK_MODULES(VORBIS,
- [ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0],
- [enable_vorbis=yes], [enable_vorbis=no])
-fi
-
-if test $enable_vorbis = yes ; then
- INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
+ [AS_HELP_STRING([--disable-vorbis], [disable Ogg Vorbis decoding and encoding])],
+ [enable_vorbis=$enableval], [enable_vorbis=auto])
+
+have_vorbis=no
+if test "x$enable_vorbis" != "xno"; then
+ PKG_CHECK_MODULES(VORBIS, [ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0],
+ [have_vorbis=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS vorbis"],
+ [if test "x$enable_vorbis" = "xyes"; then
+ AC_MSG_ERROR([Cannot find ogg, vorbis, vorbisenc or vorbisfile development files (ver >= 1.0), but compilation of Ogg Vorbis decoding and encoding has been explicitly requested; please install ogg, vorbis, vorbisenc and vorbisfile dev files and run configure again])
+ fi]
+ )
 fi
 
 dnl FLAC
 dnl ====
 
 AC_ARG_ENABLE(flacng,
- [ --disable-flacng disable flac input plugin (default=enabled)],
+ [AS_HELP_STRING([--disable-flacng], [disable flac input plugin (default=enabled)])],
 [enable_flacng=$enableval],
- [enable_flacng="yes"]
+ [enable_flacng=auto]
 )
 
-if test "x$enable_flacng" = "xyes"; then
+have_flacng=no
+if test "x$enable_flacng" != "xno"; then
 PKG_CHECK_MODULES(LIBFLAC, [flac >= 1.2.1],
- [have_flacng=yes],
- [AC_MSG_WARN([*** Cannot find libFLAC 1.2.1+, FLAC support will not be built ***])
- have_flacng=no]
+ [have_flacng=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS flacng"],
+ [if test "x$enable_flacng" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libFLAC development files (ver >= 1.2.1), but compilation of FLACng plugin has been explicitly requested; please install libFLAC dev files and run configure again])
+ fi]
 )
 else
 AC_MSG_RESULT([*** FLACng plugin disabled per user request ***])
- have_flacng=no
-fi
-
-if test "x$have_flacng" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS flacng"
 fi
 
 dnl *** WavPack 4.31 support
 
 AC_ARG_ENABLE(wavpack,
- [ --disable-wavpack disable WavPack input plugin (default=enabled)],
+ [AS_HELP_STRING([--disable-wavpack], [disable WavPack input plugin (default=enabled)])],
 [enable_wavpack=$enableval],
- [enable_wavpack="yes"]
+ [enable_wavpack=auto]
 )
 
-if test "x$enable_wavpack" = "xyes"; then
+have_wavpack=no
+if test "x$enable_wavpack" != "xno"; then
 PKG_CHECK_MODULES(WAVPACK, [wavpack >= 4.31],
- [have_wavpack=yes],
- [AC_MSG_WARN([*** Cannot find WavPack 4.31+, WavPack support will not be built ***])
- have_wavpack=no]
+ [have_wavpack=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS wavpack"],
+ [if test "x$enable_wavpack" = "xyes"; then
+ AC_MSG_ERROR([Cannot find WavPack development files (ver >= 4.31), but compilation of WavPack plugin has been explicitly requested; please install WavPack dev files and run configure again])
+ fi]
 )
 else
 AC_MSG_RESULT([*** WavPack plugin disabled per user request ***])
- have_wavpack=no
-fi
-
-if test "x$have_wavpack" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS wavpack"
 fi
 
 dnl *** AAC
 
 AC_ARG_ENABLE(aac,
- [ --disable-aac disable aac plugin (default=enabled) ],
+ [AS_HELP_STRING([--disable-aac], [disable aac plugin (default=enabled)])],
 [enable_aac=$enableval],
- [enable_aac=yes]
+ [enable_aac=auto]
 )
 
-if test x$enable_aac = xyes; then
-	FAAD_LIBS="-lfaad"
-	FAAD_CFLAGS=
-
-	AC_CHECK_HEADER(faad.h,,enable_aac=no)
-	if test x$enable_aac = xyes; then
-		AC_CHECK_DECL(FAAD2_VERSION,,enable_aac=no,[#include <neaacdec.h>])
-	fi
-	if test x$enable_aac = xyes; then
-		AC_CHECK_DECL(NeAACDecInit2,,enable_aac=no,[#include <neaacdec.h>])
-	fi
-	if test x$enable_aac = xyes; then
-		AC_CHECK_LIB(faad,NeAACDecInit2,enable_aac=yes,enable_aac=no)
-	fi
-fi
+have_aac=no
+if test "x$enable_aac" != "xno"; then
+ FAAD_LIBS="-lfaad"
+ FAAD_CFLAGS=
+
+ AC_CHECK_HEADER([faad.h],
+ [AC_CHECK_DECL([FAAD2_VERSION],
+ [AC_CHECK_DECL([NeAACDecInit2],
+ [AC_CHECK_LIB([faad],[NeAACDecInit2],
+ [have_aac=yes
+ AC_SUBST(FAAD_CFLAGS)
+ AC_SUBST(FAAD_LIBS)
+ INPUT_PLUGINS="$INPUT_PLUGINS aac"])],
+ [], [#include <neaacdec.h>])],
+ [], [#include <neaacdec.h>])]
+ )
 
-if test x$enable_aac = xyes; then
- AC_SUBST(FAAD_CFLAGS)
- AC_SUBST(FAAD_LIBS)
- INPUT_PLUGINS="$INPUT_PLUGINS aac"
+ if test "x$enable_aac" = "xyes" -a "x$have_aac" != "xyes"; then
+ AC_MSG_ERROR([Cannot find faad development files, but compilation of aac plugin has been explicitly requested; please install faad dev files and run configure again])
+ fi
 fi
 
 dnl *** sndfile
 
 AC_ARG_ENABLE(sndfile,
- [ --disable-sndfile disable sndfile extensions. [default=enabled] ],
+ [AS_HELP_STRING([--disable-sndfile], [disable sndfile extensions. [default=enabled]])],
 [enable_sndfile=$enableval],
- [enable_sndfile=yes]
+ [enable_sndfile=auto]
 )
 
-if test "x$enable_sndfile" = "xyes"; then
+have_sndfile=no
+if test "x$enable_sndfile" != "xno"; then
 PKG_CHECK_MODULES(SNDFILE, [sndfile >= 0.19],
- [enable_sndfile=yes],
- [enable_sndfile=no]
+ [have_sndfile=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS sndfile"],
+ [if test "x$enable_sndfile" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libsndfile development files (ver >= 0.19), but compilation of libsndfile extensions has been explicitly requested; please install libsndfile dev files and run configure again])
+ fi]
 )
 else
 AC_MSG_RESULT([*** libsndfile extensions disabled per user request ***])
- enable_sndfile=no
-fi
-
-if test "x$enable_sndfile" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS sndfile"
 fi
 
 dnl *** modplug
 
 AC_ARG_ENABLE(modplug,
- [ --disable-modplug disable ModPlug plugin (default=enabled)],
+ [AS_HELP_STRING([--disable-modplug], [disable ModPlug plugin (default=enabled)])],
 [enable_modplug=$enableval],
- [enable_modplug="yes"]
+ [enable_modplug=auto]
 )
 
-if test $enable_modplug = yes ; then
- PKG_CHECK_MODULES(MODPLUG, libmodplug,
+have_modplug=no
+if test "x$enable_modplug" != "xno"; then
+ PKG_CHECK_MODULES(MODPLUG, [libmodplug],
 [INPUT_PLUGINS="$INPUT_PLUGINS modplug"
 have_modplug=yes],
- [AC_MSG_WARN([*** Cannot find libmodplug; modplug plugin disabled ***])
- have_modplug=no])
+ [if test "x$enable_modplug" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libmodplug development files, but compilation of ModPlug plugin has been explicitly requested; please install libmodplug dev files and run configure again])
+ fi]
+ )
 fi
 
 dnl *** FFaudio
 
-have_ffaudio="no"
 AC_ARG_ENABLE(ffaudio,
- [ --disable-ffaudio disable ffaudio plugin (default=enabled)],
+ [AS_HELP_STRING([--disable-ffaudio], [disable ffaudio plugin (default=enabled)])],
 [enable_ffaudio=$enableval],
- [enable_ffaudio="yes"]
+ [enable_ffaudio=auto]
 )
 
-if test $enable_ffaudio = yes ; then
- PKG_CHECK_MODULES([FFMPEG],
- [libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0],
- [have_ffaudio=yes], [have_ffaudio=no])
-fi
-
-if test "x$have_ffaudio" = "xyes"; then
- INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
+have_ffaudio=no
+if test "x$enable_ffaudio" != "xno"; then
+ PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 53.40.0 libavformat >= 53.5.0 libavutil >= 50.42.0],
+ [have_ffaudio=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"],
+ [if test "x$enable_ffaudio" = "xyes"; then
+ AC_MSG_ERROR([Cannot find FFmpeg development files (libavcodec ver >= 53.40.0, libavformat ver >= 53.5.0, libavutil ver >= 50.42.0), but compilation of ffaudio plugin has been explicitly requested; please install FFmpeg dev files and run configure again])
+ fi]
+ )
 fi
 
 dnl *** jack output plugin
 
 AC_ARG_ENABLE(jack,
- AS_HELP_STRING([--disable-jack], [disable JACK output plugin (default=enabled)]),
- [enable_jack=$enableval], [enable_jack=yes])
+ [AS_HELP_STRING([--disable-jack], [disable JACK output plugin (default=enabled)])],
+ [enable_jack=$enableval], [enable_jack=auto])
 
-if test $enable_jack = yes ; then
+have_jack=no
+if test "x$enable_jack" != "xno"; then
 PKG_CHECK_MODULES(JACK, [jack >= 1.9.7],
- [enable_jack=$enable_jack], [
- PKG_CHECK_MODULES(JACK, [jack >= 0.120.1 jack < 1.0],
- [enable_jack=$enable_jack], [enable_jack=no])
- ])
+ [have_jack=yes],
+ [PKG_CHECK_MODULES(JACK, [jack >= 0.120.1 jack < 1.0],
+ [have_jack=yes],
+ [have_jack=no])]
+ )
 
- PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
- [enable_jack=$enable_jack], [enable_jack=no])
+ if test "x$have_jack" = "xyes"; then
+ PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
+ [], [have_jack=no]
+ )
+ fi
 
- if test $enable_jack = yes ; then
+ if test "x$have_jack" = "xyes"; then
 OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
- else
- AC_MSG_RESULT([*** JACK or libsamplerate not found; JACK output plugin disabled])
+ elif test "x$enable_jack" = "xyes"; then
+ AC_MSG_ERROR([Cannot find JACK (ver >= 0.120.1 but < 1.0 or >= 1.9.7) or libsamplerate development files, but compilation of JACK output plugin has been explicitly requested; please install JACK and libsamplerate dev files and run configure again])
 fi
 fi
 
 dnl *** sid
-AC_ARG_ENABLE( sid,
-[ --disable-sid disable SID input plugin (default=enabled)],,
- enable_sid="yes")
-
-if test "x$enable_sid" = "xyes"; then
- AM_PATH_SIDPLAY(have_sidplay=yes, have_sidplay=no)
+AC_ARG_ENABLE(sid,
+[AS_HELP_STRING([--disable-sid], [disable SID input plugin (default=enabled)])],
+ [enable_sid=$enableval], [enable_sid=auto])
+
+have_sidplay=no
+if test "x$enable_sid" != "xno"; then
+ PKG_CHECK_MODULES([SIDPLAYFP], [libsidplayfp >= 1.0],
+ [have_sidplay=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS sid"],
+ [if test "x$enable_sid" = "xyes"; then
+ AC_MSG_ERROR([Cannot find sidplayfp, but compilation of SID input plugin has been explicitly requested; please install sidplayfp and run configure again])
+ fi]
+ )
 else
- AC_MSG_RESULT([*** SID plugin disabled per user request ***])
- have_sidplay=no
-fi
-
-if test "x$have_sidplay" = "xyes"; then
-	INPUT_PLUGINS="$INPUT_PLUGINS sid"
+ AC_MSG_RESULT([*** SID plugin disabled per user request ***])
 fi
 
 dnl OSS output
 dnl ==========
 
 AC_ARG_ENABLE(oss4,
- AS_HELP_STRING([--disable-oss4],[disable OSS4 output plugin]),
- [enable_oss4="$enableval"], [enable_oss4="yes"])
+ [AS_HELP_STRING([--disable-oss4],[disable OSS4 output plugin])],
+ [enable_oss4=$enableval], [enable_oss4=auto])
 
-OSS_CFLAGS=""
-
-if test "$enable_oss4" = "yes" ; then
+OSS_CFLAGS=
+have_oss4=no
+if test "x$enable_oss4" != "xno" ; then
 if test -f "/etc/oss.conf"; then
 . "/etc/oss.conf"
 OSS_CFLAGS="-I$OSSLIBDIR/include"
@@ -577,89 +598,98 @@
 #if OSS_VERSION >= 0x40000 || SOUND_VERSION >= 0x40000
 yes
 #endif],
- [enable_oss4="yes"], [enable_oss4="no"])
+ [have_oss4=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
+ AC_SUBST(OSS_CFLAGS)],
+ [if test "x$enable_oss4" = "xyes"; then
+ AC_MSG_ERROR([Cannot find OSS4 development files, but compilation of OSS4 output plugin has been explicitly requested; please install OSS4 dev files and run configure again])
+ fi]
+ )
 
- AC_MSG_RESULT([$enable_oss4])
+ AC_MSG_RESULT([$have_oss4])
 CPPFLAGS="$OLD_CPPFLAGS"
 fi
 
-AC_SUBST(OSS_CFLAGS)
-
-if test "$enable_oss4" = "yes"; then
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
-fi
-
 dnl *** ALSA output plugin
 
 AC_ARG_ENABLE(alsa,
- [ --disable-alsa disable ALSA output plugin],
+ [AS_HELP_STRING([--disable-alsa], [disable ALSA output plugin])],
 [enable_alsa=$enableval],
- [enable_alsa=yes]
+ [enable_alsa=auto]
 )
 
-if test "x$enable_alsa" = "xyes"; then
- PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.16], [have_alsa=yes], [have_alsa=no])
+have_alsa=no
+if test "x$enable_alsa" != "xno"; then
+ PKG_CHECK_MODULES([ALSA], [alsa >= 1.0.16],
+ [have_alsa=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS alsa"],
+ [if test "x$enable_alsa" = "xyes"; then
+ AC_MSG_ERROR([Cannot find ALSA development files (ver >= 1.0.16), but compilation of ALSA output plugin has been explicitly requested; please install ALSA dev files and run configure again])
+ fi])
 else
 AC_MSG_RESULT([*** ALSA output plugin disabled per user request ***])
- have_alsa=no
-fi
-
-if test "x$have_alsa" = "xyes"; then
-	OUTPUT_PLUGINS="$OUTPUT_PLUGINS alsa"
 fi
 
 dnl SDL Output
 dnl ==========
 
 AC_ARG_ENABLE(sdlout,
- [ --disable-sdlout disable SDL output plugin],
- [enable_sdlout=$enableval], [enable_sdlout=yes])
-
-if test $enable_sdlout = yes ; then
- PKG_CHECK_MODULES([SDL], [sdl >= 1.2.11], [enable_sdlout=yes], [enable_sdlout=no])
-fi
-
-if test $enable_sdlout = yes ; then
-	OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"
+ [AS_HELP_STRING([--disable-sdlout], [disable SDL output plugin])],
+ [enable_sdlout=$enableval], [enable_sdlout=auto])
+
+have_sdlout=no
+if test "x$enable_sdlout" != "xno"; then
+ PKG_CHECK_MODULES([SDL], [sdl2 >= 2.0],
+ [have_sdlout=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"],
+ [PKG_CHECK_MODULES([SDL], [sdl >= 1.2.11],
+ [have_sdlout=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"],
+ [if test "x$enable_sdlout" = "xyes"; then
+ AC_MSG_ERROR([Cannot find SDL development files (ver >= 1.2.11), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again])
+ fi])])
 fi
 
 dnl *** sndio output
 
 AC_ARG_ENABLE(sndio,
- [ --disable-sndio disable sndio output plugin (default=enabled) ],
- [have_sndio=$enableval],
- [have_sndio=yes]
+ [AS_HELP_STRING([--disable-sndio], [disable sndio output plugin (default=enabled)])],
+ [enable_sndio=$enableval],
+ [enable_sndio=auto]
 )
 
-if test "x$have_sndio" = "xyes"; then
- AC_CHECK_HEADER(sndio.h,, have_sndio=no)
- if test x$have_sndio = xyes; then
- AC_CHECK_LIB(sndio, sio_open, haves_sndio=yes, have_sndio=no)
- fi
-fi
+have_sndio=no
+if test "x$enable_sndio" != "xno"; then
+ AC_CHECK_HEADER([sndio.h],
+ [AC_CHECK_LIB([sndio], [sio_open],
+ [have_sndio=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio"
+ SNDIO_LIBS="-lsndio"
+ AC_SUBST(SNDIO_LIBS)]
+ )]
+ )
 
-if test "x$have_sndio" = "xyes"; then
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio"
- SNDIO_LIBS="-lsndio"
- AC_SUBST(SNDIO_LIBS)
+ if test "x$enable_sndio" = "xyes" -a "x$have_sndio" != "xyes"; then
+ AC_MSG_ERROR([Cannot find sndio development files, but compilation of sndio output plugin has been explicitly requested; please install sndio dev files and run configure again])
+ fi
 fi
 
 dnl *** amidi-plug (note: to avoid checking twice ALSA, this should appear somewhere after the alsa output plugin check)
 
 AC_ARG_ENABLE(amidiplug,
- [ --disable-amidiplug disable amidi-plug input plugin (default=check) ],
+ [AS_HELP_STRING([--disable-amidiplug], [disable amidi-plug input plugin (default=check)])],
 [enable_amidiplug=$enableval],
 [enable_amidiplug=check]
 )
 
 AC_ARG_ENABLE(amidiplug-alsa,
- [ --disable-amidiplug-alsa disable amidi-plug ALSA backend (default=enabled) ],
+ [AS_HELP_STRING([--disable-amidiplug-alsa], [disable amidi-plug ALSA backend (default=enabled)])],
 [enable_amidiplug_alsa=$enableval],
 [enable_amidiplug_alsa=auto]
 )
 
 AC_ARG_ENABLE(amidiplug-flsyn,
- [ --disable-amidiplug-flsyn disable amidi-plug FluidSynth backend (default=enabled) ],
+ [AS_HELP_STRING([--disable-amidiplug-flsyn], [disable amidi-plug FluidSynth backend (default=enabled)])],
 [enable_amidiplug_fluidsynth=$enableval],
 [enable_amidiplug_fluidsynth=auto]
 )
@@ -747,101 +777,97 @@
 dnl ========
 
 AC_ARG_ENABLE(cdaudio,
- [ --disable-cdaudio disable cdaudio-ng input plugin (default=enabled) ],
+ [AS_HELP_STRING([--disable-cdaudio], [disable cdaudio-ng input plugin (default=enabled)])],
 [enable_cdaudio_ng=$enableval],
- [enable_cdaudio_ng=yes]
-)
-
-if test "$enable_cdaudio_ng" = "yes"; then
- PKG_CHECK_MODULES(CDIO, [libcdio >= 0.70],
- ,
- [AC_MSG_WARN([*** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***])
- enable_cdaudio_ng=no]
+ [enable_cdaudio_ng=auto]
 )
-fi
 
-if test "$enable_cdaudio_ng" = "yes"; then
- PKG_CHECK_MODULES(CDIO, [libcdio_cdda >= 0.70],
- [CDIO_LIBS=`pkg-config --libs libcdio_cdda`
- CDIO_CFLAGS=`pkg-config --cflags libcdio_cdda`
- AC_SUBST(CDIO_LIBS)
- AC_SUBST(CDIO_CFLAGS)],
- [AC_MSG_WARN([*** Cannot find libcdio_cdda 0.70 or newer, cdaudio-ng will not be built ***])
- enable_cdaudio_ng=no]
-)
-fi
+have_cdaudio_ng=no
+if test "x$enable_cdaudio_ng" != "xno"; then
+ PKG_CHECK_MODULES(CDIO, [libcdio >= 0.70 libcdio_cdda >= 0.70],
+ [PKG_CHECK_MODULES(CDDB, [libcddb >= 1.2.1],
+ [have_cdaudio_ng=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS cdaudio-ng"
+ GENERAL_PLUGINS="$GENERAL_PLUGINS cd-menu-items"
+ AC_SUBST(CDIO_LIBS)
+ AC_SUBST(CDIO_CFLAGS)
+ AC_SUBST(CDDB_LIBS)
+ AC_SUBST(CDDB_CFLAGS)],
+ [AC_MSG_WARN([*** Cannot find libcddb 1.2.1 or newer, cdaudio-ng will not be built ***])]
+ )],
+ [AC_MSG_WARN([*** Cannot find libcdio 0.70 or newer, cdaudio-ng will not be built ***])]
+ )
 
-if test "$enable_cdaudio_ng" = "yes"; then
- PKG_CHECK_MODULES(CDDB, [libcddb >= 1.2.1],
- [INPUT_PLUGINS="$INPUT_PLUGINS cdaudio-ng"
- GENERAL_PLUGINS="$GENERAL_PLUGINS cd-menu-items"
- CDDB_LIBS=`pkg-config --libs libcddb`
- CDDB_CFLAGS=`pkg-config --cflags libcddb`
- AC_SUBST(CDDB_LIBS)
- AC_SUBST(CDDB_CFLAGS)],
- [AC_MSG_WARN([*** Cannot find libcddb 1.2.1 or newer, cdaudio-ng will not be built ***])
- enable_cdaudio_ng=no]
-)
+ if test "x$enable_cdaudio_ng" = "xyes" -a "x$have_cdaudio_ng" != "xyes"; then
+ AC_MSG_ERROR([Compilation of cdaudio-ng input plugin has been explicitly requested; please install required dev files and run configure again])
+ fi
 fi
 
+dnl *** scrobbler2 ***
 
-dnl *** scrobbler ***
+AC_ARG_ENABLE(scrobbler2,
+ [AS_HELP_STRING([--disable-scrobbler2], [disable Scrobbler 2 plugin (default=enabled)])],
+ [enable_scrobbler2=$enableval], [enable_scrobbler2=auto])
 
-AC_ARG_ENABLE(scrobbler,
- [ --disable-scrobbler disable Scrobbler plugin (default=enabled)],
- [have_scrobbler=$enableval], [have_scrobbler="yes"])
-
-if test "x$have_scrobbler" = "xyes"; then
+have_scrobbler2=no
+if test "x$enable_scrobbler2" != "xno"; then
 PKG_CHECK_MODULES(CURL, [libcurl >= 7.9.7],
- [have_scrobbler="$have_scrobbler"], [have_scrobbler="no"])
- AC_SUBST(CURL_CFLAGS)
- AC_SUBST(CURL_LIBS)
-fi
-
-if test "x$have_scrobbler" = "xyes"; then
-	GENERAL_PLUGINS="$GENERAL_PLUGINS scrobbler"
+ [have_scrobbler2=yes
+ AC_SUBST(CURL_CFLAGS)
+ AC_SUBST(CURL_LIBS)]
+ GENERAL_PLUGINS="$GENERAL_PLUGINS scrobbler2",
+ [if test "x$enable_scrobbler2" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libcurl development files (ver >= 7.9.7), but compilation of Scrobbler 2 plugin has been explicitly requested; please install libcurl dev files and run configure again])
+ fi]
+ )
 fi
 
 dnl *** neon http plugin ***
 
 AC_ARG_ENABLE(neon,
-[ --disable-neon disable neon HTTP support (default=enabled)],
-[have_neon=$enableval],
-[have_neon=yes])
-
-if test "x$have_neon" = "xyes"; then
- PKG_CHECK_MODULES(NEON, [neon >= 0.26], [TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon" ], [have_neon="no"])
- AC_CHECK_LIB([neon], [ne_set_connect_timeout], [AC_DEFINE(HAVE_NE_SET_CONNECT_TIMEOUT, 1, [Whether we have ne_set_connect_timeout])], [], [$NEON_LIBS])
-else
- have_neon="no"
+[AS_HELP_STRING([--disable-neon], [disable neon HTTP support (default=enabled)])],
+[enable_neon=$enableval],
+[enable_neon=auto])
+
+have_neon=no
+if test "x$enable_neon" != "xno"; then
+ PKG_CHECK_MODULES(NEON, [neon >= 0.26],
+ [have_neon=yes
+ TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon"
+ AC_CHECK_LIB([neon], [ne_set_connect_timeout], [AC_DEFINE(HAVE_NE_SET_CONNECT_TIMEOUT, 1, [Whether we have ne_set_connect_timeout])], [], [$NEON_LIBS])
+ AC_SUBST([NEON_LIBS])
+ AC_SUBST([NEON_CFLAGS])],
+ [if test "x$enable_neon" = "xyes"; then
+ AC_MSG_ERROR([Cannot find neon development files (ver >= 0.26), but compilation of neon HTTP support has been explicitly requested; please install neon dev files and run configure again])
+ fi]
+ )
 fi
-AC_SUBST([NEON_LIBS])
-AC_SUBST([NEON_CFLAGS])
 
 dnl MMS
 dnl ===
 
 AC_ARG_ENABLE(mms,
-[ --disable-mms disable mms support. (default=enabled)],
-[have_mms=$enableval],
-[have_mms=yes])
-
-if test "x$have_mms" = "xyes"; then
- have_mms=yes
- PKG_CHECK_MODULES(MMS, [libmms >= 0.3], [TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS mms" ], [have_mms="no"])
+[AS_HELP_STRING([--disable-mms], [disable mms support. (default=enabled)])],
+[enable_mms=$enableval],
+[enable_mms=auto])
+
+have_mms=no
+if test "x$enable_mms" != "xno"; then
+ PKG_CHECK_MODULES(MMS, [libmms >= 0.3],
+ [have_mms=yes
+ TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS mms"],
+ [if test "x$enable_mms" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libmms development files (ver >= 0.3), but compilation of mms support has been explicitly requested; please install libmms dev files and run configure again])
+ fi]
+ )
 else
- have_mms=no
 AC_MSG_RESULT([*** mms plugin disabled by request ***])
 fi
 
 dnl XSPF
 dnl ----
 
-PKG_CHECK_MODULES(XML, [libxml-2.0], [have_xml=yes], [have_xml=no])
-
-if test $have_xml = "no" ; then
- AC_MSG_ERROR([Please install libxml-2.0.])
-fi
+PKG_CHECK_MODULES([XML], [libxml-2.0])
 
 CONTAINER_PLUGINS="$CONTAINER_PLUGINS xspf"
 
@@ -850,15 +876,20 @@
 dnl ---
 
 AC_ARG_ENABLE(cue,
-[ --disable-cue disable cue support. (default=enabled)],
-[have_cue=$enableval],
-[have_cue=yes])
-
-if test "x$have_cue" = "xyes"; then
- have_cue=yes
- PKG_CHECK_MODULES(CUE, [libcue], [CONTAINER_PLUGINS="$CONTAINER_PLUGINS cue" ], [have_cue="no"])
+[AS_HELP_STRING([--disable-cue], [disable cue support. (default=enabled)])],
+[enable_cue=$enableval],
+[enable_cue=auto])
+
+have_cue=no
+if test "x$enable_cue" != "xno"; then
+ PKG_CHECK_MODULES(CUE, [libcue],
+ [have_cue=yes
+ CONTAINER_PLUGINS="$CONTAINER_PLUGINS cue"],
+ [if test "x$enable_cue" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libcue development files, but compilation of cue support has been explicitly requested; please install libcue dev files and run configure again])
+ fi]
+ )
 else
- have_cue=no
 AC_MSG_RESULT([*** cue plugin disabled by request ***])
 fi
 
@@ -866,122 +897,150 @@
 dnl ==========
 
 AC_ARG_ENABLE(filewriter,
- [ --disable-filewriter disable FileWriter output plugin (default=enabled) ],
+ [AS_HELP_STRING([--disable-filewriter], [disable FileWriter output plugin (default=enabled)])],
 [enable_filewriter=$enableval],
 [enable_filewriter=yes]
 )
 
-if test "x$enable_filewriter" = "xyes"; then
-	OUTPUT_PLUGINS="$OUTPUT_PLUGINS filewriter"
+have_filewriter=no
+if test "x$enable_filewriter" != "xno"; then
+ have_filewriter=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS filewriter"
 fi
 
 
 AC_ARG_ENABLE(filewriter_mp3,
- [ --disable-filewriter_mp3 disable FileWriter MP3 output part (default=enabled) ],
- [enable_filewriter_mp3=$enableval], [enable_filewriter_mp3=yes]
+ [AS_HELP_STRING([--disable-filewriter_mp3], [disable FileWriter MP3 output part (default=enabled)])],
+ [enable_filewriter_mp3=$enableval], [enable_filewriter_mp3=auto]
 )
 
-if test "x$enable_filewriter_mp3" = "xyes"; then
- AC_CHECK_LIB(mp3lame, lame_get_id3v2_tag, [have_lame=yes], [have_lame=no], [-lm])
- if test "x$have_lame" = "xyes"; then
- AC_DEFINE(FILEWRITER_MP3, 1, [Define if MP3 output part should be built])
-	 FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
- fi
+have_lame=no
+if test "x$have_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; then
+ AC_CHECK_LIB([mp3lame], [lame_get_id3v2_tag],
+ [have_lame=yes
+ AC_DEFINE(FILEWRITER_MP3, 1, [Define if MP3 output part should be built])
+ FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"],
+ [if test "x$enable_filewriter_mp3" = "xyes"; then
+ AC_MSG_ERROR([Cannot find lame development files, but compilation of FileWriter MP3 output part has been explicitly requested; please install lame dev files and run configure again])
+ fi],
+ [-lm]
+ )
 fi
 
 dnl Vorbis support reuses test done for Vorbis input plugin.
 
-if test $enable_vorbis = yes ; then
+have_vorbisenc=no
+if test "x$have_filewriter" = "xyes" -a "x$have_vorbis" = "xyes"; then
+ have_vorbisenc=yes
 AC_DEFINE(FILEWRITER_VORBIS, 1, [Define if Vorbis output part should be built])
 FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $VORBIS_CFLAGS"
 FILEWRITER_LIBS="$FILEWRITER_LIBS $VORBIS_LIBS"
 fi
 
 AC_ARG_ENABLE(filewriter_flac,
- [ --disable-filewriter_flac disable FileWriter FLAC output part (default=enabled) ],
- [enable_filewriter_flac=$enableval], [enable_filewriter_flac=yes]
+ [AS_HELP_STRING([--disable-filewriter_flac], [disable FileWriter FLAC output part (default=enabled)])],
+ [enable_filewriter_flac=$enableval], [enable_filewriter_flac=auto]
 )
 
-if test "x$enable_filewriter_flac" = "xyes"; then
- PKG_CHECK_MODULES(FLAC, [flac >= 1.1.3],
- [have_writer_flac=yes], [have_writer_flac=no]
+have_writer_flac=no
+if test "x$have_filewriter" = "xyes" -a "x$enable_filewriter_flac" != "xno"; then
+ PKG_CHECK_MODULES(FLAC, [flac >= 1.1.3],
+ [have_writer_flac=yes
+ AC_DEFINE(FILEWRITER_FLAC, 1, [Define if FLAC output part should be built])
+ FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $FLAC_CFLAGS"
+ FILEWRITER_LIBS="$FILEWRITER_LIBS $FLAC_LIBS"],
+ [if test "x$enable_filewriter_flac" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libflac development files (ver >= 1.1.3), but compilation of FileWriter FLAC output part has been explicitly requested; please install libflac dev files and run configure again])
+ fi]
 )
- if test "x$have_writer_flac" = "xyes"; then
- AC_DEFINE(FILEWRITER_FLAC, 1, [Define if FLAC output part should be built])
-	 FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS `pkg-config --cflags flac`"
-	 FILEWRITER_LIBS="$FILEWRITER_LIBS `pkg-config --libs flac`"
- fi
 fi
 
-if test "x$enable_filewriter" != "xyes"; then
- have_lame=no
- have_vorbisenc=no
- have_writer_flac=no
- FILEWRITER_LIBS=""
-fi
 AC_SUBST(FILEWRITER_CFLAGS)
 AC_SUBST(FILEWRITER_LIBS)
 
 dnl *** BS2B effect plugin
 
 AC_ARG_ENABLE(bs2b,
- [ --disable-bs2b disable BS2B effect plugin (default=enabled)],
+ [AS_HELP_STRING([--disable-bs2b], [disable BS2B effect plugin (default=enabled)])],
 [enable_bs2b=$enableval],
- [enable_bs2b=yes]
+ [enable_bs2b=auto]
 )
 
-if test "x$enable_bs2b" = "xyes"; then
- PKG_CHECK_MODULES([BS2B], [libbs2b >= 3.0.0], [have_bs2b=yes], [have_bs2b=no])
+have_bs2b=no
+if test "x$enable_bs2b" != "xno"; then
+ PKG_CHECK_MODULES([BS2B], [libbs2b >= 3.0.0],
+ [have_bs2b=yes
+ EFFECT_PLUGINS="$EFFECT_PLUGINS bs2b"],
+ [if test "x$enable_bs2b" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libbs2b development files (ver >= 3.0.0), but compilation of BS2B effect plugin has been explicitly requested; please install libbs2b dev files and run configure again])
+ fi]
+ )
 else
 AC_MSG_RESULT([*** BS2B effect plugin disabled per user request ***])
- have_bs2b=no
-fi
-
-if test "x$have_bs2b" = "xyes"; then
-	EFFECT_PLUGINS="$EFFECT_PLUGINS bs2b"
 fi
 
-
 dnl *** Resample effect plugin
 
 AC_ARG_ENABLE(resample,
- [ --disable-resample disable resample effect plugin (default=enabled)],
- [enable_resample=$enableval], [enable_resample=yes]
+ [AS_HELP_STRING([--disable-resample], [disable resample effect plugin (default=enabled)])],
+ [enable_resample=$enableval], [enable_resample=auto]
 )
 
-if test "x$enable_resample" = "xyes"; then
+have_resample=no
+if test "x$enable_resample" != "xno"; then
 PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
- [enable_resample=yes], [enable_resample=no])
-fi
-
-if test "x$enable_resample" = "xyes"; then
-	EFFECT_PLUGINS="$EFFECT_PLUGINS resample"
+ [have_resample=yes
+ EFFECT_PLUGINS="$EFFECT_PLUGINS resample"],
+ [if test "x$enable_resample" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libsamplerate development files, but compilation of resample effect plugin has been explicitly requested; please install libsamplerate dev files and run configure again])
+ fi]
+ )
 fi
 
 dnl Speed and Pitch effect plugin
 dnl =============================
 
 AC_ARG_ENABLE(speedpitch,
- AS_HELP_STRING([--disable-speedpitch],[disable Speed and Pitch effect plugin]),
- [enable_speedpitch="$enableval"], [enable_speedpitch="yes"])
+ [AS_HELP_STRING([--disable-speedpitch],[disable Speed and Pitch effect plugin])],
+ [enable_speedpitch="$enableval"], [enable_speedpitch=auto])
 
-if test "x$enable_speedpitch" = "xyes"; then
+have_speedpitch=no
+if test "x$enable_speedpitch" != "xno"; then
 PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
- [enable_speedpitch=yes], [enable_speedpitch=no])
+ [have_speedpitch=yes
+ EFFECT_PLUGINS="$EFFECT_PLUGINS speed-pitch"],
+ [if test "x$enable_speedpitch" = "xyes"; then
+ AC_MSG_ERROR([Cannot find libsamplerate development files, but compilation of Speed and Pitch effect plugin has been explicitly requested; please install libsamplerate dev files and run configure again])
+ fi]
+ )
 fi
 
-if test "x$enable_speedpitch" = "xyes"; then
-	EFFECT_PLUGINS="$EFFECT_PLUGINS speed-pitch"
+dnl *** SoX Resampler effect plugin
+
+AC_ARG_ENABLE(soxr,
+ [AS_HELP_STRING([--disable-soxr], [disable SoX Resampler effect plugin (default=enabled)])],
+ [enable_soxr=$enableval], [enable_soxr=auto]
+)
+
+have_soxr=no
+if test "x$enable_soxr" != "xno"; then
+ PKG_CHECK_MODULES([SOXR], [soxr],
+ [have_soxr=yes
+ EFFECT_PLUGINS="$EFFECT_PLUGINS sox-resampler"],
+ [if test "x$enable_soxr" = "xyes"; then
+ AC_MSG_ERROR([Cannot find soxr development files, but compilation of SoX Resampler effect plugin has been explicitly requested; please install soxr dev files and run configure again])
+ fi]
+ )
 fi
 
 dnl GTK Interface
 dnl =============
 
 AC_ARG_ENABLE(gtkui,
- [ --disable-gtkui disable GTK interface (gtkui)],
+ [AS_HELP_STRING([--disable-gtkui], [disable GTK interface (gtkui)])],
 [enable_gtkui=$enableval], [enable_gtkui="yes"])
 
-if test $enable_gtkui = yes ; then
+if test "x$enable_gtkui" != "xno"; then
 GENERAL_PLUGINS="$GENERAL_PLUGINS gtkui"
 fi
 
@@ -989,10 +1048,10 @@
 dnl =============
 
 AC_ARG_ENABLE(skins,
- [ --disable-skins disable Winamp Classic interface (skins)],
+ [AS_HELP_STRING([--disable-skins], [disable Winamp Classic interface (skins)])],
 [enable_skins=$enableval], [enable_skins="yes"])
 
-if test $enable_skins = yes ; then
+if test "x$enable_skins" != "xno"; then
 GENERAL_PLUGINS="$GENERAL_PLUGINS skins"
 fi
 
@@ -1000,16 +1059,36 @@
 dnl =========
 
 AC_ARG_ENABLE(lyricwiki,
- [ --disable-lyricwiki disable LyricWiki plugin (default=enabled)],
- [enable_lyricwiki=$enableval], [enable_lyricwiki=yes])
-
-if test "x$enable_lyricwiki" = "xyes"; then
- PKG_CHECK_MODULES(GLIB214, [glib-2.0 >= 2.14], [enable_lyricwiki=yes],
- [enable_lyricwiki=no])
+ [AS_HELP_STRING([--disable-lyricwiki], [disable LyricWiki plugin (default=enabled)])],
+ [enable_lyricwiki=$enableval], [enable_lyricwiki=auto])
+
+have_lyricwiki=no
+if test "x$enable_lyricwiki" != "xno"; then
+ PKG_CHECK_MODULES(GLIB214, [glib-2.0 >= 2.14],
+ [have_lyricwiki=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"],
+ [if test "x$enable_lyricwiki" = "xyes"; then
+ AC_MSG_ERROR([Cannot find GLib development files (ver >= 2.14), but compilation of LyricWiki plugin has been explicitly requested; please install GLib dev files and run configure again])
+ fi]
+ )
 fi
 
-if test "x$enable_lyricwiki" = "xyes"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"
+dnl OpenGL Spectrum Analyzer
+dnl ========================
+
+AC_ARG_ENABLE(glspectrum,
+ [AS_HELP_STRING([--disable-glspectrum], [disable OpenGL Spectrum Analyzer (default=enabled)])],
+ [enable_glspectrum=$enableval], [enable_glspectrum=auto])
+
+have_glspectrum=no
+if test "x$enable_glspectrum" != "xno"; then
+ AC_CHECK_LIB([GL], [glXChooseVisual],
+ [have_glspectrum=yes
+ VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS gl-spectrum"],
+ [if test "x$enable_glspectrum" = "xyes"; then
+ AC_MSG_ERROR([Cannot find GLX development files, but compilation of OpenGL Spectrum Analyzer has been explicitly requested; please install GLX dev files and run configure again])
+ fi]
+ )
 fi
 
 dnl *** End of all plugin checks ***
@@ -1042,10 +1121,10 @@
 fi
 
 if test -z "$datadir"; then
-	datadir="${prefix}/share"
+ datadir="${prefix}/share"
 fi
 
-localedir="$datadir/locale"
+localedir="$datarootdir/locale"
 AC_SUBST(localedir)
 
 AC_SUBST(EFFECT_PLUGINS)
@@ -1057,51 +1136,61 @@
 AC_SUBST(TRANSPORT_PLUGINS)
 AC_SUBST(GCC42_CFLAGS)
 
+
+dnl Reliably #include "config.h" (for large file support)
+dnl =====================================================
+CPPFLAGS="$CPPFLAGS -include config.h"
+
+
+dnl Generate config files
+dnl =====================
+
 AC_CONFIG_FILES([
-	buildsys.mk
-	extra.mk
+ buildsys.mk
+ extra.mk
 ])
 
 BUILDSYS_TOUCH_DEPS
 AC_OUTPUT
 
+
+dnl Print results
+dnl =============
+
 echo
 echo "Configuration:"
 echo
-echo " Install path: ${audacious_plugin_root}"
+echo " Install path: $plugindir"
 echo
 echo " Output Plugins"
 echo " --------------"
-echo " Open Sound System (oss4): $enable_oss4"
+echo " Open Sound System (oss4): $have_oss4"
 echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
 echo " Sndio (sndio): $have_sndio"
 echo " PulseAudio (pulse): $have_pulse"
-echo " Jack Audio Connection Kit (jack): $enable_jack"
-echo " Simple DirectMedia Layer (sdlout): $enable_sdlout"
-echo " FileWriter: $enable_filewriter"
+echo " Jack Audio Connection Kit (jack): $have_jack"
+echo " Simple DirectMedia Layer (sdlout): $have_sdlout"
+echo " FileWriter: $have_filewriter"
 echo " -> FileWriter MP3 output part: $have_lame"
-echo " -> FileWriter Vorbis output part: $enable_vorbis"
+echo " -> FileWriter Vorbis output part: $have_vorbisenc"
 echo " -> FileWriter FLAC output part: $have_writer_flac"
 echo
 echo " Input Plugins"
 echo " -------------"
-echo " MPEG-1 Layer I/II/III (mpg123): $enable_mp3"
-echo " MPEG-2/4 AAC (aac): $enable_aac"
+echo " MPEG-1 Layer I/II/III (mpg123): $have_mp3"
+echo " MPEG-2/4 AAC (aac): $have_aac"
 echo " FFaudio (ffaudio): $have_ffaudio"
 echo " Module decoder (modplug): $have_modplug"
 echo " MIDI modular plugin (amidi-plug): $enable_amidiplug"
 echo " -> ALSA backend: $enable_amidiplug_alsa"
 echo " -> FluidSynth backend: $enable_amidiplug_fluidsynth"
-echo " CD Digital Audio (cdaudio_ng): $enable_cdaudio_ng"
-echo " sndfile extensions: $enable_sndfile"
+echo " CD Digital Audio (cdaudio_ng): $have_cdaudio_ng"
+echo " sndfile extensions: $have_sndfile"
 echo " Tone Generator: yes"
-echo " Ogg Vorbis (vorbis): $enable_vorbis"
+echo " Ogg Vorbis (vorbis): $have_vorbis"
 echo " Free Lossless Audio Codec (flacng): $have_flacng"
-echo " Commodore 64 audio (SID): $have_sidplay $xs_have_sidplay2_api"
-echo " -> libSIDPlay1 support: $xs_have_sidplay1"
-echo " -> libSIDPlay2 support: $xs_have_sidplay2"
-echo " -> distortion patched libSIDPlay2: $xs_have_distortion"
-echo " Game music (spc, nsf & gbs): $enable_console"
+echo " Commodore 64 audio (SID): $have_sidplay"
+echo " Game music (spc, nsf & gbs): $have_console"
 echo " PlayStation (psf/psf2) audio: $enable_psf"
 echo " Nintendo DS audio (xsf): $enable_xsf"
 echo " AdLib synthesizer (adplug): $have_adplug"
@@ -1112,18 +1201,18 @@
 echo " -------"
 echo " Alarm: yes"
 echo " Album Art: yes"
-echo " Linux Infrared Remote Control (LIRC) $enable_lirc"
-echo " MPRIS 2 Server: $enable_mpris2"
+echo " Linux Infrared Remote Control (LIRC) $have_lirc"
+echo " MPRIS 2 Server: $have_mpris2"
 echo " Search Tool: yes"
-echo " Song Change: $enable_songchange"
+echo " Song Change: $have_songchange"
 echo " Status Icon: $have_statusicon"
 echo " Audacious OSD: $have_aosd"
 echo " -> X Composite support: $have_aosd_xcomp"
 echo " libnotify OSD: $have_notify"
 echo " Global Hotkey Plugin: $have_hotkey"
 echo " Gnome Shortcuts Plugin: $have_gnomeshortcuts"
-echo " AudioScrobbler Client: $have_scrobbler"
-echo " LyricWiki viewer: $enable_lyricwiki"
+echo " Scrobbler 2.0: $have_scrobbler2"
+echo " LyricWiki viewer: $have_lyricwiki"
 echo
 echo " Effect"
 echo " ------"
@@ -1135,19 +1224,21 @@
 echo " LADSPA Host: yes"
 echo " Voice Removal: yes"
 echo " Bauer stereophonic-to-binaural (bs2b): $have_bs2b"
-echo " Sample Rate Converter (resample): $enable_resample"
-echo " Speed and Pitch: $enable_speedpitch"
+echo " Sample Rate Converter (resample): $have_resample"
+echo " Speed and Pitch: $have_speedpitch"
+echo " SoX Resampler: $have_soxr"
 echo
 echo " Visualization"
 echo " -------------"
 echo " Blur Scope: yes"
 echo " Cairo Spectrum Analyzer: yes"
+echo " OpenGL Spectrum Analyzer: $have_glspectrum"
 echo
 echo " Transport"
 echo " ---------"
 echo " neon-based http/https: $have_neon"
 echo " libmms-based mms: $have_mms"
-echo " GIO: $enable_gio"
+echo " GIO: $have_gio"
 echo
 echo " Container"
 echo " ---------"

audacious-plugins-3.3.4.tar.bz2/extra.mk.in -> audacious-plugins-3.4.2.tar.bz2/extra.mk.in Changed

audacious-plugins-3.3.4.tar.bz2/install-sh -> audacious-plugins-3.4.2.tar.bz2/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +202,17 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -347,7 +354,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then

audacious-plugins-3.4.2.tar.bz2/mkrelease.sh Added

audacious-plugins-3.3.4.tar.bz2/po/Makefile -> audacious-plugins-3.4.2.tar.bz2/po/Makefile Changed

audacious-plugins-3.3.4.tar.bz2/po/POTFILES.in -> audacious-plugins-3.4.2.tar.bz2/po/POTFILES.in Changed

@@ -28,7 +28,6 @@
 src/cdaudio-ng/cdaudio-ng.c
 src/cd-menu-items/cd-menu-items.c
 src/compressor/plugin.c
-src/console/abstract_file.cxx
 src/console/Ay_Apu.cxx
 src/console/Ay_Emu.cxx
 src/console/Blip_Buffer.cxx
@@ -40,7 +39,6 @@
 src/console/Gbs_Emu.cxx
 src/console/Gme_File.cxx
 src/console/Gym_Emu.cxx
-src/console/Gzip_File.cxx
 src/console/Gzip_Reader.cxx
 src/console/Hes_Emu.cxx
 src/console/Kss_Emu.cxx
@@ -68,6 +66,7 @@
 src/flacng/metadata.c
 src/flacng/plugin.c
 src/gio/gio.c
+src/gl-spectrum/gl-spectrum.c
 src/gnomeshortcuts/gnomeshortcuts.c
 src/gtkui/columns.c
 src/gtkui/layout.c
@@ -93,14 +92,15 @@
 src/neon/neon.c
 src/notify/event.c
 src/notify/notify.c
+src/notify/osd.c
 src/oss4/plugin.c
 src/pls/pls.c
 src/psf/plugin.c
 src/pulse_audio/pulse_audio.c
 src/resample/resample.c
-src/scrobbler/configure.c
-src/scrobbler/plugin.c
-src/scrobbler/scrobbler.c
+src/scrobbler2/config_window.c
+src/scrobbler2/scrobbler.c
+src/scrobbler2/scrobbler_communication.c
 src/sdlout/plugin.c
 src/search-tool/search-tool.c
 src/skins/plugin.c
@@ -114,6 +114,7 @@
 src/sndfile/plugin.c
 src/sndio/sndio.c
 src/song_change/song_change.c
+src/sox-resampler/sox-resampler.c
 src/speed-pitch/speed-pitch.c
 src/statusicon/statusicon.c
 src/stereo_plugin/stereo.c

audacious-plugins-3.3.4.tar.bz2/po/audacious-plugins.pot -> audacious-plugins-3.4.2.tar.bz2/po/audacious-plugins.pot Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2012-12-09 23:25+0100\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,290 +18,277 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr ""
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr ""
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr ""
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr ""
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:39
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+
+#: src/alarm/interface.c:81
 msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
 msgstr ""
 
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
 msgstr ""
 
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
+#: src/alarm/interface.c:140
+msgid "Monday"
 msgstr ""
 
-#: src/alarm/interface.c:275
-msgid "hours"
+#: src/alarm/interface.c:140
+msgid "Tuesday"
 msgstr ""
 
-#: src/alarm/interface.c:332
-msgid "h"
+#: src/alarm/interface.c:140
+msgid "Wednesday"
 msgstr ""
 
-#: src/alarm/interface.c:360
-msgid "minutes"
+#: src/alarm/interface.c:141
+msgid "Thursday"
 msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
+#: src/alarm/interface.c:141
+msgid "Friday"
 msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
+#: src/alarm/interface.c:141
+msgid "Saturday"
 msgstr ""
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
+#: src/alarm/interface.c:141
+msgid "Sunday"
 msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
 msgstr ""
 
-#: src/alarm/interface.c:745
-msgid "Day"
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
 msgstr ""
 
-#: src/alarm/interface.c:761
-msgid "Tuesday"
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
 msgstr ""
 
-#: src/alarm/interface.c:770
-msgid "Wednesday"
+#: src/alarm/interface.c:216
+msgid "h"
 msgstr ""
 
-#: src/alarm/interface.c:779
-msgid "Thursday"
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
 msgstr ""
 
-#: src/alarm/interface.c:788
-msgid "Friday"
+#: src/alarm/interface.c:234
+msgid "hours"
 msgstr ""
 
-#: src/alarm/interface.c:797
-msgid "Saturday"
+#: src/alarm/interface.c:246
+msgid "minutes"
 msgstr ""
 
-#: src/alarm/interface.c:806
-msgid "Sunday"
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
 msgstr ""
 
-#: src/alarm/interface.c:814
-msgid "Monday"
+#: src/alarm/interface.c:262
+msgid "Day"
 msgstr ""
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr ""
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr ""
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr ""
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr ""
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr ""
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr ""
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr ""
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
+#: src/alarm/interface.c:357
+msgid "Final"
 msgstr ""
 
-#: src/alarm/interface.c:962
-msgid "Final"
+#: src/alarm/interface.c:372
+msgid "Current"
 msgstr ""
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr ""
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr ""
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr ""
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr ""
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr ""
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr ""
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr ""
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr ""
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr ""
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr ""
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr ""
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr ""
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr ""
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr ""
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr ""
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr ""
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr ""
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr ""
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr ""
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -310,25 +297,25 @@
 "code served as a reference when the ALSA manual was not enough."
 msgstr ""
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
 msgstr ""
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr ""
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr ""
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
 "This backend sends MIDI events to a group of user-chosen ALSA sequencer "
 "ports. The ALSA sequencer interface is very versatile, it can provide ports "
@@ -340,11 +327,11 @@
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr ""
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
 "This backend produces audio by sending MIDI events to FluidSynth, a real-"
 "time software synthesizer based on the SoundFont2 specification (www."
@@ -354,242 +341,265 @@
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
 msgstr ""
 
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr ""
-
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr ""
 
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr ""
+
+#: src/amidi-plug/i_utils.c:54
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing"
+msgstr ""
+
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
 msgstr ""
@@ -828,47 +838,47 @@
 msgid "Misc"
 msgstr ""
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr ""
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr ""
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr ""
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr ""
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr ""
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr ""
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr ""
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:106
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -880,231 +890,232 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:124
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:125
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:128
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:131
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:137
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:139
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:141
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:151
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:252
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:309
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:311
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:313
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:315
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:398
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:508
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:538 src/cdaudio-ng/cdaudio-ng.c:547
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:550
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:577
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:590
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:615
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:692
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:767
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:769
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:793
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:866
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:868
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr ""
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr ""
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr ""
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr ""
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr ""
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr ""
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr ""
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr ""
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr ""
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr ""
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr ""
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr ""
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr ""
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr ""
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr ""
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr ""
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr ""
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr ""
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
 "The default song length, expressed in seconds, is used for songs that do not "
 "provide length information (i.e. looping tracks)."
 msgstr ""
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1114,74 +1125,76 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr ""
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr ""
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr ""
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr ""
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr ""
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
@@ -1189,11 +1202,11 @@
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1203,7 +1216,7 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr ""
 
@@ -1285,11 +1298,13 @@
 msgid "Joint Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr ""
 
@@ -1337,7 +1352,7 @@
 msgid "Error protection"
 msgstr ""
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr ""
 
@@ -1417,19 +1432,19 @@
 msgid "Tags"
 msgstr ""
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr ""
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr ""
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:284
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1437,21 +1452,37 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr ""
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
@@ -1459,467 +1490,508 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr ""
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr ""
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr ""
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr ""
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr ""
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr ""
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr ""
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr ""
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr ""
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr ""
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr ""
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr ""
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr ""
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr ""
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr ""
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr ""
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr ""
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr ""
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr ""
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr ""
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr ""
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr ""
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr ""
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr ""
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr ""
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr ""
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr ""
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr ""
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr ""
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr ""
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr ""
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr ""
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr ""
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr ""
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr ""
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr ""
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr ""
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr ""
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr ""
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr ""
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr ""
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
+#: src/gtkui/menus.c:236
+msgid "_Sort"
 msgstr ""
 
-#: src/gtkui/menus.c:203
-msgid "_Sort"
+#: src/gtkui/menus.c:237
+msgid "Sort Se_lected"
+msgstr ""
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr ""
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr ""
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr ""
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr ""
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr ""
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr ""
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr ""
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr ""
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr ""
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr ""
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr ""
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr ""
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr ""
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr ""
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr ""
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr ""
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr ""
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr ""
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr ""
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr ""
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr ""
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr ""
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr ""
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr ""
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:99
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:169 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:175
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:178 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:229 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr ""
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr ""
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr ""
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr ""
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
+msgid "Rewind 5 seconds"
 msgstr ""
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+msgid "Mute"
 msgstr ""
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+msgid "Volume up"
 msgstr ""
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
+msgid "Volume down"
 msgstr ""
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
+msgid "Jump to file"
 msgstr ""
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
+msgid "Toggle player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
 msgstr ""
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+msgid "Toggle repeat"
 msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
+msgid "Toggle shuffle"
 msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
+msgid "Toggle stop after current"
 msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
+msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr ""
-
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr ""
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
 "It is not recommended to bind the primary mouse buttons without "
 "modificators.\n"
@@ -1927,33 +1999,33 @@
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr ""
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr ""
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr ""
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr ""
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr ""
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1968,11 +2040,11 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
@@ -1980,62 +2052,64 @@
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr ""
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr ""
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr ""
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr ""
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
 msgstr ""
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr ""
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr ""
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr ""
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr ""
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr ""
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr ""
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2043,27 +2117,27 @@
 "%s: how to create a proper config file\n"
 msgstr ""
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr ""
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr ""
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr ""
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr ""
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2079,67 +2153,67 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr ""
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr ""
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr ""
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr ""
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2148,67 +2222,174 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr ""
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr ""
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr ""
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr ""
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr ""
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr ""
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr ""
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr ""
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr ""
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
 "This plugin is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU General Public License as published by the Free "
@@ -2224,15 +2405,35 @@
 "this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr ""
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr ""
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr ""
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr ""
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr ""
 
@@ -2265,15 +2466,15 @@
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr ""
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2293,161 +2494,200 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr ""
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr ""
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr ""
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr ""
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr ""
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr ""
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr ""
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
 msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
 msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
 msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
 msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
 msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
 msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:233
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian."
-"com>"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr ""
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr ""
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr ""
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr ""
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
 msgstr ""
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2458,7 +2698,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2469,73 +2709,73 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr ""
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr ""
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr ""
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr ""
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr ""
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr ""
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr ""
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr ""
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr ""
 
@@ -2591,7 +2831,7 @@
 msgid "Presets"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr ""
 
@@ -2604,7 +2844,7 @@
 msgid "Load equalizer preset"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr ""
 
@@ -2616,7 +2856,7 @@
 msgid "Save equalizer preset"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr ""
 
@@ -2624,699 +2864,708 @@
 msgid "Delete auto-preset"
 msgstr ""
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr ""
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr ""
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr ""
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr ""
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr ""
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr ""
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr ""
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr ""
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr ""
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr ""
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr ""
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr ""
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr ""
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr ""
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr ""
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr ""
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr ""
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr ""
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr ""
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr ""
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr ""
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr ""
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr ""
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr ""
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr ""
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr ""
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr ""
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr ""
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr ""
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr ""
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr ""
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr ""
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr ""
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr ""
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr ""
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr ""
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr ""
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr ""
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr ""
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr ""
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr ""
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr ""
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr ""
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr ""
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr ""
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr ""
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr ""
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr ""
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr ""
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr ""
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr ""
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr ""
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr ""
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr ""
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr ""
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr ""
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr ""
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr ""
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr ""
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr ""
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr ""
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr ""
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr ""
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr ""
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr ""
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr ""
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr ""
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr ""
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr ""
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr ""
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr ""
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr ""
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr ""
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr ""
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr ""
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr ""
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr ""
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr ""
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr ""
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr ""
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr ""
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr ""
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr ""
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr ""
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr ""
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr ""
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr ""
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr ""
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr ""
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr ""
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr ""
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr ""
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr ""
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr ""
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr ""
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr ""
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr ""
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr ""
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
 "Select entries in playlist by filling one or more fields. Fields use regular "
 "expressions syntax, case-insensitive. If you don't know how regular "
@@ -3324,39 +3573,39 @@
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr ""
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3374,7 +3623,7 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr ""
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3396,67 +3645,75 @@
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 msgstr ""
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr ""
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
 msgstr ""
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr ""
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr ""
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr ""
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr ""
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr ""
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr ""
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr ""
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr ""
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3475,33 +3732,66 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3512,63 +3802,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr ""
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr ""
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr ""
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr ""
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr ""
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3577,11 +3867,11 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr ""
 
-#: src/unix-io/unix-io.c:246
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -3589,15 +3879,15 @@
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
 
-#: src/unix-io/unix-io.c:269
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr ""
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3618,44 +3908,44 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr ""
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr ""
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.c:288
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.c:338
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/wavpack/wavpack.c:345
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr ""
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr ""
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""

audacious-plugins-3.3.4.tar.bz2/po/be.po -> audacious-plugins-3.4.2.tar.bz2/po/be.po Changed

@@ -1,591 +1,589 @@
 # Belarusian translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Mikalai Udodau <crom-a@tut.by>, 2012.
+# Mikalai Udodau <crom-a@tut.by>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-16 23:46+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-04 12:38+0000\n"
 "Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: Belarusian\n"
+"Language-Team: Belarusian (http://www.transifex.com/projects/p/audacious/"
+"language/be/)\n"
+"Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: be\n"
-"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"
+"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"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "мона"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "стэрэа"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr ""
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Дэкодар AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr ""
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib Плэер)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr ""
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
 msgstr ""
 
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "Так"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
 msgstr ""
 
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Час"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "гадзін"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "г"
-
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "мінуты"
-
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Сцішыць пасля:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
 msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Тыповы"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr ""
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Дзень"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Панядзелак"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Аўторак"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Серада"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Чацвер"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Пятніца"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Субота"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Нядзеля"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Панядзелак"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr ""
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Час"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr ""
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "г"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Сцішыць пасля:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "гадзін"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "мінуты"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr ""
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Дзень"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Тыповы"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Дзён"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Згасанне"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "секунд"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Гучнасць"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Бягучы"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Пачаць у"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr ""
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Бягучы"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Дадатковы загад"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "уключыць"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Плэйліст (апцыянальны)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Выбраць плэйліст"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr ""
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr ""
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Опцыі"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Што азначаюць гэтыя опцыі?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Даведка"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Скасаваць"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr ""
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Дзякуй"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Афармленне альбома"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Тыповая прылада PCM"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Тыповая прылада мікшара"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Настаўленні плагіна вываду ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Прылада PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Прылада мікшара:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr ""
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "Вывад ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
 msgstr ""
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr ""
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Рухавік ALSA "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Рухавік FluidSynth "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Порт"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Назва кліента"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Назва порта"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Парты вываду ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Гукавая карта: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Рэгулятары мікшара: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Настаўленні мікшара"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "рухавік\nALSA"
+msgstr ""
+"рухавік\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "Плагін AMIDI - звесткі пра рухавік"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Выбар рухавіка"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Настаўленні прайгравання"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Транспазіцыя: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Адмысловыя настаўленні"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
 msgstr ""
 
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr ""
-
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Настаўленні SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Назва файла"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Памер (байтаў)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Чытаць ГШ па запуску плэера"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Чытаць ГШ па першым прайграванні MIDI-файла"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Настаўленні сінтэзатара"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "ужываць тыповы"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "велічыня:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "паліфанія"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "так"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "не"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "хорус"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Гц "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Гц "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Гц "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "адмысловыя "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Гц "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "рухавік\nFluidSynth"
+msgstr ""
+"рухавік\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Назва:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " Звесткі па MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Фармат:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Даўжыня (мсек):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Нум. трэкаў:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "пераменны"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr " * у гэтым MIDI-файле каментарыі недаступныя *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* у гэтым MIDI-файле каментарыі недаступныя *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (недапушчальны UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -781,7 +779,8 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
 msgstr ""
 
 #: src/aosd/aosd_ui.c:799
@@ -845,47 +844,47 @@
 msgid "Misc"
 msgstr ""
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "Плэйлісты ASXv1/ASXv2"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Плэйлісты Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Колер"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Размыты асцылограф"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr ""
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr ""
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Прэсеты:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Спектральны аналізатар"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -897,231 +896,232 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Прылада"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Метазвесткі"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Ужываць CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Ужываць CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Ужываць HTTP замест CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Шлях:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Плагін Аўдыё КД"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Аўдыё КД"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Прывад пусты."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Тып не падтрымліваецца."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Прайграць КД"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Дадаць КД"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr ""
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Кампрэсія"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr ""
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Дынамічны дыяпазон:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr ""
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr ""
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Агульныя"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Прайграванне"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Бас:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "сек"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr ""
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Тыповая працягласць песні:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr ""
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr ""
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr ""
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Гц"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr ""
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr ""
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
 msgstr ""
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1131,74 +1131,76 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Пераход"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Перакрыццё:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Пераход"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Крышталайзер"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Інтэнсіўнасць:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Крышталайзер"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Рэха"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Затрымка:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "мс"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Зваротная сувязь:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Гучнасць:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
@@ -1206,11 +1208,11 @@
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Рэха"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1220,7 +1222,7 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Плагін FFmpeg"
 
@@ -1302,11 +1304,13 @@
 msgid "Joint Stereo"
 msgstr "Аб'яднанае стэрэа"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Стэрэа"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Мона"
 
@@ -1354,7 +1358,7 @@
 msgid "Error protection"
 msgstr "Абарона ад памылак"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Якасць"
 
@@ -1434,19 +1438,19 @@
 msgid "Tags"
 msgstr "Тэгі"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr ""
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr ""
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1454,21 +1458,37 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Дэкодар FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Плагін GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
@@ -1476,387 +1496,424 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Цэтлікі Гнома"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Нумар запіса"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Загаловак"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Выканаўца"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Год"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Альбом"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Трэк"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Пазіцыя ў чарзе"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Даўжыня"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Шлях да файла"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Імя файла"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Адмысловы загаловак"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Бітрэйт"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Выберыце слупок"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Даступныя:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Выбраныя:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr ""
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Выключыць"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "Адк_рыць файлы ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Адкрыць _URL ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "Дадаць _файлы ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Дадаць U_RL ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "Шукаць у бібліятэц_ы"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "П_ра ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "Наста_ўленні ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "Вы_йсці"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Прайграць"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Па_уза"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "Сп_ыніць"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "Пап_ярэдні"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "Нас_тупны"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "Па_ўтор"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "У_разнабой"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "_Не пераходзіць да наступнай"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Спыніць пасля бягучай песні"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "_Звесткі пра песню ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Перайсці да _часу ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "_Перайсці да песні ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Па _нумары трэка"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
 
-#: src/gtkui/menus.c:188
-msgid "By _Title"
-msgstr "Па _назве"
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
+msgid "By _Title"
+msgstr "Па _назве"
+
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Па _нумары трэка"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Па вык_анаўцу"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Па ал_ьбому"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Па даце _выдання"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Па шляху да файла"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Па адмы_словым загалоўку"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "Ад_варотны парадак"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "Выпад_ковы парадак"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "Прайграць плэйліст"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "А_бнавіць"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Сцерці _недаступныя файлы"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Парадкаваць"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Сартаваць вылучаныя"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Сцерці _недаступныя файлы"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Дадаць"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Перайменаваць ..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "Закры_ць"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Імпарт ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "Э_кспарт ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Кіра_ўнік плэйлістоў ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Кіраўнік _чаргі ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "_Гучней"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "_Цішэй"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "Э_квалайзер"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "_Эфекты"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Інтэрфейс"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "Ві_зуалізацыя"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Паказваць стужку _меню"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Паказваць стужку звес_так"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Паказваць ві_зуалізацыю стужкі звестак"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Паказваць стужку _статусу"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Паказваць _кнопку закрыцця"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Паказваць назвы слупкоў"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Выбраць _слупкі ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Пракручваць _назву песні"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "Ф_айл"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Прайграванне"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "П_лэйліст"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "Сервіс_ы"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "Выва_д"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "Вы_гляд"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "У чаргу / З чаргі"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "_Выразаць"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Капіраваць"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Уставіць"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Вылучыць усе"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "П_ерайменаваць ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Інтэрфейс GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Назапашванне ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Памылка"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1865,113 +1922,119 @@
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d кб/с"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Папярэдні трэк"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Праграць"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr ""
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Спыніць"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Наступны трэк"
+msgid "Rewind 5 seconds"
+msgstr ""
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Наперад 5 секунд"
+msgid "Mute"
+msgstr "Выкл"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Назад 5 секунд"
+msgid "Volume up"
+msgstr ""
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Выкл"
+msgid "Volume down"
+msgstr ""
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Гучней"
+msgid "Jump to file"
+msgstr ""
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Цішэй"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Перайсці да файла"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr ""
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+msgid "Toggle repeat"
 msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
+msgid "Toggle shuffle"
 msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Пераключыць паўтор"
+msgid "Toggle stop after current"
+msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Пераключыць разнабой"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(няма)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr ""
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr ""
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr ""
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Дзеянне:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr ""
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1986,11 +2049,11 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
@@ -1998,62 +2061,64 @@
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "Вывад JACK"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s Настаўленні"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Настаўленні хоста LADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Шлях да модуля:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
 msgstr ""
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Даступныя плагіны:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Уключыць"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Уключаныя плагіны:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Настаўленні"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr ""
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr ""
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2061,27 +2126,27 @@
 "%s: how to create a proper config file\n"
 msgstr ""
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: спроба паўторнага злучэння...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: невядомы загад \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: злучэнне з LIRC страчана\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr ""
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2097,67 +2162,67 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Злучэнне"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Перазлучэнне з серверам LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "Плагін LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Словы недаступныя"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Немагчыма атрымаць %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Немагчыма разабраць %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Шукаюцца словы ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Адсутнічаюць метазвесткі ў песні"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Злучэнне з lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "Плагін LyricWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "Плэйлісты M3U"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Тактавы генератар: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Тактавы генератар: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2166,84 +2231,218 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Тактавы генератар"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Мікшар каналаў"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Каналаў вываду:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Мікшар каналаў"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Плагін MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr ""
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "Плагін MPG123"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr ""
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Плагін Neon HTTP/HTTPS"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Спынена"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious не іграе."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr ""
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Пауза"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Наступны"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Тыповая прылада"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Аўдыё-прылада:"
 
@@ -2268,22 +2467,23 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "Вывад OSS4"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "Плэйлісты PLS"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Дэкодар OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2303,153 +2503,193 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "Вывад PulseAudio"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr ""
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Лінейная інтэрпаляцыя"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Канверсія"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Метад:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr ""
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr ""
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr ""
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 кГц:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 кГц:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22,05 кГц:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44,1 кГц:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 кГц:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 кГц:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 кГц:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr ""
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Змяніць пароль"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Сервісы"
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Карыстальнік:"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Пароль:"
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
 msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:233
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr ""
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Бібліятэка"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Невядомы выканаўца"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Невядомы альбом"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
 msgstr ""
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
@@ -2458,7 +2698,7 @@
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2471,7 +2711,7 @@
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2484,73 +2724,73 @@
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Стварыць плэйліст"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Дадаць у плэйліст"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Шукаць у бібліятэцы"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Пачакайце, калі ласка ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Выберыце каталог"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Пошукавая прылада"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Інтэрфейс Winamp-класік"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "Плэер:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Вылучыце шрыфт для галоўнага вакна плэера:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "Пл_эйліст:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Выберыце шрыфт для плэйліста:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "Шрыфты"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Пракручваць назву песні ў абодвух кірунках"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "Вокладка"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Пераважанні інтэрфейса"
 
@@ -2606,7 +2846,7 @@
 msgid "Presets"
 msgstr "Прэсеты"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Чытаць прэсет"
 
@@ -2619,7 +2859,7 @@
 msgid "Load equalizer preset"
 msgstr "Чытаць прэсет эквалайзера"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Запісаць прэсет"
 
@@ -2631,7 +2871,7 @@
 msgid "Save equalizer preset"
 msgstr "Запісаць прэсет эквалайзера"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Сцерці прэсет"
 
@@ -2639,739 +2879,748 @@
 msgid "Delete auto-preset"
 msgstr "Сцерці аўта-прэсет"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "кб/с"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "кГц"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Гучнасць: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Баланс: %d%% ўлева"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Баланс: цэнтр"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Баланс: %d%% ўправа"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Меню опцый"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Адключыць 'Заўсёды зверху'"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Уключыць 'Заўсёды зверху'"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Меню візуалізацыі"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Рэжым плэйліста."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Спыненне пасля песні."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Не спыняецца пасля песні."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Пракручваць назву песні"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Спыніць пасля бягучай песні"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Пікі"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Паўтор"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Уразнабой"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Не пераходзіць да наступнай"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Паказваць плэер"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Паказваць рэдактар спісаў"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Паказваць эквалайзер"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Заўсёды зверху"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "На ўсе працоўныя прасторы"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Скруціць плэер"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Скруціць рэдактар спісаў"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Скруціць эквалайзер"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Аналізатар"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Асцылограф"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Адбітак голасу"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Выкл"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Норма"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Полымя"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Вертыкальныя лініі"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Лініі"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Слупкі"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Кропкавы асцылограф"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Лінейны асцылограф"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Запоўнены асцылограф"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Лёд"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Гладка"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Наймарудней"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Марудна"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Сярэдне"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Хутка"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Найхутчэй"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Часу прайшло"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Часу засталося"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Пауза"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Папярэдні"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Наступны"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Візуалізацыя"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Рэжым візуалізацыі"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Рэжым аналізатара"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Рэжым асцылографа"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Рэжым адбітку"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Рэжым WindowShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Падзенне аналізатара"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Падзенне пікаў"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Плэйліст"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Прайграць плэйліст"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Новы плэйліст"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Выбраць наступны плэйліст"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Выбраць папярэдні плэйліст"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Сцерці плэйліст"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Імпартаваць плэйліст"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Загружае файл плэйліста ў выбраны плэйліст."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Экспартаваць плэйліст"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Захоўвае выбраны плэйліст."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Абнавіць спіс"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Перачытаць метазвесткі, звязаныя з запісам у плэйлісце."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Кіраўнік плэйлістоў"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Кіраўнік чаргі"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Выгляд"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Інтэрфейс"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Настаўленні інтэрфейсу ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Дадаць адрас Інтэрнет..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Дадае аддалены трэк у плэйліст."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Дадаць файлы..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Дадае файлы ў плэйліст."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Пошук і вылучэнне"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Інвертаваць вылучэнне"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Інвертаванне вылучэных і невылучаных запісаў."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Вылучыць усе"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Вылучае ўсе запісы ў плэйлісце."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Зняць вылучэнне"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Здымае вылучэнне з усіх запісаў у плэйлісце."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Сцерці усе"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Прыбірае ўсе запісы з плэйліста."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Ачысціць чаргу"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Ачышчае чаргу, асацыяваную з бягучым плэйлістом."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Сцерці недаступныя файлы"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Выдаляе недаступныя файлы з плэйліста."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Сцерці дублікаты"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Па загалоўку"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Выдаляе падвоеныя запісы з плэйліста па загалоўку."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Па назве файла"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Выдаляе падвоеныя запісы з плэйліста па назве файла."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Па шляху + назве файла"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Выдаляе падвоеныя запісы з плэйліста па іх поўным шляху."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Сцерці невылучаныя"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Сцерці невылучаныя запісы з плэйліста."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Сцерці вылучаныя"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Выдаліць вылучаныя запісы з плэйліста."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Раскідаць спіс"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Выпадкова перамешвае плэйліст."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Спіс наадварот"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Перапісвае плэйліст у адваротным парадку."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Сартаваць спіс"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Упарадкоўвае спіс па загалоўку."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Па альбому"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Упарадкоўвае спіс па альбому."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Па выканаўцу"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Упарадкоўвае спіс па выканаўцу."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Упарадкоўвае спіс па назве файла."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Упарадкоўвае спіс па поўным шляху."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Па даце"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Упарадкоўвае спіс па часу мадыфікацыі."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Па нумары трэка"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Упарадкоўвае спіс па нумары трэка."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Сартаваць вылучаныя"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Файл"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Сервісы плагінаў"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Глядзець дэталі трэка"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Глядзець дэталі трэка"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Пра Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Іграць файл"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Загрузіць і прайграць файл"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Іграць месца"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Прайграць файлы з вылучанага месца"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Паслугі плагінаў"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Настаўленні"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Адкрыць акно настаўленняў"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Выйсці з Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Устанавіць А-В"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Ачысціць А-В"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Перайсці да файла"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Перайсці да часу"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "У чаргу/з чаргі"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Уключае/выключае запіс у чарзе плэйліста."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Капіраваць"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Выразаць"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Уставіць"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Загрузіць"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Імпарт"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Запісаць"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Сцерці"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Прэсет"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Аўта-чытаны прэсет"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Чытаць аўта-чытаны прэсет"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Загрузіць тыповы прэсет у эквалайзер"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Нуль"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "З файла"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Чытаць прэсет з файла"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "З файла WinAMP EQF"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Чытаць прэсет з файла WinAMP EQF"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Прэсеты WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Імпартаваць прэсеты WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Запісаць аўта-чытаны прэсет"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Запісаць базавы прэсет"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "У файл"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Запісаць прэсет у файл"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "У файл WinAMP EQF"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Запісаць прэсет у файл WinAMP EQF"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Сцерці аўта-чытаны прэсет"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Шукаць запісы ў бягучым плэйлісце"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Загаловак: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Альбом: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Выканаўца: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Назва файла: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Ачысціць папярэдняе вылучэнне перад пошукам"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Аўтаматычна пераключыць чаргу для адпаведных запісаў"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Стварыць новы плэйліст з адпаведнымі запісамі"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Рэдактар плэйлістоў Audacious"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d з %d)"
@@ -3389,81 +3638,97 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Немагчыма стварыць каталог (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Плагін Sndfile"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Пра плагін вываду Sndfile"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 msgstr ""
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Фармат не падтрымліваецца"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
 msgstr ""
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "прылада sndio"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr ""
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Так"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Скасаваць"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Пераключэнне песні"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr ""
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Загад:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Загад, які выканаць па заканчэнні песні."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Выконваць загад, калі Audacious дасягае канца плэйліста."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3482,33 +3747,66 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Загады"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Хуткасць"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3519,63 +3817,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Дзеянні колца мышы"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Змяняць гук"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Змяняць песню"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Іншыя настаўленні"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Адключыць усплыўное акно"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Значок статусу"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Дадатковае стэрэа"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Дадатковае стэрэа"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr ""
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3584,11 +3882,11 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr ""
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -3596,15 +3894,15 @@
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr ""
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Выдаленне голасу"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3625,44 +3923,44 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Дэкодар Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Дэкодар VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Дэкодар WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Дэкодар 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""

audacious-plugins-3.4.2.tar.bz2/po/bg.po Added

@@ -0,0 +1,4349 @@
+# Bulgarian translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Pandi3a <pandi3a@gmail.com>, 2012
+# Pandi3a <pandi3a@gmail.com>, 2012
+# Радослав <reckku@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-10-16 22:07+0000\n"
+"Last-Translator: Радослав <reckku@gmail.com>\n"
+"Language-Team: Bulgarian (http://www.transifex.com/projects/p/audacious/"
+"language/bg/)\n"
+"Language: bg\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
+msgid "mono"
+msgstr "еднозвучие"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
+msgid "stereo"
+msgstr "многозвучие"
+
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
+msgid "surround"
+msgstr "обграждащ звук"
+
+#: src/aac/libmp4.c:930
+msgid "AAC Decoder"
+msgstr "AAC Разкодиране"
+
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
+msgid "sequenced"
+msgstr "подредени"
+
+#: src/adplug/plugin.c:14
+msgid "AdPlug (AdLib Player)"
+msgstr "AdPlug (AdLib Плеър)"
+
+#: src/alarm/alarm.c:809
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr ""
+"Приставка, която може да бъде използвана за\n"
+"започване на изпълнение по конкретно време.\n"
+"\n"
+"Оригинално написана от Adam Feakin и Daniel Stodden."
+
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
+msgid "Alarm"
+msgstr "Аларма"
+
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Час\n"
+"Начало на аларма:\n"
+"Време, по което да се активира алармата.\n"
+"\n"
+"Затихване след:\n"
+"Спиране на алармата след зададено време.\n"
+"(Ако прозореца за събуждане не е затворен.)\n"
+"\n"
+"\n"
+"Дни\n"
+"Ден:\n"
+"Избор на дни, в които да се активира алармата.\n"
+"\n"
+"Час:\n"
+"Избиране на час за алармата за всеки ден\n"
+"или избиране на превключващ бутон, за да се\n"
+"зададе по подразбиране.\n"
+"\n"
+"\n"
+
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Сила на звука\n"
+"Усилване:\n"
+"Усилване на звука до избраната\n"
+"стойност за избрано време.\n"
+"\n"
+"Начало:\n"
+"Започване на усилване от стойност...\n"
+"\n"
+"Край:\n"
+"Стойността, до която да се усилва. Ако времето \n"
+"за усилване е 0, тогава да се зададе тази при\n"
+"започване на възпроизвеждане.\n"
+"\n"
+"Опции:\n"
+"Допълнителна команда:\n"
+"Стартиране на тази команда по време на алармата.\n"
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+"Списък:\n"
+"Зареждане на този списък. Ако няма\n"
+"зададен друг, ще бъде използван настоящият.\n"
+"Може да бъде използван и Интернет адрес\n"
+"за mp3/ogg поток.\n"
+"\n"
+"Известие:\n"
+"Извеждане на известие, когато алармата се изключи.\n"
+"Въведете известието в кутията и включете клавиша за\n"
+"превключване, ако искате да бъде извеждано."
+
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Това е Вашият сигнал за събуждане."
+
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Вашето напомняне за днес е..."
+
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Напомняне"
+
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Понеделник"
+
+#: src/alarm/interface.c:140
+msgid "Tuesday"
+msgstr "Вторник"
+
+#: src/alarm/interface.c:140
+msgid "Wednesday"
+msgstr "Сряда"
+
+#: src/alarm/interface.c:141
+msgid "Thursday"
+msgstr "Четвъртък"
+
+#: src/alarm/interface.c:141
+msgid "Friday"
+msgstr "Петък"
+
+#: src/alarm/interface.c:141
+msgid "Saturday"
+msgstr "Събота"
+
+#: src/alarm/interface.c:141
+msgid "Sunday"
+msgstr "Неделя"
+
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Настройки на аларма"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Час"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Алармиране в (по подразбиране):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "ч"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Затишие след:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "часове"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "минути"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Избор на дни, в които да се активира алармата"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Ден"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "По подразбиране"
+
+#: src/alarm/interface.c:310
+msgid "Days"
+msgstr "Дни"
+
+#: src/alarm/interface.c:319
+msgid "Fading"
+msgstr "Затихване"
+
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
+msgid "seconds"
+msgstr "секунди"
+
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
+msgid "Volume"
+msgstr "Сила на звука"
+
+#: src/alarm/interface.c:339
+msgid "Start at"
+msgstr "Начало"
+
+#: src/alarm/interface.c:357
+msgid "Final"
+msgstr "Край"
+
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Текущо"
+
+#: src/alarm/interface.c:387
+msgid "Additional Command"
+msgstr "Допълнителна команда"
+
+#: src/alarm/interface.c:393
+msgid "enable"
+msgstr "активиране"
+
+#: src/alarm/interface.c:400
+msgid "Playlist (optional)"
+msgstr "Списък за изпълнение (по избор)"
+
+#: src/alarm/interface.c:407
+msgid "Select a playlist"
+msgstr "Избор на списък"
+
+#: src/alarm/interface.c:419
+msgid "Use reminder"
+msgstr "Използвай напомняне"
+
+#: src/alarm/interface.c:428
+msgid "Options"
+msgstr "Опции"
+
+#: src/alarm/interface.c:433
+msgid "What do these options mean?"
+msgstr "Какво означават тези опции?"
+
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
+msgid "Help"
+msgstr "Помощ"
+
+#: src/albumart/albumart.c:143
+msgid "Album Art"
+msgstr "Обложка на албум"
+
+#: src/alsa/config.c:212
+msgid "Default PCM device"
+msgstr "PCM устройство по подразбиране"
+
+#: src/alsa/config.c:241
+msgid "Default mixer device"
+msgstr "Миксер устройство по подразбиране"
+
+#: src/alsa/config.c:428
+msgid "ALSA Output Plugin Preferences"
+msgstr "Настройки на ALSA"
+
+#: src/alsa/config.c:434
+msgid "PCM device:"
+msgstr "PCM устройство:"
+
+#: src/alsa/config.c:436
+msgid "Mixer device:"
+msgstr "Миксер:"
+
+#: src/alsa/config.c:438
+msgid "Mixer element:"
+msgstr "Елемент на миксера:"
+
+#: src/alsa/config.c:441
+msgid "Work around drain hangup"
+msgstr "Избягване на повторение"
+
+#: src/alsa/plugin.c:25
+msgid ""
+"ALSA Output Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"Изходна приставка на ALSA за Audacious\n"
+"Всички права запазени 2009-2012 John Lindgren\n"
+"\n"
+"Искрени благодарности на William Pitcock, автор на изходната приставка ALSA "
+"NG, чийто код служеше за справка, когато ръководството към ALSA не беше "
+"достатъчно."
+
+#: src/alsa/plugin.c:32
+msgid "ALSA Output"
+msgstr "ALSA Изход"
+
+#: src/amidi-plug/amidi-plug.c:248
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr ""
+"Не сте избрали никакъв порт за изпълнението на MIDI поток. Можете да го "
+"направите и в настройките на приставката MIDI."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI Плеър)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
+msgid "ALSA Backend "
+msgstr "ALSA предизход"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"Този предизход изпраща MIDI събитията до група ALSA портове избрани от "
+"потребителя. Интерфейса на ALSA повторителя е много гъвкав. Предоставя "
+"портове за звукови хардуерни синтезатори (напр. emu10k1), но също така и за "
+"софтуерни синтезатори, външни устройства и т.н.\n"
+"Този предизход не възпроизвежда звук, MIDI събитията се улавят директно от "
+"устройства/програми, намиращи се зад ALSA портовете. Например, MIDI събития "
+"изпратени директно до хардуерен синтезатор ще бъдат директно изпълнени.\n"
+"Предизхода е написан от Giacomo Lozito."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
+msgid "FluidSynth Backend "
+msgstr "FluidSynth предизход"
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"Това оформление възпроизвежда звук, изпращайки MIDI събития до FluidSynth, "
+"софтуер синтезатор в реално време, основан на стандарта SoundFont2 (www."
+"fluidsynth.org).\n"
+"Възпроизведеният звук може да бъде променян чрез приставките за ефекти в "
+"плеъра и се пренася към изходната приставка.\n"
+"Оформление създадено от Giacomo Lizoto."
+
+#: src/amidi-plug/i_configure-alsa.c:353
+msgid "Port"
+msgstr "Порт"
+
+#: src/amidi-plug/i_configure-alsa.c:355
+msgid "Client name"
+msgstr "Име на клиента"
+
+#: src/amidi-plug/i_configure-alsa.c:357
+msgid "Port name"
+msgstr "Име на порта"
+
+#: src/amidi-plug/i_configure-alsa.c:371
+msgid "ALSA output ports"
+msgstr "Изходни портове за ALSA"
+
+#: src/amidi-plug/i_configure-alsa.c:432
+msgid "Soundcard: "
+msgstr "Звукова карта:"
+
+#: src/amidi-plug/i_configure-alsa.c:434
+msgid "Mixer control: "
+msgstr "Миксер контрол:"
+
+#: src/amidi-plug/i_configure-alsa.c:444
+msgid "Mixer settings"
+msgstr "Настройки на миксера"
+
+#: src/amidi-plug/i_configure-alsa.c:472
+msgid ""
+"ALSA\n"
+"backend"
+msgstr ""
+"ALSA\n"
+"предизход"
+
+#: src/amidi-plug/i_configure-ap.c:63
+msgid "AMIDI-Plug - backend information"
+msgstr "AMIDI-Контакт - предизходна информация"
+
+#: src/amidi-plug/i_configure-ap.c:221
+msgid "Backend selection"
+msgstr "Избор на предизход"
+
+#: src/amidi-plug/i_configure-ap.c:261
+msgid "Playback settings"
+msgstr "Настройки на възпроизвеждането"
+
+#: src/amidi-plug/i_configure-ap.c:266
+msgid "Transpose: "
+msgstr "Транспониране:"
+
+#: src/amidi-plug/i_configure-ap.c:275
+msgid "Drum shift: "
+msgstr "Обръщане на мембраната:"
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "Advanced settings"
+msgstr "Допълнителни настройки"
+
+#: src/amidi-plug/i_configure-ap.c:297
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "преизчисляване на времетраенето на MIDI файловете в списъка"
+
+#: src/amidi-plug/i_configure-ap.c:304
+msgid "extract comments from MIDI file (if available)"
+msgstr "изкарване на коментарите (ако има налични) от MIDI файл"
+
+#: src/amidi-plug/i_configure-ap.c:311
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "изкарване на текста (ако е наличен) от MIDI файл"
+
+#: src/amidi-plug/i_configure-ap.c:344
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr ""
+"AMIDI\n"
+"Контакт"
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug Settings"
+msgstr "Настройки на AMIDI-Plug"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:63
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Контакт - избор на файл за звуково изравняване"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:321
+msgid "SoundFont settings"
+msgstr "Настройки на звуковото изравняване"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:359
+msgid "Filename"
+msgstr "Име на файл"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:363
+msgid "Size (bytes)"
+msgstr "Размер (байтове)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:412
+msgid "Load SF on player start"
+msgstr "Зареждане на SF при стартиране на програмата"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:416
+msgid "Load SF on first MIDI file play"
+msgstr "Зареждане на SF при първият изпълнен MIDI файл"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:431
+msgid "Synthesizer settings"
+msgstr "Настройки на синтезатора"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:440
+msgid "gain"
+msgstr "усилване"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
+msgid "use default"
+msgstr "използвай по подразбиране"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
+msgid "value:"
+msgstr "стойност:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:470
+msgid "polyphony"
+msgstr "многозвучие"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:500
+msgid "reverb"
+msgstr "ехо"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
+msgid "yes"
+msgstr "да"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
+msgid "no"
+msgstr "не"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:534
+msgid "chorus"
+msgstr "припев"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "sample rate"
+msgstr "честота"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:574
+msgid "22050 Hz "
+msgstr "22050 Хц"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:577
+msgid "44100 Hz "
+msgstr "44100 Хц"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:580
+msgid "96000 Hz "
+msgstr "96000 Хц"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:583
+msgid "custom "
+msgstr "потребителски"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:592
+msgid "Hz "
+msgstr "Хц"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:662
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr ""
+"FluidSynth\n"
+"предизход"
+
+#: src/amidi-plug/i_fileinfo.c:175
+msgid "Name:"
+msgstr "Име:"
+
+#: src/amidi-plug/i_fileinfo.c:200
+msgid " MIDI Info "
+msgstr " MIDI информация "
+
+#: src/amidi-plug/i_fileinfo.c:214
+msgid "Format:"
+msgstr "Формат:"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "Length (msec):"
+msgstr "Продължителност (милисекунди):"
+
+#: src/amidi-plug/i_fileinfo.c:220
+msgid "No. of Tracks:"
+msgstr "№ на Записи:"
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "variable"
+msgstr "променливост"
+
+#: src/amidi-plug/i_fileinfo.c:228
+msgid "BPM:"
+msgstr "УВМ:"
+
+#: src/amidi-plug/i_fileinfo.c:236
+msgid "BPM (wavg):"
+msgstr "УВМ (вълни):"
+
+#: src/amidi-plug/i_fileinfo.c:239
+msgid "Time Div:"
+msgstr "Време Разд.:"
+
+#: src/amidi-plug/i_fileinfo.c:250
+msgid " MIDI Comments and Lyrics "
+msgstr " MIDI Коментари и лирика "
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no comments available in this MIDI file *"
+msgstr "* няма достъпни коментари за този MIDI файл *"
+
+#: src/amidi-plug/i_fileinfo.c:314
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* няма достъпна лирика за този MIDI файл *"
+
+#: src/amidi-plug/i_fileinfo.c:367
+msgid " (invalid UTF-8)"
+msgstr " (невалиден UTF-8)"
+
+#: src/amidi-plug/i_utils.c:39
+msgid "About AMIDI-Plug"
+msgstr "Относно AMIDI-Plug"
+
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI-Вход"
+
+#: src/amidi-plug/i_utils.c:54
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing"
+msgstr ""
+"\n"
+"модулен MIDI плеър\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"Написан от Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"искрени благодарности на...\n"
+"\n"
+"Clemens Ladisch и Jaroslav Kysela\n"
+"за страхотните им програми aplaymidi и amixer;\n"
+"те бяха наистина полезни, заедно с документацията за\n"
+"alsa-lib, във връзка със запознаването с ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"за хубавото клавиатурно midi лого\n"
+"\n"
+"Tony Vroon\n"
+"за помощта при алфа тестовете"
+
+#: src/aosd/aosd.c:29
+msgid "Audacious OSD "
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd.c:37
+msgid "AOSD (On-Screen Display)"
+msgstr "AOSD (прозорец в екрана)"
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "Правоъгълник"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "Правоъгълник със заоблени краища"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "Вдлъбнат правоъгълник"
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "Без"
+
+#: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "Начало на възпроизвеждането"
+
+#: src/aosd/aosd_trigger.c:75
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Задействане на OSD, когато започне възпроизвеждането"
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Title Change"
+msgstr "Промяна на заглавие"
+
+#: src/aosd/aosd_trigger.c:80
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr ""
+"Задействане на OSD, когато, по време на възпроизвеждането, се промени името "
+"на заглавието, но името на файла остане непроменено. Това е най-полезно при "
+"извеждане на промените в заглавието за интернет потоците."
+
+#: src/aosd/aosd_trigger.c:86
+msgid "Pause On"
+msgstr "Временното спиране е активирано"
+
+#: src/aosd/aosd_trigger.c:87
+msgid "Triggers OSD when playback is paused."
+msgstr ""
+"Задействане на OSD, когато\n"
+"възпроижзвеждането е в режим на временна пауза."
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Pause Off"
+msgstr "Временното спиране е деактивирано"
+
+#: src/aosd/aosd_trigger.c:92
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Задействане на OSD, когато възпроизвеждането продължи."
+
+#: src/aosd/aosd_ui.c:168
+msgid "Placement"
+msgstr "Местоположение"
+
+#: src/aosd/aosd_ui.c:200
+msgid "Relative X offset:"
+msgstr "Относителен отстъп за X:"
+
+#: src/aosd/aosd_ui.c:207
+msgid "Relative Y offset:"
+msgstr "Относителен отстъп за Y:"
+
+#: src/aosd/aosd_ui.c:214
+msgid "Max OSD width:"
+msgstr "Максимална ширина на OSD:"
+
+#: src/aosd/aosd_ui.c:225
+msgid "Multi-Monitor options"
+msgstr "Опции за много монитори"
+
+#: src/aosd/aosd_ui.c:229
+msgid "Display OSD using:"
+msgstr "Извеждай OSD, използвайки:"
+
+#: src/aosd/aosd_ui.c:231
+msgid "all monitors"
+msgstr "всички монитори"
+
+#: src/aosd/aosd_ui.c:234
+#, c-format
+msgid "monitor %i"
+msgstr "монитор %i"
+
+#: src/aosd/aosd_ui.c:287
+msgid "Timing (ms)"
+msgstr "Времетраене (мс)"
+
+#: src/aosd/aosd_ui.c:292
+msgid "Display:"
+msgstr "Екран:"
+
+#: src/aosd/aosd_ui.c:297
+msgid "Fade in:"
+msgstr "Проясняване:"
+
+#: src/aosd/aosd_ui.c:302
+msgid "Fade out:"
+msgstr "Избледняване:"
+
+#: src/aosd/aosd_ui.c:383
+msgid "Fonts"
+msgstr "Шрифтове"
+
+#: src/aosd/aosd_ui.c:391
+#, c-format
+msgid "Font %i:"
+msgstr "Шрифт %i:"
+
+#: src/aosd/aosd_ui.c:409
+msgid "Shadow"
+msgstr "Сянка"
+
+#: src/aosd/aosd_ui.c:439
+msgid "Internationalization"
+msgstr "Многоезичност"
+
+#: src/aosd/aosd_ui.c:445
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "Деактивиране на UTF-8 конвертиране на текст (за всички OSD)"
+
+#: src/aosd/aosd_ui.c:462
+msgid "Select Skin File"
+msgstr "Избор на файл с кожа"
+
+#: src/aosd/aosd_ui.c:573
+msgid "Render Style"
+msgstr "Създай свой стил"
+
+#: src/aosd/aosd_ui.c:589
+msgid "Colors"
+msgstr "Цветове"
+
+#: src/aosd/aosd_ui.c:602
+#, c-format
+msgid "Color %i:"
+msgstr "Цвят %i:"
+
+#: src/aosd/aosd_ui.c:620
+msgid "Custom Skin"
+msgstr "Потребителска кожа"
+
+#: src/aosd/aosd_ui.c:626
+msgid "Skin file:"
+msgstr "Файл с кожа:"
+
+#: src/aosd/aosd_ui.c:630
+msgid "Browse"
+msgstr "Намиране"
+
+#: src/aosd/aosd_ui.c:729
+msgid "Enable trigger"
+msgstr "Активиране на активатора"
+
+#: src/aosd/aosd_ui.c:756
+msgid "Event"
+msgstr "Събитие"
+
+#: src/aosd/aosd_ui.c:784
+msgid "Composite manager detected"
+msgstr "Засечен е Композитен мениджър"
+
+#: src/aosd/aosd_ui.c:791
+msgid ""
+"Composite manager not detected;\n"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Композитният мениджър не е засечен,\n"
+"моля активирайте мениджъра, освен ако вече нямате стартиран, в противен "
+"случай OSD няма да работи правилно"
+
+#: src/aosd/aosd_ui.c:799
+msgid "Composite manager not required for fake transparency"
+msgstr "Не се изисква композитен мениджър за илюзийна прозрачност"
+
+#: src/aosd/aosd_ui.c:837
+msgid "Transparency"
+msgstr "Прозрачност"
+
+#: src/aosd/aosd_ui.c:843
+msgid "Fake transparency"
+msgstr "Илюзийна прозрачност"
+
+#: src/aosd/aosd_ui.c:845
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Истинска прозрачност (изисква разширение за X)"
+
+#: src/aosd/aosd_ui.c:887
+msgid "Composite extension not loaded"
+msgstr "Композитното разширение не е заредено"
+
+#: src/aosd/aosd_ui.c:895
+msgid "Composite extension not available"
+msgstr "Композитното разширение не е налично"
+
+#: src/aosd/aosd_ui.c:914
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd_ui.c:995
+msgid "Audacious OSD - configuration"
+msgstr "Audacious OSD - настройка"
+
+#: src/aosd/aosd_ui.c:1016
+msgid "Test"
+msgstr "Тест"
+
+#: src/aosd/aosd_ui.c:1031
+msgid "Position"
+msgstr "Позиция"
+
+#: src/aosd/aosd_ui.c:1036
+msgid "Animation"
+msgstr "Анимация"
+
+#: src/aosd/aosd_ui.c:1041
+msgid "Text"
+msgstr "Текст"
+
+#: src/aosd/aosd_ui.c:1046
+msgid "Decoration"
+msgstr "Декорация"
+
+#: src/aosd/aosd_ui.c:1051
+msgid "Trigger"
+msgstr "Активатор"
+
+#: src/aosd/aosd_ui.c:1056
+msgid "Misc"
+msgstr "Разни"
+
+#: src/asx/asx.c:96
+msgid "ASXv1/ASXv2 Playlists"
+msgstr "ASXv1/ASXv2 Списъци"
+
+#: src/audpl/audpl.c:222
+msgid "Audacious Playlists (audpl)"
+msgstr "Audacious Списъци (audpl)"
+
+#: src/blur_scope/blur_scope.c:47
+msgid "Color"
+msgstr "Цвят"
+
+#: src/blur_scope/blur_scope.c:56
+msgid "Blur Scope"
+msgstr "Размит осцилоскоп"
+
+#: src/bs2b/plugin.c:136
+msgid "Bauer Stereophonic-to-Binaural Preferences"
+msgstr "Настройки на Многозвучие-към-двузвучие Bauer"
+
+#: src/bs2b/plugin.c:147
+msgid "Feed level:"
+msgstr "Ниво на емисия:"
+
+#: src/bs2b/plugin.c:161
+msgid "Cut frequency:"
+msgstr "Честота на срез:"
+
+#: src/bs2b/plugin.c:175
+msgid "Presets:"
+msgstr "Предложения:"
+
+#: src/bs2b/plugin.c:197
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr "Bauer Многозвучие-към-двузвучие (BS2B)"
+
+#: src/cairo-spectrum/cairo-spectrum.c:297
+msgid "Spectrum Analyzer"
+msgstr "Анализ на спектъра"
+
+#: src/cdaudio-ng/cdaudio-ng.c:103
+msgid ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"and to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you to Tony Vroon for mentoring and guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project."
+msgstr ""
+"Всички права запазени (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and "
+"others.\n"
+"\n"
+"Искрени благодарности на разработчиците на libcdio <http://www.gnu.org/"
+"software/libcdio/>\n"
+"и на разработчиците на libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Също така благодаря и на Tony Vroon за това че бе мой ментор и ме "
+"напъдстваше.\n"
+"\n"
+"Това беше проект от Google Summer of Code 2007."
+
+#: src/cdaudio-ng/cdaudio-ng.c:121
+msgid "Device"
+msgstr "Устройство"
+
+#: src/cdaudio-ng/cdaudio-ng.c:122
+msgid "Read speed:"
+msgstr "Скорост на четене:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:125
+msgid "Override device:"
+msgstr "Презапис на устройството:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:127
+msgid "Metadata"
+msgstr "Метаданни"
+
+#: src/cdaudio-ng/cdaudio-ng.c:128
+msgid "Use CD-Text"
+msgstr "Използвай CD-Text"
+
+#: src/cdaudio-ng/cdaudio-ng.c:130
+msgid "Use CDDB"
+msgstr "Използвай CDDB"
+
+#: src/cdaudio-ng/cdaudio-ng.c:132
+msgid "Use HTTP instead of CDDBP"
+msgstr "Използване на HTTP вместо CDDBP"
+
+#: src/cdaudio-ng/cdaudio-ng.c:134
+msgid "Server:"
+msgstr "Сървър:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:136
+msgid "Path:"
+msgstr "Път:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:138
+msgid "Port:"
+msgstr "Порт:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:148
+msgid "Audio CD Plugin"
+msgstr "Аудио CD Приставка"
+
+#: src/cdaudio-ng/cdaudio-ng.c:249
+msgid "Failed to initialize cdio subsystem."
+msgstr "Нуспех при откриване на cdio подсистема."
+
+#: src/cdaudio-ng/cdaudio-ng.c:306
+#, c-format
+msgid "Invalid URI %s."
+msgstr "Невалиден Интернет адрес %s."
+
+#: src/cdaudio-ng/cdaudio-ng.c:308
+#, c-format
+msgid "Track %d not found."
+msgstr "Запис %d не е намерен."
+
+#: src/cdaudio-ng/cdaudio-ng.c:310
+#, c-format
+msgid "Track %d is a data track."
+msgstr "Записът %d е от данни."
+
+#: src/cdaudio-ng/cdaudio-ng.c:312
+msgid "Failed to open audio output."
+msgstr "Не може да бъде отворен аудио изхода."
+
+#: src/cdaudio-ng/cdaudio-ng.c:395
+msgid "Error reading audio CD."
+msgstr "Грешка при четене на audio CD."
+
+#: src/cdaudio-ng/cdaudio-ng.c:505
+msgid "Audio CD"
+msgstr "Аудио Диск"
+
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr "Не може да бъде отворено CD устройство %s."
+
+#: src/cdaudio-ng/cdaudio-ng.c:547
+msgid "No audio capable CD drive found."
+msgstr "Не е намерено Audio CD устройство."
+
+#: src/cdaudio-ng/cdaudio-ng.c:574
+msgid "Failed to finish initializing opened CD drive."
+msgstr "Неуспешно приключване на обозначаването на отвореното CD устройство."
+
+#: src/cdaudio-ng/cdaudio-ng.c:587
+msgid "Failed to retrieve first/last track number."
+msgstr "Неуспех при извличане на първият/последният номер на запис."
+
+#: src/cdaudio-ng/cdaudio-ng.c:612
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr "Не може да прочете началото/края на LSN за запис %d."
+
+#: src/cdaudio-ng/cdaudio-ng.c:702
+msgid "Failed to create the cddb connection."
+msgstr "Неуспех при създаване на cddb връзка."
+
+#: src/cdaudio-ng/cdaudio-ng.c:777
+msgid "Failed to query the CDDB server"
+msgstr "Неуспешна заявка към CDDB сървър"
+
+#: src/cdaudio-ng/cdaudio-ng.c:779
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr "Неуспешна заявка към CDDB сървър: %s"
+
+#: src/cdaudio-ng/cdaudio-ng.c:803
+#, c-format
+msgid "Failed to read the cddb info: %s"
+msgstr "Неуспешно прочитане на cddb информация: %s"
+
+#: src/cdaudio-ng/cdaudio-ng.c:876
+msgid "Drive is empty."
+msgstr "Устройството е празно."
+
+#: src/cdaudio-ng/cdaudio-ng.c:878
+msgid "Unsupported disk type."
+msgstr "Неподдържан диск."
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Play CD"
+msgstr "Възпроизвеждане на компакт диск"
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Add CD"
+msgstr "Добавяне на компакт диск"
+
+#: src/cd-menu-items/cd-menu-items.c:57
+msgid "Audio CD Menu Items"
+msgstr "Елементи на меню тип Audio CD"
+
+#: src/compressor/plugin.c:35
+msgid "Compression"
+msgstr "Свиване"
+
+#: src/compressor/plugin.c:36
+msgid "Center volume:"
+msgstr "Среда на звука:"
+
+#: src/compressor/plugin.c:39
+msgid "Dynamic range:"
+msgstr "Динамичен обхват:"
+
+#: src/compressor/plugin.c:53
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Приставка за Свиване на динамичните честоти за Audacious\n"
+"Авторски права 2010-2012 John Lindgren"
+
+#: src/compressor/plugin.c:58
+msgid "Dynamic Range Compressor"
+msgstr "Свиване на динамичния обхват"
+
+#: src/console/configure.c:134 src/console/plugin.c:42
+msgid "Game Console Music Decoder"
+msgstr "Звуков декодер за игрална конзола"
+
+#: src/console/configure.c:151
+msgid "General"
+msgstr "Общи"
+
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
+msgid "Playback"
+msgstr "Възпроизвеждане"
+
+#: src/console/configure.c:168
+msgid "Bass:"
+msgstr "Ниски:"
+
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
+msgid "secs"
+msgstr "секунди"
+
+#: src/console/configure.c:179
+msgid "Treble:"
+msgstr "Високи:"
+
+#: src/console/configure.c:200
+msgid "Default song length:"
+msgstr "Стандартно времетраене за песен:"
+
+#: src/console/configure.c:206
+msgid "Resampling"
+msgstr "Преизчисляване"
+
+#: src/console/configure.c:212
+msgid "Enable audio resampling"
+msgstr "Активиране на преизчисляване на звука"
+
+#: src/console/configure.c:227
+msgid "Resampling rate:"
+msgstr "Честота на преизчисляване:"
+
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
+msgid "Hz"
+msgstr "Хц"
+
+#: src/console/configure.c:242
+msgid "SPC"
+msgstr "Спектрометър"
+
+#: src/console/configure.c:243
+msgid "Ignore length from SPC tags"
+msgstr ""
+"Незачитане на продължителността\n"
+"от маркерите на спектрометъра"
+
+#: src/console/configure.c:244
+msgid "Increase reverb"
+msgstr "Увеличаване на ехото"
+
+#: src/console/configure.c:269
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Стандартното времетраене на песен, изразено в секунди, се използва за песни, "
+"които не придоставят информация за придължителността (напр. повтарящи се "
+"записи)."
+
+#: src/console/plugin.c:27
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+msgstr ""
+"Конзолно разкодиране на музика на основата на Game_Music_Emu 0.5.2\n"
+"Поддържани формати: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Приставка за Audacious от:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+
+#: src/crossfade/crossfade.c:81
+msgid ""
+"Crossfading failed because the songs had a different number of channels. "
+"You can use the Channel Mixer to convert the songs to the same number of "
+"channels."
+msgstr ""
+"Плавното преминаване несполучи, защото песните имат различен брой канали. "
+"Можете да използвате Смесителя на канали, за да превърнете броя им в общ за "
+"всички песни."
+
+#: src/crossfade/crossfade.c:88
+msgid ""
+"Crossfading failed because the songs had different sample rates. You can "
+"use the Sample Rate Converter to convert the songs to the same sample rate."
+msgstr ""
+"Плавното преминаване несполучи, защото песните имат различна честота. Можете "
+"да използвате Преобразувателя на честота, за да зададете обща честота за "
+"всички песни."
+
+#: src/crossfade/crossfade.c:254
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Приставка за плавно преминаване на Audacious\n"
+"Авторски права 2010-2012 John Lindgren"
+
+#: src/crossfade/crossfade.c:258
+msgid "Crossfade"
+msgstr "Плавно преминаване"
+
+#: src/crossfade/crossfade.c:259
+msgid "Overlap:"
+msgstr "Застъпване:"
+
+#: src/crossfade/crossfade.c:269
+msgid "Crossfade"
+msgstr "Плавно преминаване"
+
+#: src/crystalizer/crystalizer.c:40
+msgid "Crystalizer"
+msgstr "Кристализиране"
+
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
+msgid "Intensity:"
+msgstr "Наситеност:"
+
+#: src/crystalizer/crystalizer.c:51
+msgid "Crystalizer"
+msgstr "Кристализатор"
+
+#: src/cue/cue.c:158
+msgid "Cue Sheet Plugin"
+msgstr "Приставка за условности"
+
+#: src/echo_plugin/echo.c:24
+msgid "Echo"
+msgstr "Ехо"
+
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
+msgid "Delay:"
+msgstr "Забавяне:"
+
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
+msgid "ms"
+msgstr "мс"
+
+#: src/echo_plugin/echo.c:28
+msgid "Feedback:"
+msgstr "Отзиви:"
+
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
+msgid "Volume:"
+msgstr "Сила на звука:"
+
+#: src/echo_plugin/echo.c:114
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"\n"
+"Surround echo by Carl van Schaik, 1999"
+msgstr ""
+"Приставка за Ехо\n"
+"От Johan Levin, 1999\n"
+"\n"
+"Обграждащо ехо от Carl van Schaik, 1999"
+
+#: src/echo_plugin/echo.c:120
+msgid "Echo"
+msgstr "Ехо"
+
+#: src/ffaudio/ffaudio-core.c:648
+msgid ""
+"Multi-format audio decoding plugin for Audacious using\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Приставка за разкодиране на мултиформат аудио за Audacious,\n"
+"използвайки FFmpeg среда (http://www.ffmpeg.org/)\n"
+"\n"
+"Приставка за Audacious от:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+
+#: src/ffaudio/ffaudio-core.c:695
+msgid "FFmpeg Plugin"
+msgstr "Приставка за FFmpeg"
+
+#: src/filewriter/filewriter.c:409
+msgid "FileWriter Configuration"
+msgstr "Настройка на FileWriter"
+
+#: src/filewriter/filewriter.c:421
+msgid "Output file format:"
+msgstr "Формат на изходния файл:"
+
+#: src/filewriter/filewriter.c:439
+msgid "Configure"
+msgstr "Настройване"
+
+#: src/filewriter/filewriter.c:449
+msgid "Save into original directory"
+msgstr "Запамети в оригиналната директория"
+
+#: src/filewriter/filewriter.c:454
+msgid "Save into custom directory"
+msgstr "Запамети на избрано място"
+
+#: src/filewriter/filewriter.c:464
+msgid "Output file folder:"
+msgstr "Папка на изходния файл:"
+
+#: src/filewriter/filewriter.c:468
+msgid "Pick a folder"
+msgstr "Избор на папка"
+
+#: src/filewriter/filewriter.c:481
+msgid "Get filename from:"
+msgstr "Извличане на име от:"
+
+#: src/filewriter/filewriter.c:484
+msgid "original file tags"
+msgstr "маркери на оригиналния файл"
+
+#: src/filewriter/filewriter.c:490
+msgid "original filename"
+msgstr "оригинално име"
+
+#: src/filewriter/filewriter.c:497
+msgid "Don't strip file name extension"
+msgstr "Да не се изрязва разширението на файла"
+
+#: src/filewriter/filewriter.c:506
+msgid "Prepend track number to filename"
+msgstr "Номерът на записа да предшества името му"
+
+#: src/filewriter/filewriter.c:515
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+"Тази програма е свободен софтуер; можете да я разпространявате и/или "
+"променяте\n"
+"според правата на GNU GPL, както е публикувано от FSF; включително\n"
+"за версия 2 на лиценза или всяка по-късна (според ваша преценка).\n"
+"\n"
+"Тази програма се разпространява с вярата, че ще бъде полезна,\n"
+"но БЕЗ КАКВАТО И ДА БИЛО ГАРАНЦИЯ; дори без да се включва гаранция за\n"
+"ПРОДАВАЕМОСТ или ЗА ЛИЧНИ ЦЕЛИ. За повече детайли вижте GNU GPL.\n"
+"\n"
+"Трябва да сте получили копие от GNU GPL редом с тази програма;\n"
+"ако не сте, пишете до Free Software Foundation, Inc., 51 Franklin Street,\n"
+"Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/filewriter/filewriter.c:532
+msgid "FileWriter Plugin"
+msgstr "Приставка FileWriter"
+
+#: src/filewriter/mp3.c:37 src/filewriter/mp3.c:748
+msgid "Auto"
+msgstr "Автоматично"
+
+#: src/filewriter/mp3.c:37
+msgid "Joint Stereo"
+msgstr "Общо Стерео"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
+msgid "Stereo"
+msgstr "Стерео"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
+msgid "Mono"
+msgstr "Моно"
+
+#: src/filewriter/mp3.c:688
+msgid "MP3 Configuration"
+msgstr "MP3 настройки"
+
+#: src/filewriter/mp3.c:712
+msgid "Algorithm Quality:"
+msgstr "Алгоритъм за качество:"
+
+#: src/filewriter/mp3.c:737
+msgid "Output Samplerate:"
+msgstr "Изходна честота:"
+
+#: src/filewriter/mp3.c:765
+msgid "(Hz)"
+msgstr "(Хц)"
+
+#: src/filewriter/mp3.c:772
+msgid "Bitrate / Compression ratio:"
+msgstr "Честота на сгъстяване:"
+
+#: src/filewriter/mp3.c:796
+msgid "Bitrate (kbps):"
+msgstr "Честота за бит (кбвс):"
+
+#: src/filewriter/mp3.c:829
+msgid "Compression ratio:"
+msgstr "Честота на сгъстяване:"
+
+#: src/filewriter/mp3.c:853
+msgid "Audio Mode:"
+msgstr "Режим на звука:"
+
+#: src/filewriter/mp3.c:878
+msgid "Misc:"
+msgstr "Разни:"
+
+#: src/filewriter/mp3.c:889
+msgid "Enforce strict ISO complience"
+msgstr "Придържане към ISO съвместимост"
+
+#: src/filewriter/mp3.c:900
+msgid "Error protection"
+msgstr "Грешна защита"
+
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
+msgid "Quality"
+msgstr "Качество"
+
+#: src/filewriter/mp3.c:921
+msgid "Enable VBR/ABR"
+msgstr "Активиране VBR/ABR"
+
+#: src/filewriter/mp3.c:931
+msgid "Type:"
+msgstr "Вид:"
+
+#: src/filewriter/mp3.c:964
+msgid "VBR Options:"
+msgstr "VBR Опции:"
+
+#: src/filewriter/mp3.c:980
+msgid "Minimum bitrate (kbps):"
+msgstr "Минимална честота за бит (кбвс):"
+
+#: src/filewriter/mp3.c:1007
+msgid "Maximum bitrate (kbps):"
+msgstr "Максимална честота за бит (кбвс):"
+
+#: src/filewriter/mp3.c:1030
+msgid "Strictly enforce minimum bitrate"
+msgstr "Придържане към минимална честота за бит"
+
+#: src/filewriter/mp3.c:1042
+msgid "ABR Options:"
+msgstr "ABR Опции:"
+
+#: src/filewriter/mp3.c:1052
+msgid "Average bitrate (kbps):"
+msgstr "Средна честота за бит (кбвс):"
+
+#: src/filewriter/mp3.c:1080
+msgid "VBR quality level:"
+msgstr "Ниво на качеството на VBR:"
+
+#: src/filewriter/mp3.c:1099
+msgid "Don't write Xing VBR header"
+msgstr "Да не се записва титул за Xing VBR"
+
+#: src/filewriter/mp3.c:1112
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1121
+msgid "Frame parameters:"
+msgstr "Стойности на рамката:"
+
+#: src/filewriter/mp3.c:1133
+msgid "Mark as copyright"
+msgstr "Маркер „Защитено от копиране“"
+
+#: src/filewriter/mp3.c:1144
+msgid "Mark as original"
+msgstr "Маркер „Оригинал“"
+
+#: src/filewriter/mp3.c:1156
+msgid "ID3 params:"
+msgstr "Стойности на ID3:"
+
+#: src/filewriter/mp3.c:1167
+msgid "Force addition of version 2 tag"
+msgstr "Принудително добавяне на маркер от 2-ра версия"
+
+#: src/filewriter/mp3.c:1177
+msgid "Only add v1 tag"
+msgstr "Добави само маркер 1-ва версия"
+
+#: src/filewriter/mp3.c:1184
+msgid "Only add v2 tag"
+msgstr "Добави само маркер 2-ра версия"
+
+#: src/filewriter/mp3.c:1205
+msgid "Tags"
+msgstr "Маркери"
+
+#: src/filewriter/vorbis.c:209
+msgid "Vorbis Encoder Configuration"
+msgstr "Настройка на Vorbis кодиране"
+
+#: src/filewriter/vorbis.c:232
+msgid "Quality level (0 - 10):"
+msgstr "Ниво на качеството (0-10):"
+
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
+msgid "lossless"
+msgstr "по-малко загуби"
+
+#: src/flacng/plugin.c:269
+msgid ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Оригиналният код е от\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+
+#: src/flacng/plugin.c:277
+msgid "FLAC Decoder"
+msgstr "Разкодиране на FLAC"
+
+#: src/gio/gio.c:300
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+"Приставка GIO за Audacious\n"
+"Авторски права 2009-2012 John Lindgren"
+
+#: src/gio/gio.c:322
+msgid "GIO Plugin"
+msgstr "Приставка GIO"
+
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL осцилоскоп за Audacious\n"
+"Авторски права 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Базиран на приставката XMMS:\n"
+"Авторски права 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson, и 4Front Technologies\n"
+"\n"
+"Лиценз: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL осцилоскоп"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Lets you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"Приставка Бързи клавиши на Gnome\n"
+"Позволява Ви да контролирате плеъра с бързите клавиши на Gnome.\n"
+"\n"
+"Авторски права (C) 2007-2008 "
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
+msgid "Gnome Shortcuts"
+msgstr "Бързи клавиши за Gnome"
+
+#: src/gtkui/columns.c:32
+msgid "Entry number"
+msgstr "Номер на запис"
+
+#: src/gtkui/columns.c:32
+msgid "Title"
+msgstr "Заглавие"
+
+#: src/gtkui/columns.c:33
+msgid "Artist"
+msgstr "Изпълнител"
+
+#: src/gtkui/columns.c:33
+msgid "Year"
+msgstr "Година"
+
+#: src/gtkui/columns.c:33
+msgid "Album"
+msgstr "Албум"
+
+#: src/gtkui/columns.c:33
+msgid "Track"
+msgstr "Запис"
+
+#: src/gtkui/columns.c:33
+msgid "Genre"
+msgstr "Жанр"
+
+#: src/gtkui/columns.c:34
+msgid "Queue position"
+msgstr "Позиция на опашката"
+
+#: src/gtkui/columns.c:34
+msgid "Length"
+msgstr "Времетраене"
+
+#: src/gtkui/columns.c:34
+msgid "File path"
+msgstr "Път до файла"
+
+#: src/gtkui/columns.c:34
+msgid "File name"
+msgstr "Име на файла"
+
+#: src/gtkui/columns.c:35
+msgid "Custom title"
+msgstr "Избрано заглавие"
+
+#: src/gtkui/columns.c:35
+msgid "Bitrate"
+msgstr "Честота за бит"
+
+#: src/gtkui/columns.c:277
+msgid "Choose Columns"
+msgstr "Избор на колони"
+
+#: src/gtkui/columns.c:293
+msgid "Available:"
+msgstr "Налични:"
+
+#: src/gtkui/columns.c:327
+msgid "Chosen:"
+msgstr "Избран:"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Left"
+msgstr "Панел вляво"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Right"
+msgstr "Панел вдясно"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Top"
+msgstr "Панел отгоре"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Bottom"
+msgstr "Панел отдолу"
+
+#: src/gtkui/layout.c:120
+msgid "Undock"
+msgstr "Без панел"
+
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
+msgid "Disable"
+msgstr "Деактивиране"
+
+#: src/gtkui/menus.c:170
+msgid "_Open Files ..."
+msgstr "_Отворяне на файлове..."
+
+#: src/gtkui/menus.c:171
+msgid "Open _URL ..."
+msgstr "От_варяне на Интернет адрес..."
+
+#: src/gtkui/menus.c:172
+msgid "_Add Files ..."
+msgstr "_Добавяне на файлове..."
+
+#: src/gtkui/menus.c:173
+msgid "Add U_RL ..."
+msgstr "_Добавяне на Интернет адрес..."
+
+#: src/gtkui/menus.c:175
+msgid "_Search Library"
+msgstr "_Търсене в библиотеката"
+
+#: src/gtkui/menus.c:177
+msgid "A_bout ..."
+msgstr "О_тносно..."
+
+#: src/gtkui/menus.c:178
+msgid "_Preferences ..."
+msgstr "_Предпочитания..."
+
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
+msgid "_Quit"
+msgstr "_Изход"
+
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
+msgid "_Play"
+msgstr "И_зпълнение"
+
+#: src/gtkui/menus.c:183
+msgid "Paus_e"
+msgstr "В_ременно спиране"
+
+#: src/gtkui/menus.c:184
+msgid "_Stop"
+msgstr "_Спиране"
+
+#: src/gtkui/menus.c:185
+msgid "Pre_vious"
+msgstr "_Предишен"
+
+#: src/gtkui/menus.c:186
+msgid "_Next"
+msgstr "_Следващ"
+
+#: src/gtkui/menus.c:188
+msgid "_Repeat"
+msgstr "Повт_орение"
+
+#: src/gtkui/menus.c:189
+msgid "S_huffle"
+msgstr "Разбърка_но"
+
+#: src/gtkui/menus.c:190
+msgid "N_o Playlist Advance"
+msgstr "_Без прескачане към следващо изпълнение"
+
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Спри с_лед тази песен"
+
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
+msgid "Song _Info ..."
+msgstr "_Информация за песен..."
+
+#: src/gtkui/menus.c:194
+msgid "Jump to _Time ..."
+msgstr "Пре_скачане до време..."
+
+#: src/gtkui/menus.c:195
+msgid "_Jump to Song ..."
+msgstr "Прескачане до п_есен..."
+
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Начална точка н_а повторение"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Крайна точка на повторе_ниe"
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "Из_чистване на точките на повторение"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
+msgid "By _Title"
+msgstr "По _Заглавие"
+
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "По _име на файл"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "По _път до файл"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "По _номер на запис"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
+msgid "By _Artist"
+msgstr "По _Изпълнител"
+
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "По ал_бум"
+
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
+msgid "By Release _Date"
+msgstr "По _Дата на излизане"
+
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "По в_реметраене"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
+msgid "By _File Path"
+msgstr "По _Път до файл"
+
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
+msgid "By _Custom Title"
+msgstr "По Избрано _заглавие"
+
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
+msgid "R_everse Order"
+msgstr "О_бръщане на подредбата"
+
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
+msgid "_Random Order"
+msgstr "Сл_учаен ред"
+
+#: src/gtkui/menus.c:233
+msgid "_Play This Playlist"
+msgstr "_Изпълни този списък"
+
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
+msgid "_Refresh"
+msgstr "_Опресняване"
+
+#: src/gtkui/menus.c:236
+msgid "_Sort"
+msgstr "_Сортиране"
+
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Подреждане на избраните"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Премахване на по_втарящи се"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Премахване на _липсващите файлове"
+
+#: src/gtkui/menus.c:241
+msgid "_New"
+msgstr "_Нова"
+
+#: src/gtkui/menus.c:242
+msgid "Ren_ame ..."
+msgstr "_Преименуване..."
+
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
+msgid "_Close"
+msgstr "_Затваряне"
+
+#: src/gtkui/menus.c:245
+msgid "_Import ..."
+msgstr "_Внасяне..."
+
+#: src/gtkui/menus.c:246
+msgid "_Export ..."
+msgstr "_Изнасяне..."
+
+#: src/gtkui/menus.c:248
+msgid "Playlist _Manager ..."
+msgstr "_Управление на списъка..."
+
+#: src/gtkui/menus.c:249
+msgid "_Queue Manager ..."
+msgstr "_Управление на опашката..."
+
+#: src/gtkui/menus.c:252
+msgid "Volume _Up"
+msgstr "Увеличаване на _звука"
+
+#: src/gtkui/menus.c:253
+msgid "Volume _Down"
+msgstr "Намаляване на з_вука"
+
+#: src/gtkui/menus.c:255
+msgid "_Equalizer"
+msgstr "_Тонкоректор"
+
+#: src/gtkui/menus.c:257
+msgid "E_ffects"
+msgstr "_Ефекти"
+
+#: src/gtkui/menus.c:260
+msgid "_Interface"
+msgstr "_Изглед"
+
+#: src/gtkui/menus.c:261
+msgid "_Visualizations"
+msgstr "_Представяне"
+
+#: src/gtkui/menus.c:263
+msgid "Show _Menu Bar"
+msgstr "Показване на панел с _меню"
+
+#: src/gtkui/menus.c:264
+msgid "Show I_nfo Bar"
+msgstr "Показване на лента с _информация"
+
+#: src/gtkui/menus.c:265
+msgid "Show Info Bar Vis_ualization"
+msgstr "Показване на представяне в стълба с информация"
+
+#: src/gtkui/menus.c:266
+msgid "Show _Status Bar"
+msgstr "Показване на лента на _състоянието"
+
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Пока_жи оставащо време"
+
+#: src/gtkui/menus.c:270
+msgid "Show Close _Buttons"
+msgstr "Покажи бутони за _затваряне"
+
+#: src/gtkui/menus.c:271
+msgid "Show Column _Headers"
+msgstr "Показване на _графите"
+
+#: src/gtkui/menus.c:272
+msgid "Choose _Columns ..."
+msgstr "Избор на _колони..."
+
+#: src/gtkui/menus.c:273
+msgid "Scrol_l on Song Change"
+msgstr "Пре_въртане при смяна на песен"
+
+#: src/gtkui/menus.c:276
+msgid "_File"
+msgstr "_Файл"
+
+#: src/gtkui/menus.c:277
+msgid "_Playback"
+msgstr "_Изпълнение"
+
+#: src/gtkui/menus.c:278
+msgid "P_laylist"
+msgstr "_Списък"
+
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
+msgid "_Services"
+msgstr "_Услуги"
+
+#: src/gtkui/menus.c:280
+msgid "_Output"
+msgstr "_Изходящ поток"
+
+#: src/gtkui/menus.c:281
+msgid "_View"
+msgstr "_Изглед"
+
+#: src/gtkui/menus.c:285
+msgid "_Queue/Unqueue"
+msgstr "_Промяна на състоянието в опашката"
+
+#: src/gtkui/menus.c:288
+msgid "Cu_t"
+msgstr "_Отрязване"
+
+#: src/gtkui/menus.c:289
+msgid "_Copy"
+msgstr "_Копиране"
+
+#: src/gtkui/menus.c:290
+msgid "_Paste"
+msgstr "_Поставяне"
+
+#: src/gtkui/menus.c:291
+msgid "Select _All"
+msgstr "Избор на _всички"
+
+#: src/gtkui/menus.c:297
+msgid "_Rename ..."
+msgstr "П_реименуване..."
+
+#: src/gtkui/ui_gtk.c:96
+msgid "GTK Interface"
+msgstr "GTK Изглед"
+
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.c:204
+msgid "Buffering ..."
+msgstr "Запълване..."
+
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
+msgid "Error"
+msgstr "Грешка"
+
+#: src/gtkui/ui_statusbar.c:108
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] "%d канал"
+msgstr[1] "%d канали"
+
+#: src/gtkui/ui_statusbar.c:123
+#, c-format
+msgid "%d kbps"
+msgstr "%d кбвс"
+
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr "Предишен запис"
+
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
+msgid "Play"
+msgstr "Изпълнение"
+
+#: src/hotkey/gui.c:72
+msgid "Pause/Resume"
+msgstr "Временно спиране/Възобновяване"
+
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
+msgid "Stop"
+msgstr "Спиране"
+
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr "Следващ запис"
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "Напред с 5 секунди"
+
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
+msgstr "Назад с 5 секунди"
+
+#: src/hotkey/gui.c:77
+msgid "Mute"
+msgstr "Заглушаване"
+
+#: src/hotkey/gui.c:78
+msgid "Volume up"
+msgstr "Увеличаване на звука"
+
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr "Намаляване на звука"
+
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
+msgstr "Прескачане до файл"
+
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr "Превключване между прозорците"
+
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Показване на Прозорец върху екрана"
+
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
+msgstr "Превключване на повторение"
+
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
+msgstr "Превключване на разбъркване"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr "Превключване на спиране след текущият"
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
+msgstr "Издигане на прозорците"
+
+#: src/hotkey/gui.c:96
+msgid "(none)"
+msgstr "(без)"
+
+#: src/hotkey/gui.c:233
+msgid ""
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"Не се препоръчва да се обвързват основните бутони на мишката без наличието "
+"на променливи.\n"
+"\n"
+"Искате ли да продължите?"
+
+#: src/hotkey/gui.c:235
+msgid "Binding mouse buttons"
+msgstr "Обвързани бутони на мишката"
+
+#: src/hotkey/gui.c:385
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Настройка на приставката за основни бързи клавиши"
+
+#: src/hotkey/gui.c:401
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+"Наберете комбинация от клавиши в текстовото поле.\n"
+"Можете да включете и бутони от мишката."
+
+#: src/hotkey/gui.c:406
+msgid "Hotkeys:"
+msgstr "Бързи клавиши:"
+
+#: src/hotkey/gui.c:423
+msgid "Action:"
+msgstr "Действие:"
+
+#: src/hotkey/gui.c:430
+msgid "Key Binding:"
+msgstr "Обвързване на клавиш:"
+
+#: src/hotkey/plugin.c:66
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"Приставка за Общи бързи клавиши\n"
+"Управление на плеъра с комбинации от общи клавиши или мултимедийни бутони.\n"
+"\n"
+"Авторски права (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Сътрудници, включително:\n"
+"Авторски права (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Авторски права (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
+
+#: src/hotkey/plugin.c:78
+msgid "Global Hotkeys"
+msgstr "Общи бързи клавиши"
+
+#: src/jack/jack.c:410
+msgid ""
+"Based on xmms-jack, by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Ported to Audacious by Giacomo Lozito"
+msgstr ""
+"Базиран на xmms-jack, от Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Пренаписан за Audacious от Giacomo Lozito"
+
+#: src/jack/jack.c:416
+msgid "JACK Output"
+msgstr "JACK Изход"
+
+#: src/ladspa/plugin.c:493
+#, c-format
+msgid "%s Settings"
+msgstr "%s Настройки"
+
+#: src/ladspa/plugin.c:561
+msgid "LADSPA Host Settings"
+msgstr "Настройки на LADSPA среда"
+
+#: src/ladspa/plugin.c:570
+msgid "Module paths:"
+msgstr "Пътища към модул:"
+
+#: src/ladspa/plugin.c:575
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+"Разделяйте множество пътища с двоеточие.\n"
+"Тези пътища се претърсват като допълнение на LADSPA_PATH.\n"
+"След добавяне на тези пътища, натиснете Ентер за сканиране за нови приставки."
+""
+
+#: src/ladspa/plugin.c:591
+msgid "Available plugins:"
+msgstr "Достъпни приставки:"
+
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
+msgid "Enable"
+msgstr "Активиране"
+
+#: src/ladspa/plugin.c:610
+msgid "Enabled plugins:"
+msgstr "Активирани приставки:"
+
+#: src/ladspa/plugin.c:626
+msgid "Settings"
+msgstr "Настройки"
+
+#: src/ladspa/plugin.c:645
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+"Порт на LADSPA за Audacious\n"
+"Авторски права 2011 John Lindgren"
+
+#: src/ladspa/plugin.c:650
+msgid "LADSPA Host"
+msgstr "LADSPA Среда"
+
+#: src/lirc/lirc.c:76
+#, c-format
+msgid "%s: could not init LIRC support\n"
+msgstr "%s: не може да се отбележи поддръжка на LIRC\n"
+
+#: src/lirc/lirc.c:83
+#, c-format
+msgid ""
+"%s: could not read LIRC config file\n"
+"%s: please read the documentation of LIRC\n"
+"%s: how to create a proper config file\n"
+msgstr ""
+"%s: не може да се прочете файла с настройка на LIRC\n"
+"%s: моля прочетете документацията на LIRC\n"
+"%s: как да създадем подходящ файл с настройки\n"
+
+#: src/lirc/lirc.c:114
+#, c-format
+msgid "%s: trying to reconnect...\n"
+msgstr "%s: опит за повторно свързване...\n"
+
+#: src/lirc/lirc.c:354
+#, c-format
+msgid "%s: unknown command \"%s\"\n"
+msgstr "%s: неизвестна команда „%s“\n"
+
+#: src/lirc/lirc.c:365
+#, c-format
+msgid "%s: disconnected from LIRC\n"
+msgstr "%s: прекъсната връзка от LIRC\n"
+
+#: src/lirc/lirc.c:371
+#, c-format
+msgid "%s: will try reconnect every %d seconds...\n"
+msgstr "%s: опит за повторна връзка на всеки %d секунди...\n"
+
+#: src/lirc/lirc.c:381
+msgid ""
+"A simple plugin to control Audacious using the LIRC remote control daemon\n"
+"\n"
+"Adapted for Audacious by:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Based on the XMMS LIRC plugin by:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"For more information about LIRC, see http://lirc.org."
+msgstr ""
+"Опростена приставка за контрол над Audacious, чрез демон за отдалечен достъп "
+"LIRC\n"
+"\n"
+"Пригоден за Audacious от:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"На основата на приставката LIRC от XMMS:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"За повече информация относно LIRC, вижте http://lirc.org"
+
+#: src/lirc/lirc.c:392
+msgid "Connection"
+msgstr "Връзка"
+
+#: src/lirc/lirc.c:393
+msgid "Reconnect to LIRC server"
+msgstr "Повторно свързване към LIRC сървъра"
+
+#: src/lirc/lirc.c:395
+msgid "Wait before reconnecting:"
+msgstr "Изчакайте преди да опитате повторно свързване:"
+
+#: src/lirc/lirc.c:405
+msgid "LIRC Plugin"
+msgstr "Приставка LIRC"
+
+#: src/lyricwiki/lyricwiki.c:117
+msgid "No lyrics available"
+msgstr "Няма наличен текст"
+
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
+#, c-format
+msgid "Unable to fetch %s"
+msgstr "Неуспех при извличане на %s"
+
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
+#, c-format
+msgid "Unable to parse %s"
+msgstr "Неуспех при разделяне на %s"
+
+#: src/lyricwiki/lyricwiki.c:260
+msgid "Looking for lyrics ..."
+msgstr "Търсене на текст..."
+
+#: src/lyricwiki/lyricwiki.c:271
+msgid "Missing song metadata"
+msgstr "Липсващи метаданни за песента"
+
+#: src/lyricwiki/lyricwiki.c:284
+msgid "Connecting to lyrics.wikia.com ..."
+msgstr "Свързване към lyrics.wikia.com..."
+
+#: src/lyricwiki/lyricwiki.c:411
+msgid "LyricWiki Plugin"
+msgstr "Приставка LyricWiki"
+
+#: src/m3u/m3u.c:121
+msgid "M3U Playlists"
+msgstr "Списък M3U"
+
+#: src/metronom/metronom.c:127
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Генератор на удари: %d увм"
+
+#: src/metronom/metronom.c:129
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Генератор на удари: %d увм %d/%d"
+
+#: src/metronom/metronom.c:246
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr ""
+"„Генератор на удари“ от Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"За да го използвате, добавете интернет адрес: tact://beats*num/den\n"
+"напр. tact://77 за изпълняване на 77 удара в минута\n"
+"или tact://60*3/4 за изпълняване на 60 увм в такт 3/4"
+
+#: src/metronom/metronom.c:255
+msgid "Tact Generator"
+msgstr "Генератор на удари"
+
+#: src/mixer/mixer.c:169
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+"Приставка смесител на канали за Audacious\n"
+"Авторски права 2011-2012 John Lindgren и "
+
+#: src/mixer/mixer.c:173
+msgid "Channel Mixer"
+msgstr "Смесител на канали"
+
+#: src/mixer/mixer.c:174
+msgid "Output channels:"
+msgstr "Изходни канали:"
+
+#: src/mixer/mixer.c:184
+msgid "Channel Mixer"
+msgstr "Смесител на канали"
+
+#: src/mms/mms.c:224
+msgid "MMS Plugin"
+msgstr "Приставка MMS"
+
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Дълбочина"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-битов"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-битов"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Канали"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Преизчисляване"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Най-близкият (най-бърз)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Линеен (бърз)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Шпонка (добър)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Многофазен (най-добър)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Честота на дискретизация"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 кХц"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 кХц"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 кХц"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 кХц"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Ниво:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Срез:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Ехо"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Усилване на ниските"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Обграждащ звук"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Предусилвател"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Разни"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Надхвърляне на честотата на дискретизация"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Намаляване на шума"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Изпълняване на Amiga MODs"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Повторение"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Брой повторения:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "За непрекъснато повторение, задайте стойност -1."
+
+#: src/modplug/plugin_main.c:238
+msgid "ModPlug (Module Player)"
+msgstr "ModPlug (Модулен плеър)"
+
+#: src/mpg123/mpg123.c:213
+msgid "Surround"
+msgstr "Обграждащ звук"
+
+#: src/mpg123/mpg123.c:569
+msgid "MPG123 Plugin"
+msgstr "Приставка MPG123"
+
+#: src/mpris2/plugin.c:403
+msgid "MPRIS 2 Server"
+msgstr "Услуга MPRIS 2"
+
+#: src/neon/neon.c:1228
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr "Приставка Neon HTTP/HTTPS"
+
+#: src/notify/event.c:64
+msgid "Stopped"
+msgstr "Спрян"
+
+#: src/notify/event.c:64
+msgid "Audacious is not playing."
+msgstr "Audacious не изпълнява нищо."
+
+#: src/notify/notify.c:33
+msgid ""
+"Desktop Notifications Plugin for Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Приставка за уведомления върху работният плот за Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Тази програма е свободен софтуер; можете да я разпространявате и/или "
+"променяте\n"
+"според правата на GNU GPL, както е публикувано от FSF; включително\n"
+"за версия 3 на лиценза или всяка по-късна (според ваша преценка).\n"
+"\n"
+"Тази програма се разпространява с вярата, че ще бъде полезна,\n"
+"но БЕЗ КАКВАТО И ДА БИЛО ГАРАНЦИЯ; дори без да се включва гаранция за\n"
+"ПРОДАВАЕМОСТ или ЗА ЛИЧНИ ЦЕЛИ. За повече детайли вижте GNU GPL.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Показване на бутоните за управление"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Винаги да се показва известие"
+
+#: src/notify/notify.c:92
+msgid "Desktop Notifications"
+msgstr "Уведомления на работния плот"
+
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Показване"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Временно спиране"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Следващ"
+
+#: src/oss4/plugin.c:36
+msgid "1. Default device"
+msgstr "1. Устройство по подразбиране"
+
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
+msgid "Audio device:"
+msgstr "Аудио устройство:"
+
+#: src/oss4/plugin.c:77
+msgid "Use alternate device:"
+msgstr "Използване на алтернативно устройство:"
+
+#: src/oss4/plugin.c:81
+msgid "Save volume between sessions."
+msgstr "Запази нивотона звука между сесиите."
+
+#: src/oss4/plugin.c:83
+msgid "Enable format conversions made by the OSS software."
+msgstr "Активиране на формати, направени от OSS софтуер."
+
+#: src/oss4/plugin.c:85
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Активиране на ексклузивен режим, за предотвратяване на смесване."
+
+#: src/oss4/plugin.c:108
+msgid ""
+"OSS4 Output Plugin for Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"Изходна приставка на OSS4 за Audacious\n"
+"Авторски права 2010-2012 Michał Lipski\n"
+"\n"
+"Бих искал да благодаря на хората от #audacious, особено на Tony Vroon и John "
+"Lindgren и, разбира се, на авторите на предишната версия на приставката."
+
+#: src/oss4/plugin.c:115
+msgid "OSS4 Output"
+msgstr "Изход OSS4"
+
+#: src/pls/pls.c:113
+msgid "PLS Playlists"
+msgstr "Списъци PLS"
+
+#: src/psf/plugin.c:264
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr "Разкодиране OpenPSF PSF1/PSF2"
+
+#: src/pulse_audio/pulse_audio.c:644
+msgid ""
+"Audacious PulseAudio Output Plugin\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+"Изходна приставка PulseAudio за Audacious\n"
+"\n"
+"Тази програма е свободен софтуер; можете да я разпространявате и/или "
+"променяте\n"
+"според правата на GNU GPL, както е публикувано от FSF; включително\n"
+"за версия 2 на лиценза или всяка по-късна (според ваша преценка).\n"
+"\n"
+"Тази програма се разпространява с вярата, че ще бъде полезна,\n"
+"но БЕЗ КАКВАТО И ДА БИЛО ГАРАНЦИЯ; дори без да се включва гаранция за\n"
+"ПРОДАВАЕМОСТ или ЗА ЛИЧНИ ЦЕЛИ. За повече детайли вижте GNU GPL.\n"
+"\n"
+"Трябва да сте получили копие от GNU GPL редом с тази програма;\n"
+"ако не сте, пишете до Free Software Foundation, Inc., 51 Franklin Street,\n"
+"Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/pulse_audio/pulse_audio.c:662
+msgid "PulseAudio Output"
+msgstr "Изход PulseAudio"
+
+#: src/resample/resample.c:161
+msgid ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Приставка за промяна на честотата за Audacious\n"
+"Авторски права 2010-2012 John Lindgren"
+
+#: src/resample/resample.c:165
+msgid "Skip/repeat samples"
+msgstr "Честотно прескачане/повтаряне"
+
+#: src/resample/resample.c:166
+msgid "Linear interpolation"
+msgstr "Линейна интерполация"
+
+#: src/resample/resample.c:167
+msgid "Fast sinc interpolation"
+msgstr "Бързосинхронна интерполация"
+
+#: src/resample/resample.c:168
+msgid "Medium sinc interpolation"
+msgstr "Средносинхронна интерполация"
+
+#: src/resample/resample.c:169
+msgid "Best sinc interpolation"
+msgstr "Най-добра синхронна интерполация"
+
+#: src/resample/resample.c:172
+msgid "Conversion"
+msgstr "Обръщане"
+
+#: src/resample/resample.c:173
+msgid "Method:"
+msgstr "Метод:"
+
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
+msgid "Rate:"
+msgstr "Честота:"
+
+#: src/resample/resample.c:179
+msgid "Rate Mappings"
+msgstr "Планирани честоти"
+
+#: src/resample/resample.c:180
+msgid "Use rate mappings"
+msgstr "Използване на планирани честоти"
+
+#: src/resample/resample.c:182
+msgid "8 kHz:"
+msgstr "8 кХц:"
+
+#: src/resample/resample.c:185
+msgid "16 kHz:"
+msgstr "16 кХц:"
+
+#: src/resample/resample.c:188
+msgid "22.05 kHz:"
+msgstr "22.05 кХц:"
+
+#: src/resample/resample.c:191
+msgid "44.1 kHz:"
+msgstr "44.1 кХц:"
+
+#: src/resample/resample.c:194
+msgid "48 kHz:"
+msgstr "48 кХц:"
+
+#: src/resample/resample.c:197
+msgid "96 kHz:"
+msgstr "96 кХц:"
+
+#: src/resample/resample.c:200
+msgid "192 kHz:"
+msgstr "192 кХц:"
+
+#: src/resample/resample.c:210
+msgid "Sample Rate Converter"
+msgstr "Преобразувател на честоти"
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "Добре. Споделяне за потребител: %s"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Нямате права"
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Посетете връзката, за да позволите на Audacious, да споделя Вашите "
+"изпълнения:"
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Запазете този прозорец отворен и отново изберете „Проверка на права“.\n"
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"Не се притеснявайте. Вашите споделяния са запаметени на компютъра.\n"
+"Ще бъдат изпратени веднага след като на Audacious му бъде позволено."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Интернет проблем."
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "Възникна проблем при свързване с Last.fm. Опитайте по-късно."
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Проверка..."
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "П_роверка на права"
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_Връщане на права"
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Нужно е да позволите на Audacious да споделя записите във Вашият Last.fm "
+"профил.\n"
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Приставката Споделяне на песен не може да се стартира.\n"
+"Може би има проблем с инсталацията."
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Приставка на Audacious за Споделяне на песни 2.0 от Pitxyoki,\n"
+"\n"
+"Авторски права © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Благодарности на John Lindgren за оказаната помощ в този проект.\n"
+"\n"
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Споделяне 2.0"
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious използва подобрена версия на Споделяне на песни за Last.fm.\n"
+"Моля, проверете настройките на приставката за Споделяне на песни."
+
+#: src/sdlout/plugin.c:26
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"Изходна приставка SDL за Audacious\n"
+"Авторски права 2010 John Lindgren"
+
+#: src/sdlout/plugin.c:31
+msgid "SDL Output"
+msgstr "Изход SDL"
+
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
+msgid "Library"
+msgstr "Библиотека"
+
+#: src/search-tool/search-tool.c:219
+msgid "Unknown Artist"
+msgstr "Непознат изпълнител"
+
+#: src/search-tool/search-tool.c:221
+msgid "Unknown Album"
+msgstr "Непознат албум"
+
+#: src/search-tool/search-tool.c:632
+#, c-format
+msgid ""
+"%s\n"
+" on %s by %s"
+msgstr ""
+"%s\n"
+" на %s от %s"
+
+#: src/search-tool/search-tool.c:638
+#, c-format
+msgid "%d album"
+msgid_plural "%d albums"
+msgstr[0] "%d албум"
+msgstr[1] "%d албуми"
+
+#: src/search-tool/search-tool.c:640
+#, c-format
+msgid ""
+"%s\n"
+" %s, %d song"
+msgid_plural ""
+"%s\n"
+" %s, %d songs"
+msgstr[0] ""
+"%s\n"
+" %s, %d песен"
+msgstr[1] ""
+"%s\n"
+" %s, %d песни"
+
+#: src/search-tool/search-tool.c:646
+#, c-format
+msgid ""
+"%s\n"
+" %d song by %s"
+msgid_plural ""
+"%s\n"
+" %d songs by %s"
+msgstr[0] ""
+"%s\n"
+" %d песен от %s"
+msgstr[1] ""
+"%s\n"
+" %d песни от %s"
+
+#: src/search-tool/search-tool.c:687
+msgid "_Create Playlist"
+msgstr "_Създай списък"
+
+#: src/search-tool/search-tool.c:694
+msgid "_Add to Playlist"
+msgstr "_Добавяне в списък"
+
+#: src/search-tool/search-tool.c:734
+msgid "Search library"
+msgstr "Търсене в библиотека"
+
+#: src/search-tool/search-tool.c:739
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"За да внесете музикална библиотека в Audacious, изберете папка и кликнете на "
+"бутона \"Опресняване\"."
+
+#: src/search-tool/search-tool.c:747
+msgid "Please wait ..."
+msgstr "Моля изчакайте..."
+
+#: src/search-tool/search-tool.c:769
+msgid "Choose Folder"
+msgstr "Избор на папка"
+
+#: src/search-tool/search-tool.c:808
+msgid "Search Tool"
+msgstr "Инструмент за търсене"
+
+#: src/skins/plugin.c:49
+msgid "Winamp Classic Interface"
+msgstr "Класически изглед на Winamp"
+
+#: src/skins/skins_cfg.c:204
+msgid "_Player:"
+msgstr "_Плеър:"
+
+#: src/skins/skins_cfg.c:205
+msgid "Select main player window font:"
+msgstr "Избор на основен шрифт за прозореца на плеъра:"
+
+#: src/skins/skins_cfg.c:207
+msgid "_Playlist:"
+msgstr "_Списък:"
+
+#: src/skins/skins_cfg.c:208
+msgid "Select playlist font:"
+msgstr "Избор на шрифт за списъка:"
+
+#: src/skins/skins_cfg.c:212
+msgid "_Fonts"
+msgstr "_Шрифтове"
+
+#: src/skins/skins_cfg.c:215
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Избор на растерни шрифтове (поддържа само ASCII)"
+
+#: src/skins/skins_cfg.c:217
+msgid "Scroll song title in both directions"
+msgstr "Превъртане на заглавието на песента в двете посоки"
+
+#: src/skins/skins_cfg.c:295
+msgid "_Skin"
+msgstr "_Кожа"
+
+#: src/skins/skins_cfg.c:342
+msgid "Interface Preferences"
+msgstr "Настройки на външния вид"
+
+#: src/skins/ui_equalizer.c:328
+msgid "Preamp"
+msgstr "Предусилвател"
+
+#: src/skins/ui_equalizer.c:332
+msgid "31 Hz"
+msgstr "31 Хц"
+
+#: src/skins/ui_equalizer.c:333
+msgid "63 Hz"
+msgstr "63 Хц"
+
+#: src/skins/ui_equalizer.c:333
+msgid "125 Hz"
+msgstr "125 Хц"
+
+#: src/skins/ui_equalizer.c:333
+msgid "250 Hz"
+msgstr "250 Хц"
+
+#: src/skins/ui_equalizer.c:333
+msgid "500 Hz"
+msgstr "500 Хц"
+
+#: src/skins/ui_equalizer.c:333
+msgid "1 kHz"
+msgstr "1 кХц"
+
+#: src/skins/ui_equalizer.c:334
+msgid "2 kHz"
+msgstr "2 кХц"
+
+#: src/skins/ui_equalizer.c:334
+msgid "4 kHz"
+msgstr "4 кХц"
+
+#: src/skins/ui_equalizer.c:334
+msgid "8 kHz"
+msgstr "8 кХц"
+
+#: src/skins/ui_equalizer.c:334
+msgid "16 kHz"
+msgstr "16 кХц"
+
+#: src/skins/ui_equalizer.c:375
+msgid "Audacious Equalizer"
+msgstr "Тонкоректор на Audacious"
+
+#: src/skins/ui_equalizer.c:890
+msgid "Presets"
+msgstr "Зададени"
+
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
+msgid "Load preset"
+msgstr "Зареждане на предложение"
+
+#: src/skins/ui_equalizer.c:988
+msgid "Load auto-preset"
+msgstr "Зареждане на автоматично предложение"
+
+#: src/skins/ui_equalizer.c:1018 src/skins/ui_equalizer.c:1036
+#: src/skins/ui_equalizer.c:1052
+msgid "Load equalizer preset"
+msgstr "Зареждане на предложение за тонкоректор"
+
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
+msgid "Save preset"
+msgstr "Запазване на предложение"
+
+#: src/skins/ui_equalizer.c:1087
+msgid "Save auto-preset"
+msgstr "Запазване на автоматично предложение"
+
+#: src/skins/ui_equalizer.c:1118 src/skins/ui_equalizer.c:1154
+msgid "Save equalizer preset"
+msgstr "Запазване на зададен тонкоректор"
+
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
+msgid "Delete preset"
+msgstr "Изтриване на предложение"
+
+#: src/skins/ui_equalizer.c:1190
+msgid "Delete auto-preset"
+msgstr "Изтриване на автоматично предложение"
+
+#: src/skins/ui_main.c:414
+msgid "kbps"
+msgstr "кбвс"
+
+#: src/skins/ui_main.c:422
+msgid "kHz"
+msgstr "кХц"
+
+#: src/skins/ui_main.c:770
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Превъртане до %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/ui_main.c:791
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Сила на звука: %d%%"
+
+#: src/skins/ui_main.c:814
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Баланс: %d%% ляво"
+
+#: src/skins/ui_main.c:816
+msgid "Balance: center"
+msgstr "Баланс: център"
+
+#: src/skins/ui_main.c:818
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Баланс: %d%% дясно"
+
+#: src/skins/ui_main.c:942
+msgid "Options Menu"
+msgstr "Меню с опции"
+
+#: src/skins/ui_main.c:946
+msgid "Disable 'Always On Top'"
+msgstr "Деактивиране на „Винаги отгоре“"
+
+#: src/skins/ui_main.c:948
+msgid "Enable 'Always On Top'"
+msgstr "Активиране на „Винаги отгоре“"
+
+#: src/skins/ui_main.c:951
+msgid "File Info Box"
+msgstr "Кутийка с информация за файла"
+
+#: src/skins/ui_main.c:956
+msgid "Visualization Menu"
+msgstr "Меню за визуализация"
+
+#: src/skins/ui_main.c:1591
+msgid "Single mode."
+msgstr "Режим „Единичен“."
+
+#: src/skins/ui_main.c:1593
+msgid "Playlist mode."
+msgstr "Режим „Списък“."
+
+#: src/skins/ui_main.c:1615
+msgid "Stopping after song."
+msgstr "Спиране след песента."
+
+#: src/skins/ui_main.c:1617
+msgid "Not stopping after song."
+msgstr "Да не се спира след песента."
+
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Зададена е начална точка на повторение."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Зададена е крайна точка на повторение."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Точките на повторение са изчистени."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
+msgid "Autoscroll Song Name"
+msgstr "Автоматично превъртане на името на песента"
+
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
+msgid "Stop after Current Song"
+msgstr "Спиране след текущата песен"
+
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
+msgid "Peaks"
+msgstr "Пикове"
+
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
+msgid "Repeat"
+msgstr "Повторение"
+
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
+msgid "Shuffle"
+msgstr "Прескачане"
+
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
+msgid "No Playlist Advance"
+msgstr "Без продължаване в списъка"
+
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
+msgid "Show Player"
+msgstr "Показване на плеъра"
+
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
+msgid "Show Playlist Editor"
+msgstr "Показване на редактор на списъка"
+
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
+msgid "Show Equalizer"
+msgstr "Показване на тонкоректор"
+
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
+msgid "Always on Top"
+msgstr "Винаги отгоре"
+
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
+msgid "Put on All Workspaces"
+msgstr "Поставяне на всички работни среди"
+
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
+msgid "Roll up Player"
+msgstr "Навиване на плеъра"
+
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
+msgid "Roll up Playlist Editor"
+msgstr "Навиване на редактора на списъка"
+
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
+msgid "Roll up Equalizer"
+msgstr "Навиване на тонкоректора"
+
+#: src/skins/ui_manager.c:114
+msgid "Analyzer"
+msgstr "Анализатор"
+
+#: src/skins/ui_manager.c:115
+msgid "Scope"
+msgstr "Осцилоскоп"
+
+#: src/skins/ui_manager.c:116
+msgid "Voiceprint"
+msgstr "Гласов отпечатък"
+
+#: src/skins/ui_manager.c:117
+msgid "Off"
+msgstr "Изглючено"
+
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
+msgid "Normal"
+msgstr "Нормално"
+
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+msgid "Fire"
+msgstr "Огън"
+
+#: src/skins/ui_manager.c:123
+msgid "Vertical Lines"
+msgstr "Вертикални линии"
+
+#: src/skins/ui_manager.c:127
+msgid "Lines"
+msgstr "Линии"
+
+#: src/skins/ui_manager.c:128
+msgid "Bars"
+msgstr "Стълбове"
+
+#: src/skins/ui_manager.c:132
+msgid "Dot Scope"
+msgstr "Точков осцилоскоп"
+
+#: src/skins/ui_manager.c:133
+msgid "Line Scope"
+msgstr "Линеен осцилоскоп"
+
+#: src/skins/ui_manager.c:134
+msgid "Solid Scope"
+msgstr "Плътен осцилоскоп"
+
+#: src/skins/ui_manager.c:140
+msgid "Ice"
+msgstr "Лед"
+
+#: src/skins/ui_manager.c:145
+msgid "Smooth"
+msgstr "Размито"
+
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
+msgid "Slowest"
+msgstr "Най-бавно"
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slow"
+msgstr "Бавно"
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
+msgid "Medium"
+msgstr "Средно"
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Fast"
+msgstr "Бързо"
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fastest"
+msgstr "Най-бързо"
+
+#: src/skins/ui_manager.c:165
+msgid "Time Elapsed"
+msgstr "Изминало време"
+
+#: src/skins/ui_manager.c:166
+msgid "Time Remaining"
+msgstr "Оставащо време"
+
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
+msgid "Previous"
+msgstr "Предишен"
+
+#: src/skins/ui_manager.c:195
+msgid "Visualization"
+msgstr "Изобразяване"
+
+#: src/skins/ui_manager.c:196
+msgid "Visualization Mode"
+msgstr "Режим на изобразяване"
+
+#: src/skins/ui_manager.c:197
+msgid "Analyzer Mode"
+msgstr "Режим на анализатора"
+
+#: src/skins/ui_manager.c:198
+msgid "Scope Mode"
+msgstr "Режим на осцилоскопа"
+
+#: src/skins/ui_manager.c:199
+msgid "Voiceprint Mode"
+msgstr "Режим на гласовия отпечатък"
+
+#: src/skins/ui_manager.c:200
+msgid "WindowShade VU Mode"
+msgstr "Режим на изобразяване WindowShade"
+
+#: src/skins/ui_manager.c:201
+msgid "Analyzer Falloff"
+msgstr "Падащ ефект на анализатора"
+
+#: src/skins/ui_manager.c:202
+msgid "Peaks Falloff"
+msgstr "Падащ ефект на пиковете"
+
+#: src/skins/ui_manager.c:207
+msgid "Playlist"
+msgstr "Списък за изпълнение"
+
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
+msgid "Play Playlist"
+msgstr "Изпълнение на списъка"
+
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
+msgid "New Playlist"
+msgstr "Нов списък"
+
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
+msgid "Select Next Playlist"
+msgstr "Избор на нов списък"
+
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
+msgid "Select Previous Playlist"
+msgstr "Избор на предишен списък"
+
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
+msgid "Delete Playlist"
+msgstr "Изтриване на списък"
+
+#: src/skins/ui_manager.c:224
+msgid "Import Playlist"
+msgstr "Внасяне на списък"
+
+#: src/skins/ui_manager.c:225
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Зареждане на файл със списък в текущия списък."
+
+#: src/skins/ui_manager.c:228
+msgid "Export Playlist"
+msgstr "Изнасяне на списък"
+
+#: src/skins/ui_manager.c:229
+msgid "Saves the selected playlist."
+msgstr "Запаметява избраният списък."
+
+#: src/skins/ui_manager.c:231
+msgid "Refresh List"
+msgstr "Опресняване на списъка"
+
+#: src/skins/ui_manager.c:232
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Опреснява метаданни, свързани със запис в списъка."
+
+#: src/skins/ui_manager.c:235
+msgid "Playlist Manager"
+msgstr "Мениджър на списъка"
+
+#: src/skins/ui_manager.c:238
+msgid "Queue Manager"
+msgstr "Мениджър на опашката"
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Изглед"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "Външен вид"
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr "Настройки на външния вид..."
+
+#: src/skins/ui_manager.c:250
+msgid "Add Internet Address..."
+msgstr "Добавяне на интернет адрес..."
+
+#: src/skins/ui_manager.c:251
+msgid "Adds a remote track to the playlist."
+msgstr "Добавя външно изпълнение в списъка."
+
+#: src/skins/ui_manager.c:254
+msgid "Add Files..."
+msgstr "Добавяне на файлове..."
+
+#: src/skins/ui_manager.c:255
+msgid "Adds files to the playlist."
+msgstr "Добавяне на файлове в списъка."
+
+#: src/skins/ui_manager.c:260
+msgid "Search and Select"
+msgstr "Търсене и избиране"
+
+#: src/skins/ui_manager.c:261
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr "Претърсва в списъка и избира записи, въз основата на даден критерий."
+
+#: src/skins/ui_manager.c:264
+msgid "Invert Selection"
+msgstr "Обръщане на избраното"
+
+#: src/skins/ui_manager.c:265
+msgid "Inverts the selected and unselected entries."
+msgstr "Обръща избраните и неизбраните записи."
+
+#: src/skins/ui_manager.c:268
+msgid "Select All"
+msgstr "Избор на всички"
+
+#: src/skins/ui_manager.c:269
+msgid "Selects all of the playlist entries."
+msgstr "Избира всичките записи в списъка."
+
+#: src/skins/ui_manager.c:272
+msgid "Select None"
+msgstr "Без избрани"
+
+#: src/skins/ui_manager.c:273
+msgid "Deselects all of the playlist entries."
+msgstr "Премахва избора от записите в списъка."
+
+#: src/skins/ui_manager.c:278
+msgid "Remove All"
+msgstr "Премахване на всички"
+
+#: src/skins/ui_manager.c:279
+msgid "Removes all entries from the playlist."
+msgstr "Премахва всички записи от списъка."
+
+#: src/skins/ui_manager.c:282
+msgid "Clear Queue"
+msgstr "Изчистване на опашката"
+
+#: src/skins/ui_manager.c:283
+msgid "Clears the queue associated with this playlist."
+msgstr "Изчиства опашката, свързана с текущия списък."
+
+#: src/skins/ui_manager.c:286
+msgid "Remove Unavailable Files"
+msgstr "Премахване на липсващите файлове"
+
+#: src/skins/ui_manager.c:287
+msgid "Removes unavailable files from the playlist."
+msgstr "Премахва липсващите файлове от списъка."
+
+#: src/skins/ui_manager.c:290
+msgid "Remove Duplicates"
+msgstr "Премахване на повторения"
+
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
+msgid "By Title"
+msgstr "По заглавие"
+
+#: src/skins/ui_manager.c:293
+msgid "Removes duplicate entries from the playlist by title."
+msgstr "Премахва повтарящите се, по заглавие, записи от списъка."
+
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
+msgid "By Filename"
+msgstr "По име на файла"
+
+#: src/skins/ui_manager.c:297
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr "Премахва повтарящите се, по име на файла, записи от списъка."
+
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
+msgid "By Path + Filename"
+msgstr "По път и име на файла"
+
+#: src/skins/ui_manager.c:301
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr ""
+"Премахва повтарящите се, според пълният път до тях, файлове от списъка."
+
+#: src/skins/ui_manager.c:304
+msgid "Remove Unselected"
+msgstr "Премахване на неизбраните"
+
+#: src/skins/ui_manager.c:305
+msgid "Remove unselected entries from the playlist."
+msgstr "Премахва неизбраните записи от списъка."
+
+#: src/skins/ui_manager.c:308
+msgid "Remove Selected"
+msgstr "Премахване на избраните"
+
+#: src/skins/ui_manager.c:309
+msgid "Remove selected entries from the playlist."
+msgstr "Премахва избраните файлове от списъка."
+
+#: src/skins/ui_manager.c:314
+msgid "Randomize List"
+msgstr "Случаен списък"
+
+#: src/skins/ui_manager.c:315
+msgid "Randomizes the playlist."
+msgstr "Случайно подрежда списъка."
+
+#: src/skins/ui_manager.c:318
+msgid "Reverse List"
+msgstr "Обръщане на списъка"
+
+#: src/skins/ui_manager.c:319
+msgid "Reverses the playlist."
+msgstr "Обръща списъка."
+
+#: src/skins/ui_manager.c:322
+msgid "Sort List"
+msgstr "Подреждане на списъка"
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "Sorts the list by title."
+msgstr "Подрежда списъка по заглавие."
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+msgid "By Album"
+msgstr "По Албум"
+
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+msgid "Sorts the list by album."
+msgstr "Подрежда списъка по албум."
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+msgid "By Artist"
+msgstr "По Изпълнител"
+
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+msgid "Sorts the list by artist."
+msgstr "Подрежда списъка по изпълнител."
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "Sorts the list by filename."
+msgstr "Подрежда списъка по име на файла."
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "Sorts the list by full pathname."
+msgstr "Подрежда списъка по пълният път до файла."
+
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+msgid "By Date"
+msgstr "По Дата"
+
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+msgid "Sorts the list by modification time."
+msgstr "Подрежда списъка по време на промяна."
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+msgid "By Track Number"
+msgstr "По номер на записа"
+
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+msgid "Sorts the list by track number."
+msgstr "Подрежда списъка по номер на записа."
+
+#: src/skins/ui_manager.c:352
+msgid "Sort Selected"
+msgstr "Подреждане на избраните"
+
+#: src/skins/ui_manager.c:388
+msgid "File"
+msgstr "Файл"
+
+#: src/skins/ui_manager.c:391
+msgid "Plugin Services"
+msgstr "Услуги към приставките"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View Track Details"
+msgstr "Детайли за записа"
+
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+msgid "View track details"
+msgstr "Детайли за записа"
+
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
+msgid "About Audacious"
+msgstr "Относно Audacious"
+
+#: src/skins/ui_manager.c:402
+msgid "Play File"
+msgstr "Изпълнение на файл"
+
+#: src/skins/ui_manager.c:403
+msgid "Load and play a file"
+msgstr "Зареждане и възпроизвеждане на файл"
+
+#: src/skins/ui_manager.c:405
+msgid "Play Location"
+msgstr "Място за възпроизвеждане"
+
+#: src/skins/ui_manager.c:406
+msgid "Play media from the selected location"
+msgstr "Изпълнение на медия от избраното място"
+
+#: src/skins/ui_manager.c:408
+msgid "Plugin services"
+msgstr "Услуги към приставките"
+
+#: src/skins/ui_manager.c:410
+msgid "Preferences"
+msgstr "Предпочитания"
+
+#: src/skins/ui_manager.c:411
+msgid "Open preferences window"
+msgstr "Отваряне на прозореца с предпочитания"
+
+#: src/skins/ui_manager.c:414
+msgid "Quit Audacious"
+msgstr "Изход от Audacious"
+
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
+msgid "Set A-B"
+msgstr "Задаване на A-B"
+
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
+msgid "Clear A-B"
+msgstr "Изчисване на A-B"
+
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Прескачане до файл"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
+msgid "Jump to Time"
+msgstr "Прескачане до време"
+
+#: src/skins/ui_manager.c:428
+msgid "Queue Toggle"
+msgstr "Превключване в опашката"
+
+#: src/skins/ui_manager.c:429
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Активира/Деактивира записа в опашката на списъка."
+
+#: src/skins/ui_manager.c:432
+msgid "Copy"
+msgstr "Копиране"
+
+#: src/skins/ui_manager.c:435
+msgid "Cut"
+msgstr "Изрязване"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Поставяне"
+
+#: src/skins/ui_manager.c:445
+msgid "Load"
+msgstr "Зареждане"
+
+#: src/skins/ui_manager.c:446
+msgid "Import"
+msgstr "Внасяне"
+
+#: src/skins/ui_manager.c:447
+msgid "Save"
+msgstr "Запаметяване"
+
+#: src/skins/ui_manager.c:448
+msgid "Delete"
+msgstr "Изтриване"
+
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
+msgid "Preset"
+msgstr "Предложение"
+
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
+msgid "Auto-load preset"
+msgstr "Автоматично зареждане на предложение"
+
+#: src/skins/ui_manager.c:454
+msgid "Load auto-load preset"
+msgstr "Зареждане на автоматично предложение"
+
+#: src/skins/ui_manager.c:457
+msgid "Load default preset into equalizer"
+msgstr "Зареждане на предложението по подразбиране в тонкоректора"
+
+#: src/skins/ui_manager.c:459
+msgid "Zero"
+msgstr "Нула"
+
+#: src/skins/ui_manager.c:460
+msgid "Set equalizer preset levels to zero"
+msgstr "Анулира предложените нива в тонкоректора "
+
+#: src/skins/ui_manager.c:462
+msgid "From file"
+msgstr "От файл"
+
+#: src/skins/ui_manager.c:463
+msgid "Load preset from file"
+msgstr "Зареди предложение от файл"
+
+#: src/skins/ui_manager.c:465
+msgid "From WinAMP EQF file"
+msgstr "От WinAMP EQF файл"
+
+#: src/skins/ui_manager.c:466
+msgid "Load preset from WinAMP EQF file"
+msgstr "Зареди предложение от WinAMP EQF файл"
+
+#: src/skins/ui_manager.c:468
+msgid "WinAMP Presets"
+msgstr "WinAMP Предложения"
+
+#: src/skins/ui_manager.c:469
+msgid "Import WinAMP presets"
+msgstr "Внеси WinAMP предложения"
+
+#: src/skins/ui_manager.c:475
+msgid "Save auto-load preset"
+msgstr "Запази като автоматично предложение"
+
+#: src/skins/ui_manager.c:478
+msgid "Save default preset"
+msgstr "Запази като предложение по подразбиране"
+
+#: src/skins/ui_manager.c:480
+msgid "To file"
+msgstr "Във файл"
+
+#: src/skins/ui_manager.c:481
+msgid "Save preset to file"
+msgstr "Запази предложението във файл"
+
+#: src/skins/ui_manager.c:483
+msgid "To WinAMP EQF file"
+msgstr "В WinAMP EQF файл"
+
+#: src/skins/ui_manager.c:484
+msgid "Save preset to WinAMP EQF file"
+msgstr "Запази предложението в WinAMP EQF файл"
+
+#: src/skins/ui_manager.c:490
+msgid "Delete auto-load preset"
+msgstr "Изтриване на автоматично предложение"
+
+#: src/skins/ui_playlist.c:244
+msgid "Search entries in active playlist"
+msgstr "Търсене на записи в активния списък"
+
+#: src/skins/ui_playlist.c:251
+msgid ""
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr ""
+"Избор на записи в списъка, филтрирайки едно или повече полета. Полетата "
+"използват синтаксис с препинателни знаци, без значение от размера на "
+"буквата. Ако не знаете как работи този синтаксис, просто въведете част от "
+"това, което търсите."
+
+#: src/skins/ui_playlist.c:259
+msgid "Title: "
+msgstr "Заглавие:"
+
+#: src/skins/ui_playlist.c:267
+msgid "Album: "
+msgstr "Албум:"
+
+#: src/skins/ui_playlist.c:275
+msgid "Artist: "
+msgstr "Изпълнител:"
+
+#: src/skins/ui_playlist.c:283
+msgid "Filename: "
+msgstr "Име на файл:"
+
+#: src/skins/ui_playlist.c:292
+msgid "Clear previous selection before searching"
+msgstr "Изчистване на предишния избор преди търсене"
+
+#: src/skins/ui_playlist.c:295
+msgid "Automatically toggle queue for matching entries"
+msgstr "Автоматично превключване в опашката за съвпадащите елементи"
+
+#: src/skins/ui_playlist.c:298
+msgid "Create a new playlist with matching entries"
+msgstr "Създаване на нов списък със съвпадащите елементи"
+
+#: src/skins/ui_playlist.c:738
+msgid "Audacious Playlist Editor"
+msgstr "Audacious Редактор на списъка за изпълнение"
+
+#: src/skins/ui_playlist.c:772
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d от %d)"
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr "Архивирана кожа на Winamp 2.x"
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr "Неархивирана кожа на Winamp 2.x"
+
+#: src/skins/util.c:773
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr "Не може да се създаде директория (%s): %s\n"
+
+#: src/sndfile/plugin.c:416
+msgid ""
+"Based on the xmms_sndfile plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"На основата на приставката xmms_sndfile:\n"
+"Авторски права (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Пригоден за Audacious от Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"Тази програма е свободен софтуер; можете да я разпространявате и/или "
+"променяте\n"
+"според правата на GNU GPL, както е публикувано от FSF; включително\n"
+"за версия 2 на лиценза или всяка по-късна (според ваша преценка).\n"
+"\n"
+"Тази програма се разпространява с вярата, че ще бъде полезна,\n"
+"но БЕЗ КАКВАТО И ДА БИЛО ГАРАНЦИЯ; дори без да се включва гаранция за\n"
+"ПРОДАВАЕМОСТ или ЗА ЛИЧНИ ЦЕЛИ. За повече детайли вижте GNU GPL.\n"
+"\n"
+"Трябва да сте получили копие от GNU GPL редом с тази програма;\n"
+"ако не сте, пишете до Free Software Foundation, Inc., 51 Franklin Street,\n"
+"Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/sndfile/plugin.c:435
+msgid "Sndfile Plugin"
+msgstr "Приставка Sndfile"
+
+#: src/sndio/sndio.c:172
+msgid "About Sndio Output Plugin"
+msgstr "Относно изходна приставка Sndio"
+
+#: src/sndio/sndio.c:173
+msgid ""
+"Sndio Output Plugin\n"
+"\n"
+"Written by Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Изходна приставка Sndio\n"
+"\n"
+"Написана от Thomas Pfaff <tpfaff@tp76.info>\n"
+
+#: src/sndio/sndio.c:248
+msgid "Unsupported format"
+msgstr "Неподдържан формат"
+
+#: src/sndio/sndio.c:249
+msgid ""
+"A format not supported by the audio device was requested.\n"
+"\n"
+"Please try again with the sndiod(1) server running."
+msgstr ""
+"Бе поискан формат, който не се поддържа от устройството.\n"
+"\n"
+"Моля опитайте отново, но със стартиран sndiod(1) сървър."
+
+#: src/sndio/sndio.c:384
+msgid "sndio device"
+msgstr "sndio устройство"
+
+#: src/sndio/sndio.c:400
+msgid "(empty means default)"
+msgstr "(празно - означава по подразбиране)"
+
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Добре"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Отказ"
+
+#: src/song_change/song_change.c:54
+msgid "Song Change"
+msgstr "Промяна на песен"
+
+#: src/song_change/song_change.c:436
+msgid "Command to run when Audacious starts a new song."
+msgstr "Команда за изпълнение след започване на нова песен."
+
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
+msgid "Command:"
+msgstr "Команда:"
+
+#: src/song_change/song_change.c:442
+msgid "Command to run toward the end of a song."
+msgstr "Команда за изпълнение след край на песен."
+
+#: src/song_change/song_change.c:448
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr "Команда за изпълнение при достигане на края на списъка."
+
+#: src/song_change/song_change.c:454
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr ""
+"Команда за изпълнение при промяна на заглавието на песен (напр. при интернет "
+"поток)"
+
+#: src/song_change/song_change.c:460
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command):\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%l: Length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr ""
+"Можете да използвате следните букви,\n"
+"които ще бъдат заместени, преди изпълнението на командата\n"
+"(не всички са полезни за команда при край на списъка):\n"
+"\n"
+"%F: Честота (херцове)\n"
+"%c: Брой канали\n"
+"%f: Име на файла (пълен път)\n"
+"%l: Времетраене (милисекунди)\n"
+"%n или %s: Име на песен\n"
+"%r: Честота (битове в секунда)\n"
+"%t: Място в списъка (%02d)\n"
+"%p: В изпълнение (1 или 0)\n"
+"%a: Изпълнител\n"
+"%b: Албум\n"
+"%T: Заглавие на запис"
+
+#: src/song_change/song_change.c:487
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr ""
+"Стойностите, изпратени до обвивката, е добре да са в "
+"кавички. В противен случай се крие опасност за сигурността."
+
+#: src/song_change/song_change.c:498
+msgid "Commands"
+msgstr "Команди"
+
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Приставка Преизчислител SoX за Audacious \n"
+"Авторски права 2013 Michał Lipski\n"
+"\n"
+"Базиран на приставката за промяна на честотата:\n"
+"Авторски права 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Бързо"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Ниско"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Високо"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Много високо"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Качество:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "Преизчислител SoX"
+
+#: src/speed-pitch/speed-pitch.c:225
+msgid "Speed and Pitch"
+msgstr "Скорост и нива"
+
+#: src/speed-pitch/speed-pitch.c:226
+msgid "Speed:"
+msgstr "Скорост:"
+
+#: src/speed-pitch/speed-pitch.c:229
+msgid "Pitch:"
+msgstr "Нива:"
+
+#: src/speed-pitch/speed-pitch.c:264
+msgid "Speed and Pitch"
+msgstr "Скорост и нива"
+
+#: src/statusicon/statusicon.c:390
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+"Приставка за икона на състоянието\n"
+"\n"
+"Авторски права 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Авторски права 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Тази приставка предоставя икона на състоянието, разположена\n"
+"в зоната на системните известия на мениджъра на прозорците."
+
+#: src/statusicon/statusicon.c:397
+msgid "Mouse Scroll Action"
+msgstr "Действие при превъртане с мишка"
+
+#: src/statusicon/statusicon.c:398
+msgid "Change volume"
+msgstr "Промяна на силата на звука"
+
+#: src/statusicon/statusicon.c:401
+msgid "Change playing song"
+msgstr "Промяна на изпълняваната песен"
+
+#: src/statusicon/statusicon.c:404
+msgid "Other Settings"
+msgstr "Други настройки"
+
+#: src/statusicon/statusicon.c:405
+msgid "Disable the popup window"
+msgstr "Деактивиране на изскачащ прозорец"
+
+#: src/statusicon/statusicon.c:407
+msgid "Close to the system tray"
+msgstr "Затваряне в системната табла"
+
+#: src/statusicon/statusicon.c:409
+msgid "Advance in playlist when scrolling upward"
+msgstr "Напред в списъка при привъртане нагоре"
+
+#: src/statusicon/statusicon.c:418
+msgid "Status Icon"
+msgstr "Икона на състоянието"
+
+#: src/stereo_plugin/stereo.c:17
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+"Приставка за допълнително многозвучие\n"
+"\n"
+"От Johan Levin, 1999"
+
+#: src/stereo_plugin/stereo.c:25
+msgid "Extra Stereo"
+msgstr "Допълнително многозвучие"
+
+#: src/stereo_plugin/stereo.c:36
+msgid "Extra Stereo"
+msgstr "Допълнително съзвучие"
+
+#: src/tonegen/tonegen.c:84
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Хц"
+
+#: src/tonegen/tonegen.c:84
+msgid "Tone Generator: "
+msgstr "Генератор на удари:"
+
+#: src/tonegen/tonegen.c:197
+msgid ""
+"Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
+msgstr ""
+"Генератор на удари Sine от Håvard Kvålen <havardk@xmms.org>\n"
+"Променена от Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"За да я използвате, добавете адрес: tone://frequency1;frequency2;"
+"frequency3;...⏎\n"
+"напр. tone://2000;2005 за изпълняването на тон от 2000 Хц и тон от 2005 Хц"
+
+#: src/tonegen/tonegen.c:206
+msgid "Tone Generator"
+msgstr "Генератор на удари"
+
+#: src/unix-io/unix-io.c:243
+msgid ""
+"File I/O Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
+msgstr ""
+"Приставка File I/O за Audacious\n"
+"Авторски права 2009-2012 John Lindgren\n"
+"\n"
+"ТАЗИ ПРИСТАВКА Е НЕОБХОДИМА. НЕ Я ДЕАКТИВИРАЙТЕ."
+
+#: src/unix-io/unix-io.c:266
+msgid "File I/O Plugin"
+msgstr "Приставка File I/O"
+
+#: src/voice_removal/voice_removal.c:58
+msgid "Voice Removal"
+msgstr "Премахване на глас"
+
+#: src/vorbis/vorbis.c:562
+msgid ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Based on the Xiph.org Foundation's Ogg Vorbis Plugin:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Original code by:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contributions from:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Разкодиране на Ogg Vorbis от Audacious\n"
+"\n"
+"На основата на приставката Ogg Vorbis от Xiph.org Foundation:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Непроменен код от:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Със съдействието на:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
+
+#: src/vorbis/vorbis.c:582
+msgid "Ogg Vorbis Decoder"
+msgstr "Разгодиране на Ogg Vorbis"
+
+#: src/vtx/vtx.c:242
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Плеър за формат Vortex от by Sashnov Alexander <sashnov@ngs.ru>\n"
+"На основата на in_vtx.dll от Roman Sherbakov <v_soft@microfor.ru>\n"
+"Приставка за Audacious от Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/vtx/vtx.c:248
+msgid "VTX Decoder"
+msgstr "Разкодиране VTX"
+
+#: src/wavpack/wavpack.c:282
+msgid "lossy (hybrid)"
+msgstr "със загуби (смесено)"
+
+#: src/wavpack/wavpack.c:284
+msgid "lossy"
+msgstr "със загуби"
+
+#: src/wavpack/wavpack.c:334
+msgid ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
+msgstr ""
+"Авторски права 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Част от кода е написана от Miles Egan."
+
+#: src/wavpack/wavpack.c:341
+msgid "WavPack Decoder"
+msgstr "Разкодиране WavPack"
+
+#: src/xsf/plugin.c:274
+msgid "2SF Decoder"
+msgstr "Разкодиране 2SF"
+
+#: src/xspf/xspf.c:440
+msgid "XML Shareable Playlists (XSPF)"
+msgstr "Споделяеми списъци XML (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Контакт - избор на файл"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Сортирай _избраните"

audacious-plugins-3.3.4.tar.bz2/po/ca.po -> audacious-plugins-3.4.2.tar.bz2/po/ca.po Changed

@@ -1,591 +1,603 @@
 # Catalan translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# <catalanoic@gmail.com>, 2012.
+# Catalanoic <catalanoic@gmail.com>, 2012
+# frangor <frangor@frangor.info>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-16 23:46+0000\n"
-"Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: Catalan\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-08 23:36+0000\n"
+"Last-Translator: frangor <frangor@frangor.info>\n"
+"Language-Team: Catalan (http://www.transifex.com/projects/p/audacious/"
+"language/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "estèreo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
-msgstr ""
+msgstr "envoltant"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr ""
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Això és l'avís per despertar-se."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "D'acord"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Paràmetres de l'alarma"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Hora"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "hores"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minuts"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Para al cap de:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Alarma (per defecte) a les:"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Això és l'avís per despertar-se."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Trieu els dies que ha de saltar l'alarma"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Per defecte"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Recordatori"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Dia"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Dilluns"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Dijous"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Divendres"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Dilluns"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Paràmetres de l'alarma"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Hora"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Alarma (per defecte) a les:"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Para al cap de:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "hores"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minuts"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Trieu els dies que ha de saltar l'alarma"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Dia"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Per defecte"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Dies"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Fosa"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "segons"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Volum"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Actual"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Comença a"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Final"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Actual"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Ordre Addicional"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "activa"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Llista de reproducció (opcional)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr ""
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Recordatori"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Activa els recordatoris"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Opcions"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Què signifiquen aquestes opcions?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Cancel·la"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "El vostre recordatori d'avui és.."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Gràcies"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
-msgstr ""
+msgstr "Art del àlbum"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
-msgstr ""
+msgstr "Dispositiu PCM per defecte"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
-msgstr ""
+msgstr "Dispositiu de mescla per defecte"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
-msgstr ""
+msgstr "Preferències de la sortida del connector ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
-msgstr ""
+msgstr "Dispositiu PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Dispositiu de mescla:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
-msgstr ""
+msgstr "Element de mescla:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
-msgstr ""
+msgstr "Evitar penjar-se per falta de recursos"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
-msgstr ""
-
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
+msgstr "Sortida ALSA"
 
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
 msgstr ""
+"No té seleccionat cap port seqüenciador per a la reproducció MIDI.\n"
+"Pot fer-ho a les preferències del connector MIDI."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr ""
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Fons ALSA"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Aquest fons envia esdeveniments MIDI a un grup de ports del seqüenciador ALSA especificats per l'usuari. La interfície del seqüenciador ALSA és molt versàtil, pot proporcionar ports per a sintetitzadors integrats a la targeta de so (p.e., l'emu10k1), però també per a sintetitzadors per programari, dispositius externs, etc.\nAquest fons no produeix àudio, els esdeveniments MIDI són gestionats directament per programes o dispositius darrere els ports ALSA; per exemple, esdeveniments MIDI enviats a un maquinari sintetitzador seran reproduïts pel maquinari en qüestió.\nFons escrit per Giacomo Lozito."
-
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+msgstr ""
+"Aquest fons envia esdeveniments MIDI a un grup de ports del seqüenciador "
+"ALSA especificats per l'usuari. La interfície del seqüenciador ALSA és molt "
+"versàtil, pot proporcionar ports per a sintetitzadors integrats a la targeta "
+"de so (p.e., l'emu10k1), però també per a sintetitzadors per programari, "
+"dispositius externs, etc.\n"
+"Aquest fons no produeix àudio, els esdeveniments MIDI són gestionats "
+"directament per programes o dispositius darrere els ports ALSA; per exemple, "
+"esdeveniments MIDI enviats a un maquinari sintetitzador seran reproduïts pel "
+"maquinari en qüestió.\n"
+"Fons escrit per Giacomo Lozito."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Fons FluidSynth"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Port"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Nom del client"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Nom del port"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Ports ALSA de sortida"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Targeta de so: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Control del volum:"
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Paràmetres del mesclador"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "Fons\nALSA"
+msgstr ""
+"Fons\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "Connector AMIDI-Plug - Informació de l'aplicació de fons"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Selecció de l'aplicació de fons"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Paràmetres de la reproducció"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transposició: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Desplaçament de la percussió: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Paràmetres avançats"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "pre-calcula la durada dels fitxers MIDI a la llista de reproducció"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "extreu els comentaris del fitxer MIDI (si n'hi ha)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "extreu la lletra del fitxer MIDI (si n'hi ha)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "Connector\nAMIDI"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "Connector AMIDI-Plug - Seleccioneu un fitxer"
+msgstr ""
+"Connector\n"
+"AMIDI"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "Connector AMIDI-Plug - Seleccioneu un fitxer SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Paràmetres SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Nom del fitxer"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Mida (octets)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Carrega les SF en arrencar el reproductor"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Paràmetres del sintetitzador"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "guany"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "per defecte"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "valor:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
-msgstr ""
+msgstr "polifonia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "reverberació"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "sí"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "no"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "cor"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "freqüència de mostra"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "personalitzat"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Fons\nFluidSynth"
+msgstr ""
+"Fons\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nom:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " Informació MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Durada (ms):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
-msgstr ""
+msgstr "Num. de pistes:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Div temps:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " Comentaris MIDI i lletres "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* aquest fitxer MIDI no té comentaris *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* aquest fitxer MIDI no té lletra *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 no vàlid)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
-msgstr ""
+msgstr "Quant a AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -638,7 +650,8 @@
 
 #: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "Activa l'OSD quan es reprodueix una entrada de la llista de reproducció"
+msgstr ""
+"Activa l'OSD quan es reprodueix una entrada de la llista de reproducció"
 
 #: src/aosd/aosd_trigger.c:79
 msgid "Title Change"
@@ -649,7 +662,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Activa l'OSD quan, mentre s'està reproduint, el títol de la cançó canvia però el nom del fitxer no. Això és útil per a mostrar canvis de títol en fluxos d'Internet."
+msgstr ""
+"Activa l'OSD quan, mentre s'està reproduint, el títol de la cançó canvia "
+"però el nom del fitxer no. Això és útil per a mostrar canvis de títol en "
+"fluxos d'Internet."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -781,8 +797,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "No s'ha detectat cap gestor Composite;\ntret que sapigueu que ja n'està funcionant un, activeu un gestor Composite o l'OSD no funcionarà correctament"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"No s'ha detectat cap gestor Composite;\n"
+"tret que sapigueu que ja n'està funcionant un, activeu un gestor Composite o "
+"l'OSD no funcionarà correctament"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -845,47 +865,47 @@
 msgid "Misc"
 msgstr "Misc"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr ""
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr ""
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
-msgstr ""
+msgstr "Color"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr ""
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr ""
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
-msgstr ""
+msgstr "Nivell de canal:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
-msgstr ""
+msgstr "Tallar freqüència:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
-msgstr ""
+msgstr "Predefinits:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Analitzador d'espectre"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -897,231 +917,234 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Usa CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Usa HTTP en lloc de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
-msgstr ""
+msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
-msgstr ""
+msgstr "Camí:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
-msgstr ""
+msgstr "Connector de Àudio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
-msgstr ""
+msgstr "CD d'audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
-msgstr ""
+msgstr "La unitat està buida."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
-msgstr ""
+msgstr "Tipus de disc no admès."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
-msgstr ""
+msgstr "Reprodueix CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Afegeix CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr ""
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
-msgstr ""
+msgstr "Compressió"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
-msgstr ""
+msgstr "Centrar volum"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
-msgstr ""
+msgstr "Marge dinàmic:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr ""
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
-msgstr ""
+msgstr "Descodificador musical de videoconsola"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "General"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Reproducció"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Baixos:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "segons"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Aguts:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Durada per defecte:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Remostratge"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Activa el remostratge d'àudio"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Taxa de remostratge:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignora la durada indicada a les etiquetes SPC"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Incrementa la reverberació"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "La durada per defecte d'una cançó, expressada en segons, s'utilitza per a cançons que no proporcionen informació sobre la seva durada (pistes bucle)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"La durada per defecte d'una cançó, expressada en segons, s'utilitza per a "
+"cançons que no proporcionen informació sobre la seva durada (pistes bucle)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1131,74 +1154,76 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
-msgstr ""
+msgstr "Cristal·litzador"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
-msgstr ""
+msgstr "Intensitat:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
-msgstr ""
+msgstr "Eco"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
-msgstr ""
+msgstr "Retard:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
-msgstr ""
+msgstr "Retorn:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
-msgstr ""
+msgstr "Volum:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
@@ -1206,11 +1231,11 @@
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1220,7 +1245,7 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr ""
 
@@ -1300,13 +1325,15 @@
 
 #: src/filewriter/mp3.c:37
 msgid "Joint Stereo"
-msgstr ""
+msgstr "Estèreo conjunt"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Estèreo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1354,7 +1381,7 @@
 msgid "Error protection"
 msgstr "Protecció d'errors"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Qualitat"
 
@@ -1434,19 +1461,19 @@
 msgid "Tags"
 msgstr "Etiquetes"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Configuració del codificador Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Nivell de qualitat (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1454,21 +1481,37 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr ""
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
@@ -1476,500 +1519,549 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr ""
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
-msgstr ""
+msgstr "Número d'entrada"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Títol"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
-msgstr ""
+msgstr "Artista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
-msgstr ""
+msgstr "Any"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
-msgstr ""
+msgstr "Àlbum"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
-msgstr ""
+msgstr "Pista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
-msgstr ""
+msgstr "Gènere"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
-msgstr ""
+msgstr "Posició a la cua"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
-msgstr ""
+msgstr "Durada"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
-msgstr ""
+msgstr "Camí del fitxer"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
-msgstr ""
+msgstr "Nom del fitxer"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
-msgstr ""
+msgstr "Títol personalitzat"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
-msgstr ""
+msgstr "Flux de bits"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
-msgstr ""
+msgstr "Triar Columnes"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
-msgstr ""
+msgstr "Disponible:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
-msgstr ""
+msgstr "Seleccionat:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
-msgstr ""
+msgstr "Acoblador a l'esquerre"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
-msgstr ""
+msgstr "Acoblador a la dreta"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
-msgstr ""
+msgstr "Acoblador a la part superior"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
-msgstr ""
+msgstr "Acoblador a la part inferior"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
-msgstr ""
+msgstr "Desacoblar"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
-msgstr ""
+msgstr "Desactivar"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
-msgstr ""
+msgstr "_Obrir Fitxers..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
-msgstr ""
+msgstr "Obrir _URL..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
-msgstr ""
+msgstr "_Afegir fitxers..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
-msgstr ""
+msgstr "Afegir U_RL..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr ""
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
-msgstr ""
+msgstr "_Quant a..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
-msgstr ""
+msgstr "_Preferències..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Surt"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
-msgstr ""
+msgstr "Repro_duir"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
-msgstr ""
+msgstr "_Pausa"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
-msgstr ""
+msgstr "_Atura"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
-msgstr ""
+msgstr "_Anterior"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
-msgstr ""
+msgstr "_Següent"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
-msgstr ""
+msgstr "_Repetir"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
-msgstr ""
+msgstr "_Mesclar"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
-msgstr ""
+msgstr "No ava_nçar la llista de reproducció"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
-msgstr ""
+msgstr "_Informació de la cançó..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
-msgstr ""
+msgstr "_Salta al temps..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
+msgstr "Salta a la _cançó..."
+
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
+msgstr "Per _títol"
+
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
 msgstr ""
 
-#: src/gtkui/menus.c:189
-msgid "By _Artist"
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Pel número de _pista"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
+msgid "By _Artist"
+msgstr "Per l'_artista"
+
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
+msgstr "Per la _data"
+
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
-msgstr ""
+msgstr "Per nom de _fitxer"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
-msgstr ""
+msgstr "Per títol _personalitzat"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
-msgstr ""
+msgstr "Ordre _invers"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
-msgstr ""
+msgstr "Ordre alea_tori"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr ""
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
-msgstr ""
+msgstr "A_ctualitzar"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr ""
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
+msgstr "_Ordenar"
+
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Ordena els seleccionats"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Eliminar fitxers _no disponibles"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
-msgstr ""
+msgstr "_Nou"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
-msgstr ""
+msgstr "Tan_car"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
-msgstr ""
+msgstr "_Importar..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
-msgstr ""
+msgstr "_Exportar..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
-msgstr ""
+msgstr "Gestor de _cues..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
-msgstr ""
+msgstr "P_ujar volum"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
-msgstr ""
+msgstr "_Baixar volum"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
-msgstr ""
+msgstr "_Equalitzador"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
-msgstr ""
+msgstr "E_fectes"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
-msgstr ""
+msgstr "_Interfície"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
-msgstr ""
+msgstr "_Visualitzacions"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
-msgstr ""
+msgstr "_Mostrar barra de menú"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
-msgstr ""
+msgstr "Mostrar barra d'_informació"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
+msgstr "Mostrar barra d'_estat"
+
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr ""
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
-msgstr ""
+msgstr "Mostrar _capçaleres de columna"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
-msgstr ""
+msgstr "_Seleccionar columnes..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
-msgstr ""
+msgstr "A_vançar al canviar de cançó"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
-msgstr ""
+msgstr "_Fitxer"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
-msgstr ""
+msgstr "_Reproducció"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
-msgstr ""
+msgstr "_Llista de reproducció"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
-msgstr ""
+msgstr "_Servei"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
-msgstr ""
+msgstr "Sorti_da"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
-msgstr ""
+msgstr "_Veure"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
-msgstr ""
+msgstr "_Enviar/Treure de la cua"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
-msgstr ""
+msgstr "Re_tallar"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
-msgstr ""
+msgstr "_Copiar"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
-msgstr ""
+msgstr "_Enganxar"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
-msgstr ""
+msgstr "Seleccionar _tot"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
-msgstr ""
+msgstr "Interfície GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
-msgstr ""
+msgstr "Gestió de memòria intermèdia..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Error"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d canal"
+msgstr[1] "%d canals"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
-msgstr ""
+msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Pista anterior"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Reprodueix"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pausa/Represa"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Para"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Següent pista"
+msgid "Rewind 5 seconds"
+msgstr ""
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Endavant 5 segons"
+msgid "Mute"
+msgstr "Silencia"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Enrere 5 segons"
+msgid "Volume up"
+msgstr ""
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Silencia"
+msgid "Volume down"
+msgstr ""
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Puja el volum"
+msgid "Jump to file"
+msgstr ""
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Baixa el volum"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Salta al fitxer"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Activa l'OSD (sobre-impressió)"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+msgid "Toggle repeat"
 msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Activa l'OSD (sobre-impressió)"
+msgid "Toggle shuffle"
+msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
+msgid "Toggle stop after current"
 msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr ""
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(cap)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "No és recomanable vincular els botons primaris del ratolí sense tecles modificadores.\n\nVoleu continuar?"
+msgstr ""
+"No és recomanable vincular els botons primaris del ratolí sense tecles "
+"modificadores.\n"
+"\n"
+"Voleu continuar?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Vinculació dels botons del ratolí"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Configuració del connector de tecles ràpides globals"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Premeu una combinació de tecles dins del camp de text.\nTambé podeu vincular botons del ratolí."
+msgstr ""
+"Premeu una combinació de tecles dins del camp de text.\n"
+"També podeu vincular botons del ratolí."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Tecles ràpides:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Acció:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Vinculació de tecles:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1984,11 +2076,11 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
@@ -1996,90 +2088,95 @@
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr ""
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
-msgstr ""
+msgstr "Paràmetres %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
-msgstr ""
+msgstr "Paràmetres del servidor LADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
-msgstr ""
+msgstr "Camí de mòduls:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
 msgstr ""
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
-msgstr ""
+msgstr "Connectors disponibles: "
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Activa"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
-msgstr ""
+msgstr "Connectors habilitats:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
-msgstr ""
+msgstr "Configuració"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr ""
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: no s'ha pogut inicialitzar el suport per a LIRC\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: no s'ha pogut llegir el firxer de configuració de LIRC\n%s: si us plau, llegiu la documentació de LIRC, per a saber\n%s: com crear un fitxer de configuració adequat\n"
+msgstr ""
+"%s: no s'ha pogut llegir el firxer de configuració de LIRC\n"
+"%s: si us plau, llegiu la documentació de LIRC, per a saber\n"
+"%s: com crear un fitxer de configuració adequat\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: tractant de reconnectar...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: ordre desconeguda \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: desconnectat del LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: s'intentarà reconnectar cada %d segons...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2095,67 +2192,67 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr ""
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Reconnecta amb el servidor LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr ""
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr ""
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de compassos: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generador de compassos: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2164,84 +2261,218 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr ""
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
-msgstr ""
+msgstr "Canals de sortida:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr ""
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "So envolvent"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr ""
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr ""
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr ""
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
-msgstr ""
+msgstr "Aturat"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
-msgstr ""
+msgstr "Audacious no està reproduint."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr ""
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Següent"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
-msgstr ""
+msgstr "1. Dispositiu per defecte"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Dispositiu d'àudio:"
 
@@ -2255,7 +2486,7 @@
 
 #: src/oss4/plugin.c:83
 msgid "Enable format conversions made by the OSS software."
-msgstr ""
+msgstr "Activar conversions de format realitzades pel programari OSS."
 
 #: src/oss4/plugin.c:85
 msgid "Enable exclusive mode to prevent virtual mixing."
@@ -2266,22 +2497,23 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr ""
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2301,160 +2533,200 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr ""
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Interpolació lineal"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr ""
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
-msgstr ""
+msgstr "Mètode:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr ""
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr ""
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr ""
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr ""
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
 msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Serveis"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
 msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Nom d'usuari:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Contrasenya:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr ""
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
-msgstr ""
+msgstr "Biblioteca"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
-msgstr ""
+msgstr "Artista desconegut"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr ""
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
 msgstr ""
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2465,7 +2737,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2476,75 +2748,75 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
-msgstr ""
+msgstr "_Crear llista de reproducció"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
-msgstr ""
+msgstr "_Afegir a la llista de reproducció"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
-msgstr ""
+msgstr "Cercar biblioteca"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
-msgstr ""
+msgstr "Esperi si us plau..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
-msgstr ""
+msgstr "Seleccioneu un directori"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr ""
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Reproductor:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Trieu la fosa de la finestra principal:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Llista de reproducció:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Trieu la fosa de la llista de reproducció:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Foses"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "Utilitzar tipografies de mapa de bits (nomes suporta ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "Desplaçar el títol de la cançó en ambdues direccions "
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Decoració"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
-msgstr ""
+msgstr "Preferències de la interfície"
 
 #: src/skins/ui_equalizer.c:328
 msgid "Preamp"
@@ -2552,43 +2824,43 @@
 
 #: src/skins/ui_equalizer.c:332
 msgid "31 Hz"
-msgstr ""
+msgstr "31 Hz"
 
 #: src/skins/ui_equalizer.c:333
 msgid "63 Hz"
-msgstr ""
+msgstr "63 Hz"
 
 #: src/skins/ui_equalizer.c:333
 msgid "125 Hz"
-msgstr ""
+msgstr "125 Hz"
 
 #: src/skins/ui_equalizer.c:333
 msgid "250 Hz"
-msgstr ""
+msgstr "250 Hz"
 
 #: src/skins/ui_equalizer.c:333
 msgid "500 Hz"
-msgstr ""
+msgstr "500 Hz"
 
 #: src/skins/ui_equalizer.c:333
 msgid "1 kHz"
-msgstr ""
+msgstr "1 kHz"
 
 #: src/skins/ui_equalizer.c:334
 msgid "2 kHz"
-msgstr ""
+msgstr "2 kHz"
 
 #: src/skins/ui_equalizer.c:334
 msgid "4 kHz"
-msgstr ""
+msgstr "4 kHz"
 
 #: src/skins/ui_equalizer.c:334
 msgid "8 kHz"
-msgstr ""
+msgstr "8 kHz"
 
 #: src/skins/ui_equalizer.c:334
 msgid "16 kHz"
-msgstr ""
+msgstr "16 kHz"
 
 #: src/skins/ui_equalizer.c:375
 msgid "Audacious Equalizer"
@@ -2598,775 +2870,793 @@
 msgid "Presets"
 msgstr "Perfils"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Carrega un perfil"
 
 #: src/skins/ui_equalizer.c:988
 msgid "Load auto-preset"
-msgstr ""
+msgstr "Carregar auto-predefinit"
 
 #: src/skins/ui_equalizer.c:1018 src/skins/ui_equalizer.c:1036
 #: src/skins/ui_equalizer.c:1052
 msgid "Load equalizer preset"
-msgstr ""
+msgstr "Carregar equalitzador predefinit"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Desa el perfil"
 
 #: src/skins/ui_equalizer.c:1087
 msgid "Save auto-preset"
-msgstr ""
+msgstr "Desar auto-predefinit"
 
 #: src/skins/ui_equalizer.c:1118 src/skins/ui_equalizer.c:1154
 msgid "Save equalizer preset"
-msgstr ""
+msgstr "Desar equalitzador predefinit"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Esborra el perfil"
 
 #: src/skins/ui_equalizer.c:1190
 msgid "Delete auto-preset"
-msgstr ""
+msgstr "Suprimir auto-predefinit"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
-msgstr ""
+msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
-msgstr ""
+msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr ""
+msgstr "Anar a la posició %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volum: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balanç: %d%% esquerra"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Balanç: centrat"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balanç: %d%% dreta"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Menú d'opcions"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Desactiva 'Sempre per sobre'"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Activa 'Sempre per sobre'"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Informació del fitxer"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Menú de visualització"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
-msgstr ""
+msgstr "Mode únic"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
-msgstr ""
+msgstr "Mode de llista de reproducció"
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
-msgstr ""
+msgstr "Parar després de la cançó."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
+msgstr "No parar després de la cançó."
+
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
 msgstr ""
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr ""
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Para quan s'acabi la cançó"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Pics"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Repeteix"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Barreja"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Discontinua la reproducció programada"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Mostra el reproductor"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Mostra l'editor de llistes"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Mostra l'equalitzador"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Sempre per sobre"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "A tots els espais de treball"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Enrotlla el reproductor"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Enrotlla l'editor de llistes"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Enrotlla l'equalitzador"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analitzador"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Oscil·loscopi"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Empremta de veu"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Apagat"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Foc"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Línies verticals"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Línies"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Barres"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Oscil·loscopi de punts"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Oscil·loscopi de línies"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Oscil·loscopi sòlid"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Gel"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Suau"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Mínim"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lent"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Mitjà"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Ràpid"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Al màxim"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Temps transcorregut"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Temps que queda"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Següent"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Visualització"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Mode de visualització"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Mode de l'analitzador"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Mode de l'oscil·loscopi"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Mode de l'empremta de veu"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Mode del WindowShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Caiguda de l'analitzador"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Caiguda dels pics"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Llistes"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Llista de reproducció nova"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Selecciona la llista següent"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Selecciona la llista anterior"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Esborra la llista"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
-msgstr ""
+msgstr "Importar llista de reproducció"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Afegeix una llista de reproducció a la llista seleccionada"
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
-msgstr ""
+msgstr "Exportar llista de reproducció"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Desa les llistes de reproducció seleccionades."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Refresca la llista"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Refresca les meta-dades associades a cada element de la llista."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
-msgstr ""
+msgstr "Gestor de llistes de reproducció"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
-msgstr ""
+msgstr "Gestor de cues"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Finestres"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
-msgstr ""
+msgstr "Interfície"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
-msgstr ""
+msgstr "Preferències de la interfície..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Afegeix una adreça d'Internet..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Afegeix una pista remota a la llista de reproducció."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Afegeix fitxers..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Afegeix fitxers a la llista de reproducció."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Cerca i selecciona"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Cerca a la llista de reproducció i selecciona elements basant-se en criteris específics."
+msgstr ""
+"Cerca a la llista de reproducció i selecciona elements basant-se en criteris "
+"específics."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Inverteix la selecció"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Inverteix els elements seleccionats i no seleccionats."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Selecciona tots els elements"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Selecciona tots els elements de la llista de reproducció."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Selecciona no res"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Deselecciona tots els elements de la llista de reproducció."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Treu tots els elements"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Treu tots els elements de la llista de reproducció."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Neteja la cua"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Neteja la cua associada a aquesta llista de reproducció. "
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Treu els fitxers no disponibles"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Treu els fitxers no disponibles de la llista de reproducció."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Treu els duplicats"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Per títol"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Treu els elements duplicats de la llista de reproducció per títol."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Per nom de fitxer"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Treu els elements duplicats de la llista de reproducció per nom de fitxer."
+msgstr ""
+"Treu els elements duplicats de la llista de reproducció per nom de fitxer."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Per ubicació i nom de fitxer"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Treu els elements duplicats de la llista de reproducció per l'ubicació completa."
+msgstr ""
+"Treu els elements duplicats de la llista de reproducció per l'ubicació "
+"completa."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Treu els no seleccionats"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Treu els elements no seleccionats de la llista de reproducció."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Treu els seleccionats"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Treu els elements seleccionats de la llista de reproducció."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Barreja la llista"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Reordena la llista de forma aleatòria."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Inverteix la llista"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Inverteix l'ordre de la llista."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Ordena la llista"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Ordena la llista pel títol."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
-msgstr ""
+msgstr "Per àlbum"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
-msgstr ""
+msgstr "Ordena la llista per àlbum"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Per l'artista"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Ordena la llista per l'artista."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Ordena la llista pel nom de fitxer."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Ordena la llista per la ubicació completa."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Per la data"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Ordena la llista per la data de modificació."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Pel número de pista"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Ordena la llista pel número de pista."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Ordena els seleccionats"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Fitxer"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Serveis de connectors"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Mostra detalls de la pista"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Mostra detalls de la pista"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Quant a l'Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Reprodueix fitxer"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Carrega i reprodueix un fitxer"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Reprodueix una font remota"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Reprodueix un mitjà des de la ubicació seleccionada"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Serveis de connectors"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Preferències"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Obre la finestra de preferències"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Tanca l'Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Estableix A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Esborra A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Salta al fitxer"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Salta al temps"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Posa o treu de la cua"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Posa o lleva un element de la cua."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
-msgstr ""
+msgstr "Copiar"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
-msgstr ""
+msgstr "Retallar"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
-msgstr ""
+msgstr "Enganxar"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Carrega"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importa"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Desa"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Perfil"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Perfil automàtics"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Carrega un perfil automàtic"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Carrega el perfil per defecte a l'equalitzador"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Zero"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Posa els valors de l'equalitzador a zero"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Des d'un fitxer"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Carrega el perfil des d'un fitxer"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "D'un fitxer EQF del WinAMP"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Carrega el perfil des d'un fitxer EQF del WinAMP"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Perfils del WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importa perfils del WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Desa com a perfil automàtic"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Desa com a perfil per defecte"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "En un fitxer"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Desa el perfil en un fitxer"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "En un fitxer EQF del WinAMP"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Desa els valors en un fitxer EQF del WinAMP"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Esborra el perfil automàtic"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Cerca elements en la llista de reproducció activa"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Seleccioneu elements de la llista de reproducció omplint un o diversos camps. Aquests camps admeten la sintaxi d'expressions regulars i són insensibles a la capitalització. Si no sabeu com funcionen les expressions regulars, podeu escriure literalment el text que busqueu."
+msgstr ""
+"Seleccioneu elements de la llista de reproducció omplint un o diversos "
+"camps. Aquests camps admeten la sintaxi d'expressions regulars i són "
+"insensibles a la capitalització. Si no sabeu com funcionen les expressions "
+"regulars, podeu escriure literalment el text que busqueu."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Títol: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Àlbum:"
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Nom del fitxer: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Neteja la selecció anterior abans de cercar"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Posa o treu de la cua automàticament els elements trobats"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Crea una llista de reproducció nova amb els elements trobats"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Editor de llistes de l'Audacious"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
-msgstr ""
+msgstr "%s (%d de %d)"
 
 #: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
@@ -3381,81 +3671,100 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "No s'ha pogut crear el directori (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 msgstr ""
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr ""
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
 msgstr ""
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr ""
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr ""
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "D'acord"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
-msgstr ""
+msgstr "Canvi de cançó"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Ordre a executar quan l'Audacious comença una nova cançó."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Ordre:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Ordre a executar cap al final de la cançó."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Ordre a executar quan l'Audacious arriba al final de la llista de reproducció."
+msgstr ""
+"Ordre a executar quan l'Audacious arriba al final de la llista de "
+"reproducció."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Ordre a executar quan canvia el títol d'una cançó (en fluxos de xarxa)."
+msgstr ""
+"Ordre a executar quan canvia el títol d'una cançó (en fluxos de xarxa)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3474,33 +3783,69 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Els paràmetres passats a la shell s'han d'encapsular entre\ncometes. Altrament seria un risc per a la seguretat."
+msgstr ""
+"Els paràmetres passats a la shell s'han d'encapsular "
+"entre\n"
+"cometes. Altrament seria un risc per a la seguretat."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Ordres"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3511,63 +3856,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Canvia el volum"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Canvia la cançó"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr ""
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr ""
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Generador de tons:"
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3576,11 +3921,11 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr ""
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -3588,15 +3933,15 @@
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr ""
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3617,44 +3962,47 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr ""
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr ""
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr ""
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr ""
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "Connector AMIDI-Plug - Seleccioneu un fitxer"

audacious-plugins-3.3.4.tar.bz2/po/cs.po -> audacious-plugins-3.4.2.tar.bz2/po/cs.po Changed

@@ -1,595 +1,620 @@
 # Czech translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# <appukonrad@gmail.com>, 2012-2013.
-# Based on audacious-1.2.2.cs.po by Jan Nárovec <finn@sendmail.cz>, 2004.
-# <pavelfric@seznam.cz>, 2012.
-# Petr Pisar <petr.pisar@atlas.cz>, 2007, 2008, 2009, 2010, 2011, 2012.
-# <petr.simacek@gmail.com>, 2012.
+# jui <appukonrad@gmail.com>, 2012-2013
+# Based on audacious-1.2.2.cs.po by Jan Nárovec <finn@sendmail.cz>, 2004
+# fri <pavelfric@seznam.cz>, 2012-2013
+# fri <pavelfric@seznam.cz>, 2012
+# Petr Pisar <petr.pisar@atlas.cz>, 2007-2012
+# petr.simacek <petr.simacek@gmail.com>, 2012
+# petr.simacek <petr.simacek@gmail.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2013-01-14 13:27+0000\n"
-"Last-Translator: jui <appukonrad@gmail.com>\n"
-"Language-Team: Czech\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-09-08 07:47+0000\n"
+"Last-Translator: fri <pavelfric@seznam.cz>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/audacious/language/"
+"cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "stereo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "prostorový zvuk"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
-msgstr "AAC Dekodér"
+msgstr "Dekodér AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr ""
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib přehrávač)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "Zásuvný modul pro spuštění přehrávání v přesně určený čas.\n\nPůvodně napsal Adam Feakin a Daniel Stodden."
+msgstr ""
+"Zásuvný modul pro spuštění přehrávání v přesně určený čas.\n"
+"\n"
+"Původně napsal Adam Feakin a Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Budík"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Toto je váš budící signál."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "Budiž"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Nastavení budíku"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Čas"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "h"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "min"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Ticho po:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Budit v (standardní):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Toto je váš budící signál."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Vyberte dny, kdy má budík budit"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Standardní"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Upomínání"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Den"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Pondělí"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Středa"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Pátek"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Neděle"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Pondělí"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Nastavení budíku"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Čas"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Budit v (standardní):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Ticho po:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "h"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "min"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Vyberte dny, kdy má budík budit"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Den"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Standardní"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Dny"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Zesilování"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "sekund"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Hlasitost"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Současná"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Začít na"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Skončit na"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Současná"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Dodatečný příkaz"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "zapnout"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Seznam skladeb (volitelné)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Vybrat seznam skladeb"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Upomínání"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Upomínat"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Nastavení"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Co tyto volby znamenají?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Nápověda"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Zrušit"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Váš vzkaz pro dnešek je…"
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Děkuji"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Album"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Implicitní PCM zařízení"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Implicitní směšovací zařízení"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Nastavení výstupního modulu ALSY"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Zařízení PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Zařízení směšovače:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Prvek směšovače:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Obejít zaseknutí při vyprazdňovaní"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "ALSA výstupní modul pro Audacious\nCopyright 2009-2012 John Lindgren\n\nMé díky patří Williamu Pitcockovy, autoru výstupního ALSA Zásuvného modulu NG, jehož kód sloužil jako reference, když použití ALSA mauálu nestačilo."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"ALSA výstupní modul pro Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"Mé díky patří Williamu Pitcockovy, autoru výstupního ALSA Zásuvného modulu "
+"NG, jehož kód sloužil jako reference, když použití ALSA mauálu nestačilo."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "ALSA výstup:"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (MIDI přehrávač)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Nevybrali jste žádné porty sekvenceru určené pro přehrávání MIDI. Můžete tak učinit v nastavení modulu MIDI."
+msgstr ""
+"Nevybrali jste žádné porty sekvenceru určené pro přehrávání MIDI. Můžete tak "
+"učinit v nastavení modulu MIDI."
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI přehrávač)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "ALSA backend"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Tento backend posílá MIDI události skupině uživatelem vybraných portů ALSA sekvenceru. Rozhraní ALSA sekvenceru je velmi přizpůsobivé, může poskytovat porty hardwarovým syntetizátorům na zvukové kartě (př. emu10k1) nebo syntetizátorům softwarovým, vnějším zařízením atd.\nTento backend žádný zvuk nevytváří, MIDI události jsou zpracovány přímo zařízením/programem, který se ukrývá za ALSA portem. Na příklad MIDI události zaslané hardwarovému syntetizátoru budou hrány přímo jím.\nBackend napsal Giacomo Lozito."
+msgstr ""
+"Tento backend posílá MIDI události skupině uživatelem vybraných portů ALSA "
+"sekvenceru. Rozhraní ALSA sekvenceru je velmi přizpůsobivé, může poskytovat "
+"porty hardwarovým syntetizátorům na zvukové kartě (př. emu10k1) nebo "
+"syntetizátorům softwarovým, vnějším zařízením atd.\n"
+"Tento backend žádný zvuk nevytváří, MIDI události jsou zpracovány přímo "
+"zařízením/programem, který se ukrývá za ALSA portem. Na příklad MIDI "
+"události zaslané hardwarovému syntetizátoru budou hrány přímo jím.\n"
+"Backend napsal Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Becken FluidSynth"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Tento backend vytváří zvuky zasíláním MIDI událostí do FluidSynth, což je softwarový syntetizátor pracující v reálném čase založený na specifikaci SoundFont2 (www.fluidsynth.org).\nVzniklý zvuk může být upraven efektovými moduly přehrávače a následně je zpracován vybraným výstupním modulem.\nBackend napsal Giacomo Lozito."
+msgstr ""
+"Tento backend vytváří zvuky zasíláním MIDI událostí do FluidSynth, což je "
+"softwarový syntetizátor pracující v reálném čase založený na specifikaci "
+"SoundFont2 (www.fluidsynth.org).\n"
+"Vzniklý zvuk může být upraven efektovými moduly přehrávače a následně je "
+"zpracován vybraným výstupním modulem.\n"
+"Backend napsal Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Port"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Jméno klientu"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Jméno portu"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Výstupní port ALSY"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Zvuková karta: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Ovládání směšovače: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Nastavení směšovače"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "Backend\nALSA"
+msgstr ""
+"Backend\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug – podrobnosti o backendu"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Výběr backendu"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Nastavení přehrávání"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transponovat: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Posun bubnu: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Pokročilá nastavení"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "předpočítat délku MIDI souborů v seznamu skladeb"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "vytáhnout komentáře z MIDI souboru (pokud existují)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "vytáhnout text z MIDI souboru (pokud existuje)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug – vyberte soubor"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Nastavení AMIDI-Pluginu"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug – vyberte soundfontový soubor"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Nastavení SoundFontu"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Jméno souboru"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Velikost (v bajtech):"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "SoundFont nahrát při spuštění přehrávače"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Načíst SF při prvním přehrávání MIDI souboru"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Nastavení syntetizátoru"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "zesílení"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "použít implicitní"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "hodnota:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "polyfonie"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "dozvuk"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "ano"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "ne"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "sbor"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "vzorkovací kmitočet"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "vlastní "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Backend\nFluidSynth"
+msgstr ""
+"Backend\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " Podrobnosti o MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formát:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Délka (ms):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "č. skladby"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "proměnlivé"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (váž.):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Čas. pom.:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " Komentáře a text MIDI skladby "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* v MIDI souboru se nenachází žádné komentáře *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* v MIDI souboru se nenachází text skladby *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (neplatné UTF8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "O AMIDI-Pluginu"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -653,7 +678,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Spustí OSD, když se během přehrávaní změní název skladby, ale jméno souboru je stále stejné. To se hodí při přehrávání internetových proudů, v nichž se střídají skladby."
+msgstr ""
+"Spustí OSD, když se během přehrávaní změní název skladby, ale jméno souboru "
+"je stále stejné. To se hodí při přehrávání internetových proudů, v nichž se "
+"střídají skladby."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -785,8 +813,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Kompozitní správce nebyl nalezen.\nPokud nevíte, že byste jste již nějakého spustili, prosím, aktivujte kompozitního správce, jinak OSD nebude správně fungovat."
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Kompozitní správce nebyl nalezen.\n"
+"Pokud nevíte, že byste jste již nějakého spustili, prosím, aktivujte "
+"kompozitního správce, jinak OSD nebude správně fungovat."
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -849,47 +881,47 @@
 msgid "Misc"
 msgstr "Různé"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "ASXv1/ASXv2 seznamy skladeb"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious seszam skladeb (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Barva"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Rozsah rozostření"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Předvolby Bauer Stereophonic-na-Binaural"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Úroveň přeslechu:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Ořezová frekvence:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Předvolby:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Analyzátor spektra"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -901,231 +933,234 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Zařízení"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Rychlost čtení:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Přepsat zařízení:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metadata"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Použití CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Používat CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Použít HTTP místo CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Cesta:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Audio CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Nepodařilo se inicializovat cdio subsystému."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Neplatná URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Stopa %d nebyla nalezena."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "Stopa %d je datová stopa."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Nelze otevřít zvukový výstup"
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Zvukové CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Nelze otevřít CD zařízení %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "Nebyly nalezeny funkční CD mechaniky"
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Nepodařilo se dokončit inicializaci otevření CD mechaniky."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Nepodařilo se načíst první/poslední číslo skladby."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "nelze přečíst začátek/konec LSN pro skladbu %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Nepodařilo se vytvořit připojení k CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Nepodařil se dotaz na server CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Nepodařil se dotaz na server CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Nepodařilo se přečíst cddb info: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Mechanika je prázdná"
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Nepodporovaný druh disku."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Přehrát CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Přidat CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Položky Audio CD menu"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Komprese"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Hlasitost středu:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Rozsah dynamiky:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Dynamický rozsah kompresoru"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Dekodér hudby pro herní konzole"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Obecné"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Přehrát"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Hloubky:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "s"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Výšky:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Implicitní délka skladby:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Převzorkování"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Povolit převzorkování zvuku"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Převzorkovat na:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignorovat délku z SPC popisků"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Prodloužit dozvuk"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "Implicitní délka, vyjádřená v sekundách, se použije na skladby, které neposkytují informace o délce (např. nekonečné smyčky)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Implicitní délka, vyjádřená v sekundách, se použije na skladby, které "
+"neposkytují informace o délce (např. nekonečné smyčky)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1135,86 +1170,99 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "Prolínání se nezdařilo, protože písně měly různý počet kanálů. Můžete použít Míchání kanálů a převést písně na stejný počet kanálů."
+msgstr ""
+"Prolínání se nezdařilo, protože písně měly různý počet kanálů. Můžete "
+"použít Míchání kanálů a převést písně na stejný počet kanálů."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Prolínání se nezdařilo, protože písničky měly různé vzorkovací frekvence. Můžete použít Převádění vzorkovací frekvence pro převod skladeb na stejnou vzorkovací frekvenci."
+msgstr ""
+"Prolínání se nezdařilo, protože písničky měly různé vzorkovací frekvence. "
+"Můžete použít Převádění vzorkovací frekvence pro převod skladeb na stejnou "
+"vzorkovací frekvenci."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Prolínání zásuvný modul pro Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Prolínání zásuvný modul pro Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Prolínání"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Přesah:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Prolínání"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intenzita:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Ozvěna"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Zpoždění:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Zpětná vazba:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Hlasitost:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Ozvěna zásuvný modul \nOd Johna Levina, 1999\n\nProstorová ozvěna od Carla van Schaika, 1999"
+msgstr ""
+"Ozvěna zásuvný modul \n"
+"Od Johna Levina, 1999\n"
+"\n"
+"Prostorová ozvěna od Carla van Schaika, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Ozvěna"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1222,15 +1270,21 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Multiformátový audio dekodovací zásuný modul pro použití v Audacious\nFFmpeg multimedia framework (http://www.ffmpeg.org/)\n\nAudacious zásuvný modul od:\nWilliama Pitcocka <nenolod@nenolod.net>\nMatti Hämäläinena <ccr@tnsp.org>"
+msgstr ""
+"Multiformátový audio dekodovací zásuný modul pro použití v Audacious\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious zásuvný modul od:\n"
+"Williama Pitcocka <nenolod@nenolod.net>\n"
+"Matti Hämäläinena <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg Plugin"
 
 #: src/filewriter/filewriter.c:409
 msgid "FileWriter Configuration"
-msgstr ""
+msgstr "Nastavení pro FileWriter"
 
 #: src/filewriter/filewriter.c:421
 msgid "Output file format:"
@@ -1292,11 +1346,25 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Tento program je svobodným softwarem; můžete jej šířit a/nebo modifikovat\na to podle podmínek GNU General Public Licence, vydávané\nFree Software Foundation; buď verze 2 této licence, nebo\n(podle vašeho uvážení) kterékoli pozdější verze.\n\nTento program je rozšiřován v naději, že bude užitečný,\nale BEZ JAKÉKOLIV ZÁRUKY; dokonce i bez předpokládané záruky\nPRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL. viz\nGNU General Public License pro více informací.\n\nMěli byste obdržet kopii GNU General Public License\nspolu s tímto programem; pokud ne, napište na Free Software\nFoundation, Inc, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"Tento program je svobodným softwarem; můžete jej šířit a/nebo modifikovat\n"
+"a to podle podmínek GNU General Public Licence, vydávané\n"
+"Free Software Foundation; buď verze 2 této licence, nebo\n"
+"(podle vašeho uvážení) kterékoli pozdější verze.\n"
+"\n"
+"Tento program je rozšiřován v naději, že bude užitečný,\n"
+"ale BEZ JAKÉKOLIV ZÁRUKY; dokonce i bez předpokládané záruky\n"
+"PRODEJNOSTI anebo VHODNOSTI PRO URČITÝ ÚČEL. viz\n"
+"GNU General Public License pro více informací.\n"
+"\n"
+"Měli byste obdržet kopii GNU General Public License\n"
+"spolu s tímto programem; pokud ne, napište na Free Software\n"
+"Foundation, Inc, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
-msgstr ""
+msgstr "Přídavný modul FileWriter"
 
 #: src/filewriter/mp3.c:37 src/filewriter/mp3.c:748
 msgid "Auto"
@@ -1306,11 +1374,13 @@
 msgid "Joint Stereo"
 msgstr "Joint-stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1358,7 +1428,7 @@
 msgid "Error protection"
 msgstr "Ochrana před chybami"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Kvalita"
 
@@ -1438,429 +1508,492 @@
 msgid "Tags"
 msgstr "Popisky"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Nastavení vorbis kodéru"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Úroveň kvality (0–10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
-msgstr ""
+msgstr "Bezztrátová kvalita"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Původní kód od\nRalfa Ertzingera <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Původní kód od\n"
+"Ralfa Ertzingera <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "FLAC Dekodér"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "GIO zásuvný modul pro Audacious\nCopyright 2009-2012 John Lindgren"
+msgstr ""
+"GIO zásuvný modul pro Audacious\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "GIO Plugin"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Zásuvný modul pro klávesové zkratky v Gnome\nUmožňuje ovládat program pomocí klávesových Gnome\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"Zásuvný modul pro klávesové zkratky v Gnome\n"
+"Umožňuje ovládat program pomocí klávesových Gnome\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Klávesové zkratky Gnome"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Číslo položky"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Název"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Umělec"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Rok"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Stopa"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Žánr"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Umístění ve frontě"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Délka"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Cesta k souboru"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Vlastní název"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Datový tok"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Vybrat sloupce"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Dostupné:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Vybráno:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Umístit vlevo"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Umístit vpravo"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Umístit nahoru"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Umístit dolů"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Neumisťovat"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Zakázat"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Otevřít soubory…"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Otevřít _URL…"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "Přid_at soubory…"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Přidat U_RL…"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Prohledat knihovnu"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "_O programu… "
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "Nasta_vení…"
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Konec"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Hrát"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "P_ozastavit"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "Za_stavit"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "Před_chozí"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Další"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "_Opakovat"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "Ná_hodné přehrávání"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "Žádné p_okračování dle seznamu skladeb"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Z_astavuje po skladbě."
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Zastavit _po této skladbě"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "_Informace o skladbě…"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Přejí_t na čas…"
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "Pře_jít na skladbu…"
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Podle čísla _stopy"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Podle ná_zvu"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Podle čísla _stopy"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Podle _umělce"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Podle a_lba"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Podle data vy_dání"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Podle _cesty k souboru"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "_Vlastní název"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "_Obrátit pořadí"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "Ná_hodné pořadí"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Přehrát tento seznam skladeb"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Obnovit"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Odstranit nedost_upné soubory"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Seřadit"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Seřadit vybrané"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Odstranit nedost_upné soubory"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Nový"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Přej_menovat"
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importovat…"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Exportovat…"
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Organizace seznamů skladeb"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Správce _fronty…"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "Ze_sílit"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "Z_tišit"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Ekvalizér"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_fekty"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Rozhraní"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Znázornění"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Zobrazit h_lavní nabídku"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Zobrazit oblast i_nformací"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Zobrazit znázornění oblasti informací"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Zobrazit _stavový panel"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Ukázat _zbývající čas"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Zobrazit tlačítka _zavření"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Zobrazit zá_hlaví sloupců"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Vybrat sloup_ce…"
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Odro_lovat na změněnou skladbu"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Přehrát"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "Seznam sk_ladeb"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Služby"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Výstup"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Zobrazení"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "Ode_brat/přidat z/do fronty"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "V_yjmout"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "V_ložit"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Vybr_at vše"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Přejmenovat ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Rozhraní GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s – Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Plnění vyrovnávácí paměti…"
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Chyba"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1868,113 +2001,124 @@
 msgstr[1] "%d kanály"
 msgstr[2] "%d kanálů"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Předchozí stopa"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr "Předchozí skladba"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Hrát"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pozastavit/Pokračovat"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Zastavit"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "Vpřed o 5 sekund"
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Další stopa"
+msgid "Rewind 5 seconds"
+msgstr "Zpět o 5 sekund"
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "O 5 sekund vpřed"
+msgid "Mute"
+msgstr "Vypnout zvuk"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "O 5 sekund zpět"
+msgid "Volume up"
+msgstr "Zvýšit hlasitost"
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Vypnout zvuk"
+msgid "Volume down"
+msgstr "Snížit hlasitost"
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Zesílit"
+msgid "Jump to file"
+msgstr "Přejít na soubor"
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Ztišit"
+msgid "Toggle player window(s)"
+msgstr "Přepnout okno přehrávače"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Přejít na soubor"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Zobrazit OSD (nápis na obrazovce)"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Přepnout okno(a) přehrávače"
+msgid "Toggle repeat"
+msgstr "Přepnout opakování"
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Zobrazit OSD (nápis na obrazovce)"
+msgid "Toggle shuffle"
+msgstr "Přepnout zamíchání"
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Přepnout opakování"
+msgid "Toggle stop after current"
+msgstr "Přepnout zastavení po současné skladbě"
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Přepnout náhodné přehrávání"
+msgid "Raise player window(s)"
+msgstr "Vyvolat okno přehrávače"
 
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr ""
-
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(žádné)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Přiřazení prvního tlačítka myši mez modifikátoru není doporučeno.\n\nChcete pokračovat?"
+msgstr ""
+"Přiřazení prvního tlačítka myši mez modifikátoru není doporučeno.\n"
+"\n"
+"Chcete pokračovat?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Přiřazuji tlačítka myši"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Hlavní nastavení modulu pro horké klávesy"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Uvnitř textového pole stiskněte kombinaci kláves.\nNavázat lze také tlačítka myši."
+msgstr ""
+"Uvnitř textového pole stiskněte kombinaci kláves.\n"
+"Navázat lze také tlačítka myši."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Horké klávesy:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Akce"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Navázání kláves:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1989,102 +2133,117 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Globální klávesové zkratky"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Na základě xmms-jack, od Chrise Morgana:\nhttp://xmms-jack.sourceforge.net/\n\nPortováno pro Audacious od Giacomo Lozito"
+msgstr ""
+"Na základě xmms-jack, od Chrise Morgana:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Portováno pro Audacious od Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "JACK výstup"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Nastavení %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Nastavení hostitele LADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Cesta k modulům:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Cesty se od sebe oddělují dvojtečkou.\nTyto cesty se prohledávají spolu s LADSPA_PATH.\nPo té, co přidáte novou cestu, je třeba stisknout Enter, aby se vyhledaly nové moduly."
+msgstr ""
+"Cesty se od sebe oddělují dvojtečkou.\n"
+"Tyto cesty se prohledávají spolu s LADSPA_PATH.\n"
+"Po té, co přidáte novou cestu, je třeba stisknout Enter, aby se vyhledaly "
+"nové moduly."
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Dostupné moduly:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Povolit"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Povolené moduly:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Nastavení"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "LADSPA Host pro Audacious\nCopyright 2011 John Lindgren"
+msgstr ""
+"LADSPA Host pro Audacious\n"
+"Copyright 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "LADSPA Host"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: nelze inicializovat podporu LIRC\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: nelze číst z konfiguračního souboru LIRC\n%s: prosím, přečtěte si dokumentaci k LIRC,\n%s: jak správně vytvořit konfigurační soubor\n"
+msgstr ""
+"%s: nelze číst z konfiguračního souboru LIRC\n"
+"%s: prosím, přečtěte si dokumentaci k LIRC,\n"
+"%s: jak správně vytvořit konfigurační soubor\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: pokouším se znovu připojit…\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: neznámý příkaz „%s“\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: odpojeno od LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: pokus o připojení budu opakovat každých %d sekund…\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2098,155 +2257,309 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "Jednoduchý zásuvný modul na ovládání Audacious použitím LIRC démona vzdálené kontroly.\n\nUpraveno pro Audacious od:\nTonyho Vroona <chainsaw@gentoo.org>\nJoonase Harjumäki <jharjuma@gmail.com>\n\nNa základě XMMS pluginu LIRC od:\nCarla van Schaika <carl@leg.uct.ac.za>\nChristophera Bartelmuse <xmms@bartelmus.de>\nAndrewa O. Shadoura <bugzilla@tut.by>\n\nPro více informací o LIRC, navštivte http://lirc.org."
+msgstr ""
+"Jednoduchý zásuvný modul na ovládání Audacious použitím LIRC démona vzdálené "
+"kontroly.\n"
+"\n"
+"Upraveno pro Audacious od:\n"
+"Tonyho Vroona <chainsaw@gentoo.org>\n"
+"Joonase Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Na základě XMMS pluginu LIRC od:\n"
+"Carla van Schaika <carl@leg.uct.ac.za>\n"
+"Christophera Bartelmuse <xmms@bartelmus.de>\n"
+"Andrewa O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Pro více informací o LIRC, navštivte http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Připojení"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Znovu se připojit k serveru LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Vyčkat před opětovným připojením:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "LIRC Plugin"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Žádný text k dispozici"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Nelze načíst %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Nelze analyzovat %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Hledám texty ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Chybí metadata skladby"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Připojování k lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki Plugin"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "M3U Playlisty"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generátor taktu: %d dob/min"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generátor taktu: %d dob/min %d⁄%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "Generátor taktů od Martina Strausse <mys@faveve.uni-stuttgart.de>\n\nChcete-li jej použít, přidejte adrese URL: tact://beats*num/den\nnapř. tact://77 pro přehrání 77 beatů za minutu\nnebo tact://60*3/4 pro přehrání 60 bpm v 3/4 taktu"
+msgstr ""
+"Generátor taktů od Martina Strausse <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Chcete-li jej použít, přidejte adrese URL: tact://beats*num/den\n"
+"např. tact://77 pro přehrání 77 beatů za minutu\n"
+"nebo tact://60*3/4 pro přehrání 60 bpm v 3/4 taktu"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Genetátor taktů"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Zásuvný modul kanáloveho mixeru pro Audacious\nCopyright 2011-2012 John Lindgren a Michał Lipski"
+msgstr ""
+"Zásuvný modul kanáloveho mixeru pro Audacious\n"
+"Copyright 2011-2012 John Lindgren a Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Míchání kanálů"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Výstupní kanály:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Míchání kanálů"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "MMS Plugin"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Rozlišení"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8 bitů"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16 bitů"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Kanály"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Převzorkování"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Nejbližší (nejrychlejší)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Lineární (rychlé)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Křivka (dobré)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Vícefázové (nejlepší)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Vzorkovací kmitočet"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Úroveň:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Bod zkrácení:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Dozvuk"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Zdůraznění basů"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Prostorový zvuk"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Předzesílení"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Různé"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Oblast vzorku"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Zmenšení šumu"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Přehrát Amiga MOD"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Opakovat"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Počet opakování:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Pro opakování navždy, nastavte počet opakování na -1."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Module Player)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Prostorový zvuk"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "MPG123 Plugin"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 Server"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious nyní nehraje."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Založeno na libnotify-aosd od Maximiliana Bognera:\nhttp://www.mbogner.de/projects/libnotify-aosd/\n\nCopyright (C) 2010 Maximilian Bogner\nCopyright (C) 2011 John Lindgren\n\nTento zásuvný modul je svobodným softwarem: můžete jej šířit a/nebo upravovat podle podmínek GNU General Public Licence, vydávané Free Software Foundation, buď ve verzi 3 licence, nebo (podle vašeho uvážení) kterékoli pozdější verze.\n\nTento plugin je distribuován v naději, že bude užitečný, avšak BEZ JAKÉKOLI ZÁRUKY; dokonce i bez předpokládané záruky PRODEJNOSTI, nebo VHODNOSTI PRO URČITÝ ÚČEL. Viz pro více informací - GNU General Public Licence.\n\nMěli byste obdržet kopii GNU General Public Licence spolu s tímto programem. Pokud tomu tak není, viz <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Ukázat ovládání přehrávání"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Vždy ukázat oznámení"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Oznámení na plochu"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Ukázat"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pozastavit"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Další"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Implicitní zařízení"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Zvukové zařízení:"
 
@@ -2271,22 +2584,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "OSS4 Výstupní zásuvný modul pro Audacious 2010-2012\nCopyright 2010-2012 Michał Lipski\n\nRád bych poděkoval lidem z #audacious, zejména Tonymu Vroonnovy a Johnu Lindgrennovy a samozřejmě také autorům předešlého OSS zásuvného modulu."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"OSS4 Výstupní zásuvný modul pro Audacious 2010-2012\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"Rád bych poděkoval lidem z #audacious, zejména Tonymu Vroonnovy a Johnu "
+"Lindgrennovy a samozřejmě také autorům předešlého OSS zásuvného modulu."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "OSS4 výstup"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "PLS seznamy skladeb"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 Dekodér"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2306,153 +2625,193 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "PulseAudio Výstup"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Přeskočit/opakovat vzorky"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Lineární interpolace"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
-msgstr ""
+msgstr "Rychlá sinc interpolace"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
-msgstr ""
+msgstr "Střední sinc interpolace"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
-msgstr ""
+msgstr "Nejlepší sinc interpolace"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Převod"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Hodnocení:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr ""
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr ""
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
+msgstr "Převodník vzorkovacího kmitočtu"
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
 msgstr ""
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Změnit heslo"
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Přístup odepřen"
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Služby"
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Prověřuje se..."
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Přístupové jméno:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Heslo:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "URL Scrobbleru:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "SDL Výstup"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Knihovna"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Neznámý interpret"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Neznámé Album"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
 msgstr "%s⏎ na %s od %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
@@ -2460,7 +2819,7 @@
 msgstr[1] "%d alba"
 msgstr[2] "%d alb"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2468,11 +2827,13 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s⏎\n %s, %d skladba"
+msgstr[0] ""
+"%s⏎\n"
+" %s, %d skladba"
 msgstr[1] "%s⏎ %s, %d skladby"
 msgstr[2] "%s⏎ %s, %d skladeb"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2480,77 +2841,81 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] " %s⏎\n %d skladba od %s"
+msgstr[0] ""
+" %s⏎\n"
+" %d skladba od %s"
 msgstr[1] " %s⏎ %d skladby od %s"
 msgstr[2] " %s⏎ %d skladeb od %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Vytvořit seznam skladeb"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "Přid_at do seznamu skladeb"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Prohledat knihovnu"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Hudební knihovnu se do Audacious naimportuje tak, že vyberete složku a pak kliknete na ikonu „obnovit“."
+msgstr ""
+"Hudební knihovnu se do Audacious naimportuje tak, že vyberete složku a pak "
+"kliknete na ikonu „obnovit“."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Prosím, počkejte…"
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Vybrat složku"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Vyhledávací nástroj"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Rozhraní Winamp Classic "
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Přehrávač:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Font v hlavním okně přehrávače:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Seznamu skladeb:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Vyberte font pro seznam skladeb:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Fonty"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Použít bitmapové fonty (podporuje pouze ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Převíjet název skladby oběma směry"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Vzhled"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Nastavení rozhraní"
 
@@ -2606,7 +2971,7 @@
 msgid "Presets"
 msgstr "Předvolby"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Načíst předvolbu"
 
@@ -2619,7 +2984,7 @@
 msgid "Load equalizer preset"
 msgstr "Načíst nastavení ekvalizéru"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Uložit předvolbu"
 
@@ -2631,7 +2996,7 @@
 msgid "Save equalizer preset"
 msgstr "Načíst nastavení ekvalizéru"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Smazat předvolbu"
 
@@ -2639,739 +3004,753 @@
 msgid "Delete auto-preset"
 msgstr "Smazat souborovou předvolbu"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kb/s"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Přejít na %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hlasitost: %d %%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Vyvážení: %d %% vlevo"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Vyvážení: střed"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Vyvážení: %d %% vpravo"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Nabídka nastavení"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Vypnout „Vždy na vrchu“"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Zapnout „Vždy na vrchu“"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Informace o souboru"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Nabídka znázornění"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Režim jedné skladby."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Režim seznamu skladeb."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Zastavuje po skladbě."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Po skladbě nezastavuje."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Automatický posun názvu skladby"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Zastavit po současné skladbě"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Vrcholky"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Opakovat"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Náhodné přehrávání"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Žádné pokračování dle seznamu skladeb"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Zobrazit přehrávač"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Zobrazit editor seznamu skladeb"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Ukázat ekvalizér"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Vždy na vrchu"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Zobrazovat na všech plochách"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Sbalit přehrávač"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Sbalit editor seznamu skladeb"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Sbalit ekvalizér"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analyzátor"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Vlnovka"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Otisk"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Žádný"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normální"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Oheň"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Svislé čáry"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Čáry"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Sloupce"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Tečková vlnovka"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Čárová vlnovka"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Plná vlnovka"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Led"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Plynulý"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Nejpomalejší"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Pomalé"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Střední"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Rychlé"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Nejrychlejší"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Dosažený čas"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Zbývající čas"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pozastavit"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Předchozí"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Další"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Znázornění"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Typ znázornění"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Režim analyzátoru"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Typ vlnovky"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Typ otisku"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Typ WindowShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Klesání sloupců"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Klesání vrcholků"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Seznam skladeb"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Přehrát seznam skladeb"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Nový seznam skladeb"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Vybrat následující seznam skladeb"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Vybrat předchozí seznam skladeb"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Smazat seznam skladeb"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Importovat seznam skladeb"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Načte soubor se seznamem skladeb do vybraného seznamu."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Exportovat seznam skladeb"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Uloží vybraný seznam skladeb."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Obnovit seznam"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Obnovuje metadata náležící skladbě ze seznamu."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Správce seznamů skladeb"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Správce fronty"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Zobrazení"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Nastavení rozhraní…"
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Přidat internetovou adresu…"
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Do seznamu přidá vzdálenou stopu."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Přidat soubory…"
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Přidá soubory do seznamu skladeb."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Hledání a výběr"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Prohledá seznam skladeb a vybere skladby ze seznamu podle zadaných omezení."
+msgstr ""
+"Prohledá seznam skladeb a vybere skladby ze seznamu podle zadaných omezení."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Invertovat výběr"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Zamění vybrané a nevybrané položky."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Vybere všechny skladby v seznamu."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Nevybrat žádné"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Žádná skladba v seznamu nebude vybraná."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Odebrat všechny"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Ze seznamu odstraní všechny skladby."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Vyprázdnit frontu"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Vyprázdní frontu spojenou s tímto seznamem skladeb."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Odstranit nedostupné soubory"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Ze seznamu skladeb odstraní nedostupné soubory."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Odebrat duplikáty"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Podle názvu"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Ze seznamu odstraní skladby na základě jejich názvu."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Podle jména souboru"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Ze seznamu odstraní skladby na základě jména souboru."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Podle cesty a jména souboru"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Ze seznamu odstraní skladby na základě celé cesty."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Odebrat neoznačené"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Odebrat neoznačené skladby se seznamu."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Odebrat označené"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Odebrat označené skladby ze seznamu."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Zamíchat pořadí"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Sklady v seznamu seřadí náhodně."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Otočit seznam"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Obrátí pořadí skladeb v seznamu."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Seřadit seznam"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Seřadí seznam podle názvu."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Podle alba"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Seřadí seznam podle alba."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Podle umělce"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Skladby v seznam seřadí podle jména umělce."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Skladby v seznamu seřadí podle jména souboru"
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Skladby v seznamu seřadí podle celé cesty."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Podle data"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Skladby v seznamu seřadí podle času poslední změny v obsahu souboru."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Podle čísla stopy"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Skladby v seznamu seřadí podle čísla stopy."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Seřadit vybrané"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Soubor"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Služby modulů"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Zobrazit informace o skladbě"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Zobrazit informace o skladbě"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "O Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Přehrát soubor"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Načíst a přehrát soubor"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Hrát z adresy"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Hrát média z vybraného místa"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Služby modulů"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Otevřít okno s nastavením"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "O Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Nastavit A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Vyprázdnit A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Přejít na soubor"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Přejít na čas"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Přepnout frontu"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Povolí/zakáže položku ve frontě seznamu skladeb."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Oříznout"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Vložit"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Načíst"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importovat"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Uložit"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Předvolby"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Souborová předvolba"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Načíst souborovou předvolbu"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Načíst standardní předvolbu do ekvalizéru"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Vynulovat"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Vynulovat předvolby ekvalizéru"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Ze souboru"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Načíst předvolbu ze souboru"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Ze souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Načíst předvolbu ze souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Předvolby WinAMPu"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importovat předvolby WinAMPu"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Uložit souborovou předvolbu"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Uložit standardní předvolbu"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Do souboru"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Uložit předvolbu do souboru"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Do souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Uložit předvolbu do souboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Smazat souborovou předvolbu"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Vyhledat skladby v současném seznamu skladeb"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Položky seznamu skladeb vyberete vyplněním jednoho, nebo více polí. Pole používají regulární výrazy a neberou ohled na velikost písmen. Pokud regulárním výrazům nerozumíte, jednoduše vložte části textu, které chcete vyhledat."
+msgstr ""
+"Položky seznamu skladeb vyberete vyplněním jednoho, nebo více polí. Pole "
+"používají regulární výrazy a neberou ohled na velikost písmen. Pokud "
+"regulárním výrazům nerozumíte, jednoduše vložte části textu, které chcete "
+"vyhledat."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Název: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Umělec: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Jméno souboru: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Před hledáním vymazat předchozí výběr"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Shodující se položky automaticky zařadit/vyřadit z fronty"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Ze shodujících se položek vytvořit nový seznam skladeb"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Zobrazit editor seznamu skladeb"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
@@ -3389,81 +3768,105 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Adresář („%s“) nebylo možné vytvořit: %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "O výstupním pluginu Sndio"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Sndio výstupní plugin\n\nnapsal Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Sndio výstupní plugin\n"
+"\n"
+"napsal Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Nepodporovaný formát"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Formát není podporován tímto zvukovým zařízením. ⏎ ⏎ Zkuste to prosím znovu s běžícím sndiod(1) serverem."
+msgstr ""
+"Formát není podporován tímto zvukovým zařízením. ⏎ ⏎ Zkuste to prosím znovu "
+"s běžícím sndiod(1) serverem."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "sndio zařízení"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(prázdné znamená výchozí)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Budiž"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Zrušit"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Změna skladby"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Příkaz, který se provede, když Audacious začne novou skladbu."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Příkaz:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Příkaz, který se provede na konci skladby."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Příkaz, který se provede, když Audacious dosáhne konce seznamu skladeb."
+msgstr ""
+"Příkaz, který se provede, když Audacious dosáhne konce seznamu skladeb."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Příkaz, který se provede při změně názvu skladbu (tj. názvy v síťových proudech)."
+msgstr ""
+"Příkaz, který se provede při změně názvu skladbu (tj. názvy v síťových "
+"proudech)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3482,33 +3885,68 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Parametry předávané shellu by měly být uzavřeny do uvozovek. Nerespektování této rady představuje bezpečnostní riziko."
+msgstr ""
+"Parametry předávané shellu by měly být uzavřeny do "
+"uvozovek. Nerespektování této rady představuje bezpečnostní riziko."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Příkazy"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Rychle"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Nízká"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Vysoká"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Velmi vysoká"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Kvalita:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Rychlost a výška"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Rachlost:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Výška:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Rychlost a výška:"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3519,63 +3957,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Změnit hlasitost"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Změnit hranou skladbu"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Ostatní nastavení"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Zakázat vyskakovací okno"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Přecházet v seznamu skladeb, když se roluje nahoru"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Stavová ikona"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Generátor tónů:"
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3584,11 +4022,11 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Generátor tónu"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -3596,15 +4034,15 @@
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr ""
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Odstranění hlasu"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3625,44 +4063,50 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis Dekodér"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "VTX Dekodér"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n\nNěkterý kód pluginů vytvořil Miles Egan."
+msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Některý kód pluginů vytvořil Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "WavPack Dekodér"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "2SF Dekodér"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Shareable Playlists (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug – vyberte soubor"

audacious-plugins-3.4.2.tar.bz2/po/da.po Added

@@ -0,0 +1,4070 @@
+# Danish translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Joe Hansen <joedalton2@yahoo.dk>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-07-28 17:44+0000\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish (http://www.transifex.com/projects/p/audacious/"
+"language/da/)\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
+msgid "mono"
+msgstr "mono"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
+msgid "stereo"
+msgstr "stereo"
+
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
+msgid "surround"
+msgstr "surround"
+
+#: src/aac/libmp4.c:930
+msgid "AAC Decoder"
+msgstr "ACC-afkoder"
+
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
+msgid "sequenced"
+msgstr ""
+
+#: src/adplug/plugin.c:14
+msgid "AdPlug (AdLib Player)"
+msgstr "AdPlug (AdLib-afspiller)"
+
+#: src/alarm/alarm.c:809
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr ""
+"Et udvidelsesmodul som kan bruges til at påbegynde afspilning på et bestemt "
+"tidspunkt.\n"
+"\n"
+"Oprindelig skrevet af Adam Feakin og Daniel Stodden."
+
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
+msgid "Alarm"
+msgstr "Alarm"
+
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Så gik alarmen."
+
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
+
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Påmindelse"
+
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Mondag"
+
+#: src/alarm/interface.c:140
+msgid "Tuesday"
+msgstr "Tirsdag"
+
+#: src/alarm/interface.c:140
+msgid "Wednesday"
+msgstr "Onsdag"
+
+#: src/alarm/interface.c:141
+msgid "Thursday"
+msgstr "Torsdag"
+
+#: src/alarm/interface.c:141
+msgid "Friday"
+msgstr "Fredag"
+
+#: src/alarm/interface.c:141
+msgid "Saturday"
+msgstr "Lørdag"
+
+#: src/alarm/interface.c:141
+msgid "Sunday"
+msgstr "Søndag"
+
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Alarmindstillinger"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Tid"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Alarm (standard):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "t"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Stille efter:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "timer"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minutter"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Vælg dagene hvor alarmen skal udløses"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Dag"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Standard"
+
+#: src/alarm/interface.c:310
+msgid "Days"
+msgstr "Dage"
+
+#: src/alarm/interface.c:319
+msgid "Fading"
+msgstr "Overgang"
+
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
+msgid "seconds"
+msgstr "sekunder"
+
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
+msgid "Volume"
+msgstr "Lydstyrke"
+
+#: src/alarm/interface.c:339
+msgid "Start at"
+msgstr "Start"
+
+#: src/alarm/interface.c:357
+msgid "Final"
+msgstr "Endelig"
+
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Nuværende"
+
+#: src/alarm/interface.c:387
+msgid "Additional Command"
+msgstr "Yderligere kommando"
+
+#: src/alarm/interface.c:393
+msgid "enable"
+msgstr "aktiver"
+
+#: src/alarm/interface.c:400
+msgid "Playlist (optional)"
+msgstr "Afspilningsliste (valgfri)"
+
+#: src/alarm/interface.c:407
+msgid "Select a playlist"
+msgstr "Vælg en afspilningsliste"
+
+#: src/alarm/interface.c:419
+msgid "Use reminder"
+msgstr "Brug påmindelse"
+
+#: src/alarm/interface.c:428
+msgid "Options"
+msgstr "Indstillinger"
+
+#: src/alarm/interface.c:433
+msgid "What do these options mean?"
+msgstr "Hvad betyder disse indstillinger?"
+
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
+msgid "Help"
+msgstr "Hjælp"
+
+#: src/albumart/albumart.c:143
+msgid "Album Art"
+msgstr "Omslag"
+
+#: src/alsa/config.c:212
+msgid "Default PCM device"
+msgstr "Standard-PCM-enhed"
+
+#: src/alsa/config.c:241
+msgid "Default mixer device"
+msgstr "Standardenhed for mikser"
+
+#: src/alsa/config.c:428
+msgid "ALSA Output Plugin Preferences"
+msgstr "Præferencer for ALSA Output Plugin"
+
+#: src/alsa/config.c:434
+msgid "PCM device:"
+msgstr "PCM-enhed:"
+
+#: src/alsa/config.c:436
+msgid "Mixer device:"
+msgstr "Mikserenhed:"
+
+#: src/alsa/config.c:438
+msgid "Mixer element:"
+msgstr "Mikserelement:"
+
+#: src/alsa/config.c:441
+msgid "Work around drain hangup"
+msgstr "Arbejd uden om tømningsafbrydelse"
+
+#: src/alsa/plugin.c:25
+msgid ""
+"ALSA Output Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+
+#: src/alsa/plugin.c:32
+msgid "ALSA Output"
+msgstr "ALSA-lydkanal"
+
+#: src/amidi-plug/amidi-plug.c:248
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr ""
+"Du har ikke valgt sequncerporte for MIDI-afspilning. Du kan gøre dette under "
+"præferencerne for MIDI-udvidelsesmodulet."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI-afspiller)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
+msgid "ALSA Backend "
+msgstr "ALSA-motor"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"Denne motor sender MiDI-hændelser til en gruppe af brugervalgte ALSA-"
+"sequencerporte. ALSA-sequencerbrugerfladen er meget alsidig, den kan tilbyde "
+"porte for lydkorts udstyrssynthesizere (dvs. emu10k1) men også for "
+"programsynthesizere, eksterne enheder etc.\n"
+"Denne motor tilbyder ikke lyd, MIDI-hændelser håndteres direkte fra enheder/"
+"programmer bag ALSA-portene; som eksempel vil MIDI-hændelser sendt til "
+"udstyrssynthesizeren blive direkte afspillet.\n"
+"Motor skrevet af Giacomo Lozito."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
+msgid "FluidSynth Backend "
+msgstr "FluidSynth-motor"
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"Denne motor laver lyd ved at sende MIDI-hændelser til FluidSynth, en "
+"realtids programsynthesizer baseret på SoundFont2-specifikationen (www."
+"fluidsynth.org).\n"
+"Fremstillet lyd kan manipuleres via effektudvidelsesmoduler for afspilleren "
+"og behandles med det valgte udvidelsesmodul for lydkanalen.\n"
+"Motor skrevet af Giacomo Lozito."
+
+#: src/amidi-plug/i_configure-alsa.c:353
+msgid "Port"
+msgstr "Port"
+
+#: src/amidi-plug/i_configure-alsa.c:355
+msgid "Client name"
+msgstr "Klientnavn"
+
+#: src/amidi-plug/i_configure-alsa.c:357
+msgid "Port name"
+msgstr "Portnavn"
+
+#: src/amidi-plug/i_configure-alsa.c:371
+msgid "ALSA output ports"
+msgstr "ALSA-porte for lydudgang"
+
+#: src/amidi-plug/i_configure-alsa.c:432
+msgid "Soundcard: "
+msgstr "Lydkort:"
+
+#: src/amidi-plug/i_configure-alsa.c:434
+msgid "Mixer control: "
+msgstr "Mikserstyring:"
+
+#: src/amidi-plug/i_configure-alsa.c:444
+msgid "Mixer settings"
+msgstr "Mikserindstillinger"
+
+#: src/amidi-plug/i_configure-alsa.c:472
+msgid ""
+"ALSA\n"
+"backend"
+msgstr ""
+"ALSA-\n"
+"motor"
+
+#: src/amidi-plug/i_configure-ap.c:63
+msgid "AMIDI-Plug - backend information"
+msgstr "AMIDI-Plug - motorinformation"
+
+#: src/amidi-plug/i_configure-ap.c:221
+msgid "Backend selection"
+msgstr "Motorvalg"
+
+#: src/amidi-plug/i_configure-ap.c:261
+msgid "Playback settings"
+msgstr "Indstillinger for afspilning"
+
+#: src/amidi-plug/i_configure-ap.c:266
+msgid "Transpose: "
+msgstr "Transponer:"
+
+#: src/amidi-plug/i_configure-ap.c:275
+msgid "Drum shift: "
+msgstr "Trommeskift:"
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "Advanced settings"
+msgstr "Avancerede indstillinger"
+
+#: src/amidi-plug/i_configure-ap.c:297
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "forhåndsberegn længde for MIDI-filer i afspilningslisten"
+
+#: src/amidi-plug/i_configure-ap.c:304
+msgid "extract comments from MIDI file (if available)"
+msgstr "udtræk kommentarer fra MIDI-fil (hvis tilgængelig)"
+
+#: src/amidi-plug/i_configure-ap.c:311
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "udtræk sangtekster fra MIDI-fil (hvis tilgængelige)"
+
+#: src/amidi-plug/i_configure-ap.c:344
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr ""
+"AMIDI-\n"
+"Plug"
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug Settings"
+msgstr "AMIDI-Plug-indstillinger"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:63
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Plug - vælg SoundFont-fil"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:321
+msgid "SoundFont settings"
+msgstr "SoundFont-indstillinger"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:359
+msgid "Filename"
+msgstr "Filnavn"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:363
+msgid "Size (bytes)"
+msgstr "Størrelse (byte)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:412
+msgid "Load SF on player start"
+msgstr "Indlæs SF ved opstart"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:416
+msgid "Load SF on first MIDI file play"
+msgstr "Indlæs SF ved første MIDI-filafspilning"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:431
+msgid "Synthesizer settings"
+msgstr "Synthesizerindstillinger"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:440
+msgid "gain"
+msgstr "forstærkning"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
+msgid "use default"
+msgstr "brug standard"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
+msgid "value:"
+msgstr "værdi:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:470
+msgid "polyphony"
+msgstr "Polyfoni"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:500
+msgid "reverb"
+msgstr "efterklang"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
+msgid "yes"
+msgstr "ja"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
+msgid "no"
+msgstr "nej"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:534
+msgid "chorus"
+msgstr "kor"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "sample rate"
+msgstr "samplingsfrekvens"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:574
+msgid "22050 Hz "
+msgstr "22050 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:577
+msgid "44100 Hz "
+msgstr "44100 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:580
+msgid "96000 Hz "
+msgstr "96000 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:583
+msgid "custom "
+msgstr "tilpasset"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:592
+msgid "Hz "
+msgstr "Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:662
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr ""
+"FluidSynth-\n"
+"motor"
+
+#: src/amidi-plug/i_fileinfo.c:175
+msgid "Name:"
+msgstr "Navn:"
+
+#: src/amidi-plug/i_fileinfo.c:200
+msgid " MIDI Info "
+msgstr " MIDI-information "
+
+#: src/amidi-plug/i_fileinfo.c:214
+msgid "Format:"
+msgstr "Format:"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "Length (msec):"
+msgstr "Længde (ms):"
+
+#: src/amidi-plug/i_fileinfo.c:220
+msgid "No. of Tracks:"
+msgstr "Antallet af numre:"
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "variable"
+msgstr "variabel"
+
+#: src/amidi-plug/i_fileinfo.c:228
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidi-plug/i_fileinfo.c:236
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidi-plug/i_fileinfo.c:239
+msgid "Time Div:"
+msgstr ""
+
+#: src/amidi-plug/i_fileinfo.c:250
+msgid " MIDI Comments and Lyrics "
+msgstr " MIDI-kommentarer og sangtekster "
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no comments available in this MIDI file *"
+msgstr "* ingen kommentarer tilgængelig i denne MIDI-fil *"
+
+#: src/amidi-plug/i_fileinfo.c:314
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* ingen sangtekster tilgængelige i denne MIDI-fil *"
+
+#: src/amidi-plug/i_fileinfo.c:367
+msgid " (invalid UTF-8)"
+msgstr "(Ugyldig UTF-8)"
+
+#: src/amidi-plug/i_utils.c:39
+msgid "About AMIDI-Plug"
+msgstr "Om AMIDI-Plug"
+
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr ""
+
+#: src/amidi-plug/i_utils.c:54
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing"
+msgstr ""
+
+#: src/aosd/aosd.c:29
+msgid "Audacious OSD "
+msgstr "Audacious OSD "
+
+#: src/aosd/aosd.c:37
+msgid "AOSD (On-Screen Display)"
+msgstr "AOSD (On-Screen Display)"
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "Rektangel"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "Afrundet rektangel"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "Konkav rektangel"
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "Ingen"
+
+#: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "Start for afspilning"
+
+#: src/aosd/aosd_trigger.c:75
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Udløser OSD når et afspilningspunkt spilles."
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Title Change"
+msgstr "Ændring af titel"
+
+#: src/aosd/aosd_trigger.c:80
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr ""
+"Udløser OSD når, under afspilning, sangens titel ændres men filnavnet er det "
+"samme. Det er hovedsagelig nyttigt til at vise små ændringer i "
+"internetudsendelser."
+
+#: src/aosd/aosd_trigger.c:86
+msgid "Pause On"
+msgstr "Pause aktiveret"
+
+#: src/aosd/aosd_trigger.c:87
+msgid "Triggers OSD when playback is paused."
+msgstr "Udløser OSD når afspilning sættes på pause."
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Pause Off"
+msgstr "Pause deaktiveret"
+
+#: src/aosd/aosd_trigger.c:92
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Udløser OSD når pause fjernes fra afspilning "
+
+#: src/aosd/aosd_ui.c:168
+msgid "Placement"
+msgstr "Placering"
+
+#: src/aosd/aosd_ui.c:200
+msgid "Relative X offset:"
+msgstr "Relativ X-forskydning:"
+
+#: src/aosd/aosd_ui.c:207
+msgid "Relative Y offset:"
+msgstr "Relativ Y-forskydning:"
+
+#: src/aosd/aosd_ui.c:214
+msgid "Max OSD width:"
+msgstr "Maks OSD-bredde:"
+
+#: src/aosd/aosd_ui.c:225
+msgid "Multi-Monitor options"
+msgstr "Flerskærmsindstillinger"
+
+#: src/aosd/aosd_ui.c:229
+msgid "Display OSD using:"
+msgstr "Vis OSD med:"
+
+#: src/aosd/aosd_ui.c:231
+msgid "all monitors"
+msgstr "alle skærme"
+
+#: src/aosd/aosd_ui.c:234
+#, c-format
+msgid "monitor %i"
+msgstr "skærm %i"
+
+#: src/aosd/aosd_ui.c:287
+msgid "Timing (ms)"
+msgstr "Timing (ms)"
+
+#: src/aosd/aosd_ui.c:292
+msgid "Display:"
+msgstr "Visning:"
+
+#: src/aosd/aosd_ui.c:297
+msgid "Fade in:"
+msgstr "Ton ind:"
+
+#: src/aosd/aosd_ui.c:302
+msgid "Fade out:"
+msgstr "Ton ud:"
+
+#: src/aosd/aosd_ui.c:383
+msgid "Fonts"
+msgstr "Skrifttyper"
+
+#: src/aosd/aosd_ui.c:391
+#, c-format
+msgid "Font %i:"
+msgstr "Skrifttype %i:"
+
+#: src/aosd/aosd_ui.c:409
+msgid "Shadow"
+msgstr "Skygge"
+
+#: src/aosd/aosd_ui.c:439
+msgid "Internationalization"
+msgstr "Internationalisering"
+
+#: src/aosd/aosd_ui.c:445
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "Deaktiver UTF-8-konvertering af tekst (i aosd)"
+
+#: src/aosd/aosd_ui.c:462
+msgid "Select Skin File"
+msgstr "Vælg temafil"
+
+#: src/aosd/aosd_ui.c:573
+msgid "Render Style"
+msgstr "Optegningsstil"
+
+#: src/aosd/aosd_ui.c:589
+msgid "Colors"
+msgstr "Farver"
+
+#: src/aosd/aosd_ui.c:602
+#, c-format
+msgid "Color %i:"
+msgstr "Farve %i:"
+
+#: src/aosd/aosd_ui.c:620
+msgid "Custom Skin"
+msgstr "Tilpasset tema"
+
+#: src/aosd/aosd_ui.c:626
+msgid "Skin file:"
+msgstr "Temafil:"
+
+#: src/aosd/aosd_ui.c:630
+msgid "Browse"
+msgstr "Gennemse"
+
+#: src/aosd/aosd_ui.c:729
+msgid "Enable trigger"
+msgstr "Aktiver udløser"
+
+#: src/aosd/aosd_ui.c:756
+msgid "Event"
+msgstr "Hændelse"
+
+#: src/aosd/aosd_ui.c:784
+msgid "Composite manager detected"
+msgstr "Composite-håndtering detekteret"
+
+#: src/aosd/aosd_ui.c:791
+msgid ""
+"Composite manager not detected;\n"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Composite-håndtering blev ikke detekteret;\n"
+"med mindre du ved at du har en kørende, så aktiver en composite-håndtering "
+"ellers vil OSD'en ikke fungere korrekt"
+
+#: src/aosd/aosd_ui.c:799
+msgid "Composite manager not required for fake transparency"
+msgstr "Composite-håndtering er ikke krævet for falsk gennemsigtighed"
+
+#: src/aosd/aosd_ui.c:837
+msgid "Transparency"
+msgstr "Gennemsigtighed"
+
+#: src/aosd/aosd_ui.c:843
+msgid "Fake transparency"
+msgstr "Falsk gennemsigtighed"
+
+#: src/aosd/aosd_ui.c:845
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Reel gennemsigtighed (kræver X Composite Ext.)"
+
+#: src/aosd/aosd_ui.c:887
+msgid "Composite extension not loaded"
+msgstr "Composite-udvidelse er ikke indlæst"
+
+#: src/aosd/aosd_ui.c:895
+msgid "Composite extension not available"
+msgstr "Composite-udvidelse er ikke tilgængelig"
+
+#: src/aosd/aosd_ui.c:914
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd_ui.c:995
+msgid "Audacious OSD - configuration"
+msgstr "Audacious OSD - konfiguration"
+
+#: src/aosd/aosd_ui.c:1016
+msgid "Test"
+msgstr "Test"
+
+#: src/aosd/aosd_ui.c:1031
+msgid "Position"
+msgstr "Position"
+
+#: src/aosd/aosd_ui.c:1036
+msgid "Animation"
+msgstr "Animation"
+
+#: src/aosd/aosd_ui.c:1041
+msgid "Text"
+msgstr "Tekst"
+
+#: src/aosd/aosd_ui.c:1046
+msgid "Decoration"
+msgstr "Dekoration"
+
+#: src/aosd/aosd_ui.c:1051
+msgid "Trigger"
+msgstr "Udløser"
+
+#: src/aosd/aosd_ui.c:1056
+msgid "Misc"
+msgstr "Diverse"
+
+#: src/asx/asx.c:96
+msgid "ASXv1/ASXv2 Playlists"
+msgstr "ASXv1/ASXv2-afspilningslister"
+
+#: src/audpl/audpl.c:222
+msgid "Audacious Playlists (audpl)"
+msgstr "Audacious-afspilningslister (audpl)"
+
+#: src/blur_scope/blur_scope.c:47
+msgid "Color"
+msgstr "Farve"
+
+#: src/blur_scope/blur_scope.c:56
+msgid "Blur Scope"
+msgstr "Sløret omfang"
+
+#: src/bs2b/plugin.c:136
+msgid "Bauer Stereophonic-to-Binaural Preferences"
+msgstr "Stereophonic-til-Binaural-præferencer for Bauer"
+
+#: src/bs2b/plugin.c:147
+msgid "Feed level:"
+msgstr "Nyhedskildeniveau:"
+
+#: src/bs2b/plugin.c:161
+msgid "Cut frequency:"
+msgstr "Klip frekvens:"
+
+#: src/bs2b/plugin.c:175
+msgid "Presets:"
+msgstr "Forhåndsindstillinger:"
+
+#: src/bs2b/plugin.c:197
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr "Bauer Stereophonic-til-Binaural (BS2B)"
+
+#: src/cairo-spectrum/cairo-spectrum.c:297
+msgid "Spectrum Analyzer"
+msgstr "Spektrumanalyseprogram"
+
+#: src/cdaudio-ng/cdaudio-ng.c:103
+msgid ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"and to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you to Tony Vroon for mentoring and guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:121
+msgid "Device"
+msgstr "Enhed"
+
+#: src/cdaudio-ng/cdaudio-ng.c:122
+msgid "Read speed:"
+msgstr "Læs hastighed:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:125
+msgid "Override device:"
+msgstr "Tilsidesæt enhed:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:127
+msgid "Metadata"
+msgstr "Metadata"
+
+#: src/cdaudio-ng/cdaudio-ng.c:128
+msgid "Use CD-Text"
+msgstr "Brug CD-Text"
+
+#: src/cdaudio-ng/cdaudio-ng.c:130
+msgid "Use CDDB"
+msgstr "Brug CDDB"
+
+#: src/cdaudio-ng/cdaudio-ng.c:132
+msgid "Use HTTP instead of CDDBP"
+msgstr "Brug HTTP i stedet for CDDBP"
+
+#: src/cdaudio-ng/cdaudio-ng.c:134
+msgid "Server:"
+msgstr "Server:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:136
+msgid "Path:"
+msgstr "Sti:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:138
+msgid "Port:"
+msgstr "Port:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:148
+msgid "Audio CD Plugin"
+msgstr "Lyd-cd-udvidelsesmodul"
+
+#: src/cdaudio-ng/cdaudio-ng.c:249
+msgid "Failed to initialize cdio subsystem."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:306
+#, c-format
+msgid "Invalid URI %s."
+msgstr "Ugyldig URI %s."
+
+#: src/cdaudio-ng/cdaudio-ng.c:308
+#, c-format
+msgid "Track %d not found."
+msgstr "Nummeret %d blev ikke fundet."
+
+#: src/cdaudio-ng/cdaudio-ng.c:310
+#, c-format
+msgid "Track %d is a data track."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:312
+msgid "Failed to open audio output."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:395
+msgid "Error reading audio CD."
+msgstr "Kunne ikke læse lyd-cd."
+
+#: src/cdaudio-ng/cdaudio-ng.c:505
+msgid "Audio CD"
+msgstr "Lyd-cd"
+
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr "Kunne ikke åbne cd-enhed %s."
+
+#: src/cdaudio-ng/cdaudio-ng.c:547
+msgid "No audio capable CD drive found."
+msgstr "Intet cd-drev med lyd blev fundet."
+
+#: src/cdaudio-ng/cdaudio-ng.c:574
+msgid "Failed to finish initializing opened CD drive."
+msgstr "Kunne ikke afslutte initialisering af åbnet cd-drev."
+
+#: src/cdaudio-ng/cdaudio-ng.c:587
+msgid "Failed to retrieve first/last track number."
+msgstr "Kunne ikke indhente første/sidste nummer."
+
+#: src/cdaudio-ng/cdaudio-ng.c:612
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:702
+msgid "Failed to create the cddb connection."
+msgstr "Kunne ikke oprette cddb-forbindelsen."
+
+#: src/cdaudio-ng/cdaudio-ng.c:777
+msgid "Failed to query the CDDB server"
+msgstr "Kunne ikke forespørge CDDB-serveren"
+
+#: src/cdaudio-ng/cdaudio-ng.c:779
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr "Kunne ikke forespørge CDDB-serveren: %s"
+
+#: src/cdaudio-ng/cdaudio-ng.c:803
+#, c-format
+msgid "Failed to read the cddb info: %s"
+msgstr "Kunne ikke læse cddb-informationen: %s"
+
+#: src/cdaudio-ng/cdaudio-ng.c:876
+msgid "Drive is empty."
+msgstr "Drev er tomt."
+
+#: src/cdaudio-ng/cdaudio-ng.c:878
+msgid "Unsupported disk type."
+msgstr "Disktype er ikke understøttet."
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Play CD"
+msgstr "Afspil cd"
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Add CD"
+msgstr "Tilføj cd"
+
+#: src/cd-menu-items/cd-menu-items.c:57
+msgid "Audio CD Menu Items"
+msgstr "Menupunkter for lyd-cd"
+
+#: src/compressor/plugin.c:35
+msgid "Compression"
+msgstr "Komprimering"
+
+#: src/compressor/plugin.c:36
+msgid "Center volume:"
+msgstr "Lydstyrke for centrum:"
+
+#: src/compressor/plugin.c:39
+msgid "Dynamic range:"
+msgstr "Dynamisk interval:"
+
+#: src/compressor/plugin.c:53
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Ophavsret 2010-2012 John Lindgren"
+
+#: src/compressor/plugin.c:58
+msgid "Dynamic Range Compressor"
+msgstr "Dynamisk intervalkomprimering"
+
+#: src/console/configure.c:134 src/console/plugin.c:42
+msgid "Game Console Music Decoder"
+msgstr "Musikafkoder for spilkonsol"
+
+#: src/console/configure.c:151
+msgid "General"
+msgstr "Generelt"
+
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
+msgid "Playback"
+msgstr "Afspilning"
+
+#: src/console/configure.c:168
+msgid "Bass:"
+msgstr "Bas:"
+
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
+msgid "secs"
+msgstr "sek."
+
+#: src/console/configure.c:179
+msgid "Treble:"
+msgstr "Diskant:"
+
+#: src/console/configure.c:200
+msgid "Default song length:"
+msgstr "Standardlængde for sang:"
+
+#: src/console/configure.c:206
+msgid "Resampling"
+msgstr "Gensampling"
+
+#: src/console/configure.c:212
+msgid "Enable audio resampling"
+msgstr "Aktiver gensampling af lyd"
+
+#: src/console/configure.c:227
+msgid "Resampling rate:"
+msgstr "Gensamplingsfrekvens"
+
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
+msgid "Hz"
+msgstr "Hz"
+
+#: src/console/configure.c:242
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/configure.c:243
+msgid "Ignore length from SPC tags"
+msgstr "Ignorer længde fra SPC-mærker"
+
+#: src/console/configure.c:244
+msgid "Increase reverb"
+msgstr "Øg ekko"
+
+#: src/console/configure.c:269
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Standardlængde for sange, udtrykt i sekunder, bruges for sange som ikke "
+"tilbyder længdeinformation (dvs. loopingnumre)."
+
+#: src/console/plugin.c:27
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+msgstr ""
+"Afkodningsmotor for konsolmusik baseret på Game_Music_Emu 0.5.2\n"
+"Understøttede formater: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, "
+"VGZ\n"
+"\n"
+"Audaciousudvidelsesmodul lavet af:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+
+#: src/crossfade/crossfade.c:81
+msgid ""
+"Crossfading failed because the songs had a different number of channels. "
+"You can use the Channel Mixer to convert the songs to the same number of "
+"channels."
+msgstr ""
+"Glidende overgang mislykkedes da sangene havde forskellige antal kanaler. Du "
+"kan bruge kanalmikseren til at konvertere sangene til det samme antal "
+"kanaler."
+
+#: src/crossfade/crossfade.c:88
+msgid ""
+"Crossfading failed because the songs had different sample rates. You can "
+"use the Sample Rate Converter to convert the songs to the same sample rate."
+msgstr ""
+"Glidende overgang mislykkedes da sangene havde forskellige "
+"samplingshastigheder. Du kan bruge Konvertering af samplingshastighed til at "
+"konvertere sangene til den samme samplingshastighed."
+
+#: src/crossfade/crossfade.c:254
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/crossfade/crossfade.c:258
+msgid "Crossfade"
+msgstr "Glidende overgang"
+
+#: src/crossfade/crossfade.c:259
+msgid "Overlap:"
+msgstr ""
+
+#: src/crossfade/crossfade.c:269
+msgid "Crossfade"
+msgstr "Glidende overgang"
+
+#: src/crystalizer/crystalizer.c:40
+msgid "Crystalizer"
+msgstr "Crystalizer"
+
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
+msgid "Intensity:"
+msgstr "Intensitet:"
+
+#: src/crystalizer/crystalizer.c:51
+msgid "Crystalizer"
+msgstr "Crystalizer"
+
+#: src/cue/cue.c:158
+msgid "Cue Sheet Plugin"
+msgstr "Cue Sheet-udvidelsesmodul"
+
+#: src/echo_plugin/echo.c:24
+msgid "Echo"
+msgstr "Ekko"
+
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
+msgid "Delay:"
+msgstr "Forsinkelse:"
+
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
+msgid "ms"
+msgstr "ms"
+
+#: src/echo_plugin/echo.c:28
+msgid "Feedback:"
+msgstr "Tilbagemelding:"
+
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
+msgid "Volume:"
+msgstr "Lydstyrke:"
+
+#: src/echo_plugin/echo.c:114
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"\n"
+"Surround echo by Carl van Schaik, 1999"
+msgstr ""
+
+#: src/echo_plugin/echo.c:120
+msgid "Echo"
+msgstr "Echo"
+
+#: src/ffaudio/ffaudio-core.c:648
+msgid ""
+"Multi-format audio decoding plugin for Audacious using\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+
+#: src/ffaudio/ffaudio-core.c:695
+msgid "FFmpeg Plugin"
+msgstr "FFmpeg-udvidelsesmodul"
+
+#: src/filewriter/filewriter.c:409
+msgid "FileWriter Configuration"
+msgstr "FileWriter-konfiguration"
+
+#: src/filewriter/filewriter.c:421
+msgid "Output file format:"
+msgstr "Filformat for lyden:"
+
+#: src/filewriter/filewriter.c:439
+msgid "Configure"
+msgstr "Konfigurer"
+
+#: src/filewriter/filewriter.c:449
+msgid "Save into original directory"
+msgstr "Gem i oprindelig mappe"
+
+#: src/filewriter/filewriter.c:454
+msgid "Save into custom directory"
+msgstr "Gem i mappe efter eget valg"
+
+#: src/filewriter/filewriter.c:464
+msgid "Output file folder:"
+msgstr "Filmappe for lyd:"
+
+#: src/filewriter/filewriter.c:468
+msgid "Pick a folder"
+msgstr "Vælg en mappe"
+
+#: src/filewriter/filewriter.c:481
+msgid "Get filename from:"
+msgstr "Hent filnavn fra"
+
+#: src/filewriter/filewriter.c:484
+msgid "original file tags"
+msgstr "oprindelige filmærker"
+
+#: src/filewriter/filewriter.c:490
+msgid "original filename"
+msgstr "oprindelig filnavn"
+
+#: src/filewriter/filewriter.c:497
+msgid "Don't strip file name extension"
+msgstr "Fjern ikke filnavnsendelsen"
+
+#: src/filewriter/filewriter.c:506
+msgid "Prepend track number to filename"
+msgstr "Foranstil rækkefølge for numrene til filnavnet"
+
+#: src/filewriter/filewriter.c:515
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+
+#: src/filewriter/filewriter.c:532
+msgid "FileWriter Plugin"
+msgstr "FileWriter-udvidelsesmodul"
+
+#: src/filewriter/mp3.c:37 src/filewriter/mp3.c:748
+msgid "Auto"
+msgstr "Auto"
+
+#: src/filewriter/mp3.c:37
+msgid "Joint Stereo"
+msgstr "Fælles stereo"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/mp3.c:688
+msgid "MP3 Configuration"
+msgstr "MP3-konfiguration"
+
+#: src/filewriter/mp3.c:712
+msgid "Algorithm Quality:"
+msgstr "Algoritmekvalitet"
+
+#: src/filewriter/mp3.c:737
+msgid "Output Samplerate:"
+msgstr "Samplingsfrekvens for lydudgang:"
+
+#: src/filewriter/mp3.c:765
+msgid "(Hz)"
+msgstr "(Hz)"
+
+#: src/filewriter/mp3.c:772
+msgid "Bitrate / Compression ratio:"
+msgstr "Bithastighed/komprimeringsforhold:"
+
+#: src/filewriter/mp3.c:796
+msgid "Bitrate (kbps):"
+msgstr "Bithastighed (kbps):"
+
+#: src/filewriter/mp3.c:829
+msgid "Compression ratio:"
+msgstr "Komprimeringsforhold:"
+
+#: src/filewriter/mp3.c:853
+msgid "Audio Mode:"
+msgstr "Lydtilstand:"
+
+#: src/filewriter/mp3.c:878
+msgid "Misc:"
+msgstr "Diverse:"
+
+#: src/filewriter/mp3.c:889
+msgid "Enforce strict ISO complience"
+msgstr "Fremtving streng ISO-overholdelse"
+
+#: src/filewriter/mp3.c:900
+msgid "Error protection"
+msgstr "Fejlbeskyttelse"
+
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
+msgid "Quality"
+msgstr "Kvalitet"
+
+#: src/filewriter/mp3.c:921
+msgid "Enable VBR/ABR"
+msgstr "Aktiver VBH/GBH"
+
+#: src/filewriter/mp3.c:931
+msgid "Type:"
+msgstr "Type:"
+
+#: src/filewriter/mp3.c:964
+msgid "VBR Options:"
+msgstr "VBH-indstillinger:"
+
+#: src/filewriter/mp3.c:980
+msgid "Minimum bitrate (kbps):"
+msgstr "Minimum for bithastighed (kbps):"
+
+#: src/filewriter/mp3.c:1007
+msgid "Maximum bitrate (kbps):"
+msgstr "Maksimum for bithastighed (kbps):"
+
+#: src/filewriter/mp3.c:1030
+msgid "Strictly enforce minimum bitrate"
+msgstr "Fremtving strengt minimum for bithastighed"
+
+#: src/filewriter/mp3.c:1042
+msgid "ABR Options:"
+msgstr "GBH-indstillinger:"
+
+#: src/filewriter/mp3.c:1052
+msgid "Average bitrate (kbps):"
+msgstr "Gennemsnitlig bithastighed (kbps):"
+
+#: src/filewriter/mp3.c:1080
+msgid "VBR quality level:"
+msgstr "VBR-kvalitetsniveau:"
+
+#: src/filewriter/mp3.c:1099
+msgid "Don't write Xing VBR header"
+msgstr "Skriv ikke Xing VBH-hoved"
+
+#: src/filewriter/mp3.c:1112
+msgid "VBR/ABR"
+msgstr "VBH/GBH"
+
+#: src/filewriter/mp3.c:1121
+msgid "Frame parameters:"
+msgstr "Billedparametre:"
+
+#: src/filewriter/mp3.c:1133
+msgid "Mark as copyright"
+msgstr "Marker som ophavsret"
+
+#: src/filewriter/mp3.c:1144
+msgid "Mark as original"
+msgstr "Marker som original"
+
+#: src/filewriter/mp3.c:1156
+msgid "ID3 params:"
+msgstr "ID3-parametre:"
+
+#: src/filewriter/mp3.c:1167
+msgid "Force addition of version 2 tag"
+msgstr "Fremtving tilføjelse af version 2-mærke"
+
+#: src/filewriter/mp3.c:1177
+msgid "Only add v1 tag"
+msgstr "Tilføj kun v1-mærke"
+
+#: src/filewriter/mp3.c:1184
+msgid "Only add v2 tag"
+msgstr "Tilføj kun v2-mærke"
+
+#: src/filewriter/mp3.c:1205
+msgid "Tags"
+msgstr "Mærker"
+
+#: src/filewriter/vorbis.c:209
+msgid "Vorbis Encoder Configuration"
+msgstr "Konfiguration af Vorbiskoder"
+
+#: src/filewriter/vorbis.c:232
+msgid "Quality level (0 - 10):"
+msgstr "Kvalitetsniveau (0-10):"
+
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
+msgid "lossless"
+msgstr "uden kvalitetstab"
+
+#: src/flacng/plugin.c:269
+msgid ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+
+#: src/flacng/plugin.c:277
+msgid "FLAC Decoder"
+msgstr "FLAC-afkoder"
+
+#: src/gio/gio.c:300
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+
+#: src/gio/gio.c:322
+msgid "GIO Plugin"
+msgstr "GIO-udvidelsesmodul"
+
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Ophavsret 2013 Christophe Budé og John Lindgren\n"
+"\n"
+"Baseret på XMMS-udvidelsesmodulet:\n"
+"Ophavsret 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson og "
+"4Front Technologies\n"
+"\n"
+"Licens: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Lets you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
+msgid "Gnome Shortcuts"
+msgstr "Genvejstaster for GNOME"
+
+#: src/gtkui/columns.c:32
+msgid "Entry number"
+msgstr "Postnummer"
+
+#: src/gtkui/columns.c:32
+msgid "Title"
+msgstr "Titel"
+
+#: src/gtkui/columns.c:33
+msgid "Artist"
+msgstr "Kunstner"
+
+#: src/gtkui/columns.c:33
+msgid "Year"
+msgstr "År"
+
+#: src/gtkui/columns.c:33
+msgid "Album"
+msgstr "Album"
+
+#: src/gtkui/columns.c:33
+msgid "Track"
+msgstr "Nummer"
+
+#: src/gtkui/columns.c:33
+msgid "Genre"
+msgstr "Genre"
+
+#: src/gtkui/columns.c:34
+msgid "Queue position"
+msgstr "Køposition"
+
+#: src/gtkui/columns.c:34
+msgid "Length"
+msgstr "Længde"
+
+#: src/gtkui/columns.c:34
+msgid "File path"
+msgstr "Filsti"
+
+#: src/gtkui/columns.c:34
+msgid "File name"
+msgstr "Filnavn"
+
+#: src/gtkui/columns.c:35
+msgid "Custom title"
+msgstr "Tilpasset titel"
+
+#: src/gtkui/columns.c:35
+msgid "Bitrate"
+msgstr "Bithastighed"
+
+#: src/gtkui/columns.c:277
+msgid "Choose Columns"
+msgstr "Vælg kolonner"
+
+#: src/gtkui/columns.c:293
+msgid "Available:"
+msgstr "Tilgængelige:"
+
+#: src/gtkui/columns.c:327
+msgid "Chosen:"
+msgstr "Valgt:"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Left"
+msgstr "Dok til venstre"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Right"
+msgstr "Dok til højre"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Top"
+msgstr "Dok øverst"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Bottom"
+msgstr "Dok nederst"
+
+#: src/gtkui/layout.c:120
+msgid "Undock"
+msgstr "Fjern dok"
+
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
+msgid "Disable"
+msgstr "Deaktiver"
+
+#: src/gtkui/menus.c:170
+msgid "_Open Files ..."
+msgstr "_Åbn filer ..."
+
+#: src/gtkui/menus.c:171
+msgid "Open _URL ..."
+msgstr "Åbn a_dresse ..."
+
+#: src/gtkui/menus.c:172
+msgid "_Add Files ..."
+msgstr "_Tilføj filer ..."
+
+#: src/gtkui/menus.c:173
+msgid "Add U_RL ..."
+msgstr "_Tilføj adresse ..."
+
+#: src/gtkui/menus.c:175
+msgid "_Search Library"
+msgstr "_Søg i biblioteket"
+
+#: src/gtkui/menus.c:177
+msgid "A_bout ..."
+msgstr "_Om ..."
+
+#: src/gtkui/menus.c:178
+msgid "_Preferences ..."
+msgstr "_Præferencer ..."
+
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
+msgid "_Quit"
+msgstr "_Afslut"
+
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
+msgid "_Play"
+msgstr "_Afspil"
+
+#: src/gtkui/menus.c:183
+msgid "Paus_e"
+msgstr "_Pause"
+
+#: src/gtkui/menus.c:184
+msgid "_Stop"
+msgstr "_Stop"
+
+#: src/gtkui/menus.c:185
+msgid "Pre_vious"
+msgstr "_Forrige"
+
+#: src/gtkui/menus.c:186
+msgid "_Next"
+msgstr "_Næste"
+
+#: src/gtkui/menus.c:188
+msgid "_Repeat"
+msgstr "_Gentag"
+
+#: src/gtkui/menus.c:189
+msgid "S_huffle"
+msgstr "_Bland"
+
+#: src/gtkui/menus.c:190
+msgid "N_o Playlist Advance"
+msgstr "_Ingen næste afspilningsliste"
+
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Stop _Efter denne sang"
+
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
+msgid "Song _Info ..."
+msgstr "_Sanginformation ..."
+
+#: src/gtkui/menus.c:194
+msgid "Jump to _Time ..."
+msgstr "_Hop til tid ..."
+
+#: src/gtkui/menus.c:195
+msgid "_Jump to Song ..."
+msgstr "_Hop til sang ..."
+
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
+msgid "By _Title"
+msgstr "Efter _titel"
+
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Efter _rækkefølge for nummeret"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
+msgid "By _Artist"
+msgstr "Efter _kunstner"
+
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
+
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
+msgid "By Release _Date"
+msgstr "Efter _udgivelsesdato"
+
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
+msgid "By _File Path"
+msgstr "Efter _filsti"
+
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
+msgid "By _Custom Title"
+msgstr "Efter _tilpasset titel"
+
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
+msgid "R_everse Order"
+msgstr "_Omvendt rækkefølge"
+
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
+msgid "_Random Order"
+msgstr "_Vilkårlig rækkefølge"
+
+#: src/gtkui/menus.c:233
+msgid "_Play This Playlist"
+msgstr "_Start denne afspilningsliste"
+
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
+msgid "_Refresh"
+msgstr "_Opdater"
+
+#: src/gtkui/menus.c:236
+msgid "_Sort"
+msgstr "_Sorter"
+
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Sorter valgt"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Fjern _utilgængelige filer"
+
+#: src/gtkui/menus.c:241
+msgid "_New"
+msgstr "_Ny"
+
+#: src/gtkui/menus.c:242
+msgid "Ren_ame ..."
+msgstr "_Omdøb ..."
+
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
+msgid "_Close"
+msgstr "_Luk"
+
+#: src/gtkui/menus.c:245
+msgid "_Import ..."
+msgstr "_Importer ..."
+
+#: src/gtkui/menus.c:246
+msgid "_Export ..."
+msgstr "_Eksporter ..."
+
+#: src/gtkui/menus.c:248
+msgid "Playlist _Manager ..."
+msgstr ""
+
+#: src/gtkui/menus.c:249
+msgid "_Queue Manager ..."
+msgstr "_Køhåndtering ..."
+
+#: src/gtkui/menus.c:252
+msgid "Volume _Up"
+msgstr "Lydstyrke _op"
+
+#: src/gtkui/menus.c:253
+msgid "Volume _Down"
+msgstr "Lydstyrke _ned"
+
+#: src/gtkui/menus.c:255
+msgid "_Equalizer"
+msgstr "_Equalizer"
+
+#: src/gtkui/menus.c:257
+msgid "E_ffects"
+msgstr "_Effekter"
+
+#: src/gtkui/menus.c:260
+msgid "_Interface"
+msgstr "_Grænseflade"
+
+#: src/gtkui/menus.c:261
+msgid "_Visualizations"
+msgstr "_Visualisationer"
+
+#: src/gtkui/menus.c:263
+msgid "Show _Menu Bar"
+msgstr "Vis _menubjælke"
+
+#: src/gtkui/menus.c:264
+msgid "Show I_nfo Bar"
+msgstr "Vis _informationsbjælke"
+
+#: src/gtkui/menus.c:265
+msgid "Show Info Bar Vis_ualization"
+msgstr "Vis _visualisering for informationsbjælken"
+
+#: src/gtkui/menus.c:266
+msgid "Show _Status Bar"
+msgstr "Vis _statusbjælke"
+
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
+msgid "Show Close _Buttons"
+msgstr ""
+
+#: src/gtkui/menus.c:271
+msgid "Show Column _Headers"
+msgstr "Vis kolonnens _teksthoved"
+
+#: src/gtkui/menus.c:272
+msgid "Choose _Columns ..."
+msgstr "Vælg _kolonner ..."
+
+#: src/gtkui/menus.c:273
+msgid "Scrol_l on Song Change"
+msgstr "_Rul ved sangændring"
+
+#: src/gtkui/menus.c:276
+msgid "_File"
+msgstr "_Fil"
+
+#: src/gtkui/menus.c:277
+msgid "_Playback"
+msgstr "_Afspilning"
+
+#: src/gtkui/menus.c:278
+msgid "P_laylist"
+msgstr "_Afspilningsliste"
+
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
+msgid "_Services"
+msgstr "_Tjenester"
+
+#: src/gtkui/menus.c:280
+msgid "_Output"
+msgstr "_Lydudgang"
+
+#: src/gtkui/menus.c:281
+msgid "_View"
+msgstr "_Vis"
+
+#: src/gtkui/menus.c:285
+msgid "_Queue/Unqueue"
+msgstr "_Sæt i kø/fjern fra kø"
+
+#: src/gtkui/menus.c:288
+msgid "Cu_t"
+msgstr "_Klip"
+
+#: src/gtkui/menus.c:289
+msgid "_Copy"
+msgstr "_Kopier"
+
+#: src/gtkui/menus.c:290
+msgid "_Paste"
+msgstr "_Indsæt"
+
+#: src/gtkui/menus.c:291
+msgid "Select _All"
+msgstr "Vælg _alle"
+
+#: src/gtkui/menus.c:297
+msgid "_Rename ..."
+msgstr "_Omdøb ..."
+
+#: src/gtkui/ui_gtk.c:96
+msgid "GTK Interface"
+msgstr "GTK-grænseflade"
+
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.c:204
+msgid "Buffering ..."
+msgstr "Mellemlagrer ..."
+
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
+msgid "Error"
+msgstr "Fejl"
+
+#: src/gtkui/ui_statusbar.c:108
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] "%d kanal"
+msgstr[1] "%d kanaler"
+
+#: src/gtkui/ui_statusbar.c:123
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr "Forrige nummer"
+
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
+msgid "Play"
+msgstr "Afspil"
+
+#: src/hotkey/gui.c:72
+msgid "Pause/Resume"
+msgstr "Pause/genoptag"
+
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
+msgid "Stop"
+msgstr "Stop"
+
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr "Næste nummer"
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "Fremad 5 sekunder"
+
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
+msgstr "Tilbage 5 sekunder"
+
+#: src/hotkey/gui.c:77
+msgid "Mute"
+msgstr "Sluk lyden"
+
+#: src/hotkey/gui.c:78
+msgid "Volume up"
+msgstr "Lydstyrke op"
+
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr "Lydstyrke ned"
+
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
+msgstr "Hop til fil"
+
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr "Skift afspillervinduer"
+
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Vis On-Screen-Display"
+
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
+msgstr "Skift gentag"
+
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
+msgstr "Skift bland"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr "Skift stop efter nuværende"
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
+msgstr ""
+
+#: src/hotkey/gui.c:96
+msgid "(none)"
+msgstr "(ingen)"
+
+#: src/hotkey/gui.c:233
+msgid ""
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"Det anbefales ikke at binde de primære museknapper uden modifikatorer.\n"
+"\n"
+"Ønsker du at fortsætte?"
+
+#: src/hotkey/gui.c:235
+msgid "Binding mouse buttons"
+msgstr "Binding af museknapper"
+
+#: src/hotkey/gui.c:385
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Konfiguration af udvid.modul for globale genvejstaster"
+
+#: src/hotkey/gui.c:401
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+"Tryk på en tastekombination i et tekstfelt.\n"
+"Du kan også binde museknapper."
+
+#: src/hotkey/gui.c:406
+msgid "Hotkeys:"
+msgstr "Genvejstaster:"
+
+#: src/hotkey/gui.c:423
+msgid "Action:"
+msgstr "Handling:"
+
+#: src/hotkey/gui.c:430
+msgid "Key Binding:"
+msgstr "Genvejstast:"
+
+#: src/hotkey/plugin.c:66
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+
+#: src/hotkey/plugin.c:78
+msgid "Global Hotkeys"
+msgstr "Globale genvejstaster"
+
+#: src/jack/jack.c:410
+msgid ""
+"Based on xmms-jack, by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Ported to Audacious by Giacomo Lozito"
+msgstr ""
+
+#: src/jack/jack.c:416
+msgid "JACK Output"
+msgstr "JACK-lydkanal"
+
+#: src/ladspa/plugin.c:493
+#, c-format
+msgid "%s Settings"
+msgstr "%s-indstillinger"
+
+#: src/ladspa/plugin.c:561
+msgid "LADSPA Host Settings"
+msgstr "Indstillinger for LADSPA-vært"
+
+#: src/ladspa/plugin.c:570
+msgid "Module paths:"
+msgstr "Modulstier:"
+
+#: src/ladspa/plugin.c:575
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+"Adskil flere stier med et kolon.\n"
+"Disse stier er søgbare udover LADSPA_PATH.\n"
+"Efter tilføjelse af nye stier, tryk Retur for at skanne for nye "
+"udvidelsesmoduler."
+
+#: src/ladspa/plugin.c:591
+msgid "Available plugins:"
+msgstr "Tilgængelige udvidelsesmoduler:"
+
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
+msgid "Enable"
+msgstr "Aktiver"
+
+#: src/ladspa/plugin.c:610
+msgid "Enabled plugins:"
+msgstr "Aktiverede udvidelsesmoduler:"
+
+#: src/ladspa/plugin.c:626
+msgid "Settings"
+msgstr "Indstillinger"
+
+#: src/ladspa/plugin.c:645
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+
+#: src/ladspa/plugin.c:650
+msgid "LADSPA Host"
+msgstr "LADSPA-vært"
+
+#: src/lirc/lirc.c:76
+#, c-format
+msgid "%s: could not init LIRC support\n"
+msgstr "%s: Kunne ikke initiere LIRC-understøttelse\n"
+
+#: src/lirc/lirc.c:83
+#, c-format
+msgid ""
+"%s: could not read LIRC config file\n"
+"%s: please read the documentation of LIRC\n"
+"%s: how to create a proper config file\n"
+msgstr ""
+
+#: src/lirc/lirc.c:114
+#, c-format
+msgid "%s: trying to reconnect...\n"
+msgstr "%s: Forsøger at forbinde igen ...\n"
+
+#: src/lirc/lirc.c:354
+#, c-format
+msgid "%s: unknown command \"%s\"\n"
+msgstr "%s: Ukendt kommando »%s«\n"
+
+#: src/lirc/lirc.c:365
+#, c-format
+msgid "%s: disconnected from LIRC\n"
+msgstr "%s: Frakoblet fra LIRC\n"
+
+#: src/lirc/lirc.c:371
+#, c-format
+msgid "%s: will try reconnect every %d seconds...\n"
+msgstr "%s: Vil forsøge at forbinde igen hver %d sekunder ...\n"
+
+#: src/lirc/lirc.c:381
+msgid ""
+"A simple plugin to control Audacious using the LIRC remote control daemon\n"
+"\n"
+"Adapted for Audacious by:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Based on the XMMS LIRC plugin by:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"For more information about LIRC, see http://lirc.org."
+msgstr ""
+
+#: src/lirc/lirc.c:392
+msgid "Connection"
+msgstr "Forbindelse"
+
+#: src/lirc/lirc.c:393
+msgid "Reconnect to LIRC server"
+msgstr "Forbind igen til LIRC-serveren"
+
+#: src/lirc/lirc.c:395
+msgid "Wait before reconnecting:"
+msgstr "Vent før du forbinder igen:"
+
+#: src/lirc/lirc.c:405
+msgid "LIRC Plugin"
+msgstr "LIRC-udvidelsesmodul"
+
+#: src/lyricwiki/lyricwiki.c:117
+msgid "No lyrics available"
+msgstr "Ingen sangtekster er tilgængelige"
+
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
+#, c-format
+msgid "Unable to fetch %s"
+msgstr "Kunne ikke hente %s"
+
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
+#, c-format
+msgid "Unable to parse %s"
+msgstr "Kunne ikke fortolke %s"
+
+#: src/lyricwiki/lyricwiki.c:260
+msgid "Looking for lyrics ..."
+msgstr "Kigger efter sangtekster ..."
+
+#: src/lyricwiki/lyricwiki.c:271
+msgid "Missing song metadata"
+msgstr "Manglende sangmetadata"
+
+#: src/lyricwiki/lyricwiki.c:284
+msgid "Connecting to lyrics.wikia.com ..."
+msgstr "Forbinder til lyrics.wikia.com ..."
+
+#: src/lyricwiki/lyricwiki.c:411
+msgid "LyricWiki Plugin"
+msgstr "LyricWiki-udvidelsesmodul"
+
+#: src/m3u/m3u.c:121
+msgid "M3U Playlists"
+msgstr "M3U-afspilningslister"
+
+#: src/metronom/metronom.c:127
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Tact-opretter: %d bpm"
+
+#: src/metronom/metronom.c:129
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Tact-opretter: %d bpm %d/%d"
+
+#: src/metronom/metronom.c:246
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr ""
+
+#: src/metronom/metronom.c:255
+msgid "Tact Generator"
+msgstr ""
+
+#: src/mixer/mixer.c:169
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+
+#: src/mixer/mixer.c:173
+msgid "Channel Mixer"
+msgstr "Kanalmikser"
+
+#: src/mixer/mixer.c:174
+msgid "Output channels:"
+msgstr "Kanaler for lydudgang:"
+
+#: src/mixer/mixer.c:184
+msgid "Channel Mixer"
+msgstr "Kanalmikser"
+
+#: src/mms/mms.c:224
+msgid "MMS Plugin"
+msgstr "MMS-udvidelsemodul"
+
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bit"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bit"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Kanaler"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Niveau:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Ekko"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Surround"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Støjreduktion"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Afspil Amiga MOD'er"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Gentag"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Antal gentagelser:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "For at gentage for evigt, så sæt antal gentagelser til -1."
+
+#: src/modplug/plugin_main.c:238
+msgid "ModPlug (Module Player)"
+msgstr "ModPlug (Module-afspiller)"
+
+#: src/mpg123/mpg123.c:213
+msgid "Surround"
+msgstr "Surround"
+
+#: src/mpg123/mpg123.c:569
+msgid "MPG123 Plugin"
+msgstr "MPG123-udvidelsesmodul"
+
+#: src/mpris2/plugin.c:403
+msgid "MPRIS 2 Server"
+msgstr "MPRIS 2-server"
+
+#: src/neon/neon.c:1228
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr "Neon HTTP/HTTPS-udvidelsesmodul"
+
+#: src/notify/event.c:64
+msgid "Stopped"
+msgstr "Stoppet"
+
+#: src/notify/event.c:64
+msgid "Audacious is not playing."
+msgstr "Audacious afspiller ikke."
+
+#: src/notify/notify.c:33
+msgid ""
+"Desktop Notifications Plugin for Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Vis altid påmindelse"
+
+#: src/notify/notify.c:92
+msgid "Desktop Notifications"
+msgstr "Skrivebordspåmindelser"
+
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Vis"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pause"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Næste"
+
+#: src/oss4/plugin.c:36
+msgid "1. Default device"
+msgstr "1. Standardenhed"
+
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
+msgid "Audio device:"
+msgstr "Lydenhed:"
+
+#: src/oss4/plugin.c:77
+msgid "Use alternate device:"
+msgstr "Brug anden enhed:"
+
+#: src/oss4/plugin.c:81
+msgid "Save volume between sessions."
+msgstr "Gem lydstyrke mellem sessioner."
+
+#: src/oss4/plugin.c:83
+msgid "Enable format conversions made by the OSS software."
+msgstr "Aktiver formatkonvertering lavet af OSS-programmer."
+
+#: src/oss4/plugin.c:85
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Aktiver eksklusiv tilstand for at forhindre virtuel blanding."
+
+#: src/oss4/plugin.c:108
+msgid ""
+"OSS4 Output Plugin for Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+
+#: src/oss4/plugin.c:115
+msgid "OSS4 Output"
+msgstr "OSS4-lydkanal"
+
+#: src/pls/pls.c:113
+msgid "PLS Playlists"
+msgstr "PLS-afspilningslister"
+
+#: src/psf/plugin.c:264
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr "OpenPSF PSF1/PSF2-afkoder"
+
+#: src/pulse_audio/pulse_audio.c:644
+msgid ""
+"Audacious PulseAudio Output Plugin\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+
+#: src/pulse_audio/pulse_audio.c:662
+msgid "PulseAudio Output"
+msgstr "PulseAudio-lydkanal"
+
+#: src/resample/resample.c:161
+msgid ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/resample/resample.c:165
+msgid "Skip/repeat samples"
+msgstr "Udelad/gentag samplinger"
+
+#: src/resample/resample.c:166
+msgid "Linear interpolation"
+msgstr "Lineær interpolation"
+
+#: src/resample/resample.c:167
+msgid "Fast sinc interpolation"
+msgstr "Fast sinc-interpolation"
+
+#: src/resample/resample.c:168
+msgid "Medium sinc interpolation"
+msgstr "Medium sinc-interpolation"
+
+#: src/resample/resample.c:169
+msgid "Best sinc interpolation"
+msgstr "Bedste sinc-interpolation"
+
+#: src/resample/resample.c:172
+msgid "Conversion"
+msgstr ""
+
+#: src/resample/resample.c:173
+msgid "Method:"
+msgstr "Metode:"
+
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
+msgid "Rate:"
+msgstr "Hastighed:"
+
+#: src/resample/resample.c:179
+msgid "Rate Mappings"
+msgstr "Hastighedsoversættelser"
+
+#: src/resample/resample.c:180
+msgid "Use rate mappings"
+msgstr "Brug hastighedsoversættelser"
+
+#: src/resample/resample.c:182
+msgid "8 kHz:"
+msgstr "8 kHz:"
+
+#: src/resample/resample.c:185
+msgid "16 kHz:"
+msgstr "16 kHz:"
+
+#: src/resample/resample.c:188
+msgid "22.05 kHz:"
+msgstr "22.05 kHz:"
+
+#: src/resample/resample.c:191
+msgid "44.1 kHz:"
+msgstr "44.1 kHz:"
+
+#: src/resample/resample.c:194
+msgid "48 kHz:"
+msgstr "48 kHz:"
+
+#: src/resample/resample.c:197
+msgid "96 kHz:"
+msgstr "96 kHz:"
+
+#: src/resample/resample.c:200
+msgid "192 kHz:"
+msgstr "192 kHz:"
+
+#: src/resample/resample.c:210
+msgid "Sample Rate Converter"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Tilladelse nægtet"
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Netværksproblem."
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+"Der opstod et problem under forsøget på at kontakte Last.fm. Prøv igen "
+"senere."
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Kontrollerer ..."
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "_Kontroller rettighed"
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_Tilbagekald rettighed"
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious bruger nu en forbedret version af Last.fm Scrobbler.\n"
+"Kontroller præferencerne for Scrobbler-udvidelsesmodulet."
+
+#: src/sdlout/plugin.c:26
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+
+#: src/sdlout/plugin.c:31
+msgid "SDL Output"
+msgstr ""
+
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
+msgid "Library"
+msgstr "Bibliotek"
+
+#: src/search-tool/search-tool.c:219
+msgid "Unknown Artist"
+msgstr "Ukendt kunstner"
+
+#: src/search-tool/search-tool.c:221
+msgid "Unknown Album"
+msgstr "Ukendt album"
+
+#: src/search-tool/search-tool.c:632
+#, c-format
+msgid ""
+"%s\n"
+" on %s by %s"
+msgstr ""
+"%s\n"
+" på %s af %s"
+
+#: src/search-tool/search-tool.c:638
+#, c-format
+msgid "%d album"
+msgid_plural "%d albums"
+msgstr[0] "%d album"
+msgstr[1] "%d albummer"
+
+#: src/search-tool/search-tool.c:640
+#, c-format
+msgid ""
+"%s\n"
+" %s, %d song"
+msgid_plural ""
+"%s\n"
+" %s, %d songs"
+msgstr[0] ""
+"%s\n"
+" %s, %d sang"
+msgstr[1] ""
+"%s\n"
+" %s, %d sang"
+
+#: src/search-tool/search-tool.c:646
+#, c-format
+msgid ""
+"%s\n"
+" %d song by %s"
+msgid_plural ""
+"%s\n"
+" %d songs by %s"
+msgstr[0] ""
+"%s\n"
+" %d sang af %s"
+msgstr[1] ""
+"%s\n"
+" %d sange af %s"
+
+#: src/search-tool/search-tool.c:687
+msgid "_Create Playlist"
+msgstr "_Opret afspilningsliste"
+
+#: src/search-tool/search-tool.c:694
+msgid "_Add to Playlist"
+msgstr "_Tilføj til afspilningsliste"
+
+#: src/search-tool/search-tool.c:734
+msgid "Search library"
+msgstr "Søg bibliotek"
+
+#: src/search-tool/search-tool.c:739
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"For at importere dit musikbibliotek til Audacious skal du vælge en mappe og "
+"så klikke på ikonet »Opdater«."
+
+#: src/search-tool/search-tool.c:747
+msgid "Please wait ..."
+msgstr "Vent venligst ..."
+
+#: src/search-tool/search-tool.c:769
+msgid "Choose Folder"
+msgstr "Vælg mappe"
+
+#: src/search-tool/search-tool.c:808
+msgid "Search Tool"
+msgstr "Søgeværktøj"
+
+#: src/skins/plugin.c:49
+msgid "Winamp Classic Interface"
+msgstr "Winamps klassiske brugerflade"
+
+#: src/skins/skins_cfg.c:204
+msgid "_Player:"
+msgstr "_Afspiller:"
+
+#: src/skins/skins_cfg.c:205
+msgid "Select main player window font:"
+msgstr "Vælg skrifttype for hovedafspillerens vindue:"
+
+#: src/skins/skins_cfg.c:207
+msgid "_Playlist:"
+msgstr "_Afspilningsliste:"
+
+#: src/skins/skins_cfg.c:208
+msgid "Select playlist font:"
+msgstr "Vælg skrifttype for afspilningslisten:"
+
+#: src/skins/skins_cfg.c:212
+msgid "_Fonts"
+msgstr "_Skrifttyper"
+
+#: src/skins/skins_cfg.c:215
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Brug bitmap-skrifttyper (understøtter kun ASCII)"
+
+#: src/skins/skins_cfg.c:217
+msgid "Scroll song title in both directions"
+msgstr "Rul sangtitel i begge retninger"
+
+#: src/skins/skins_cfg.c:295
+msgid "_Skin"
+msgstr "_Tema"
+
+#: src/skins/skins_cfg.c:342
+msgid "Interface Preferences"
+msgstr "Grænsefladepræferencer"
+
+#: src/skins/ui_equalizer.c:328
+msgid "Preamp"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:332
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/ui_equalizer.c:375
+msgid "Audacious Equalizer"
+msgstr "Audacious-equalizer"
+
+#: src/skins/ui_equalizer.c:890
+msgid "Presets"
+msgstr "Forhåndsindstillinger"
+
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
+msgid "Load preset"
+msgstr "Indlæs forhåndsindstilling"
+
+#: src/skins/ui_equalizer.c:988
+msgid "Load auto-preset"
+msgstr "Indlæs automatisk forhåndsindstilling"
+
+#: src/skins/ui_equalizer.c:1018 src/skins/ui_equalizer.c:1036
+#: src/skins/ui_equalizer.c:1052
+msgid "Load equalizer preset"
+msgstr "Indlæs equalizerforhåndsindstilling"
+
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
+msgid "Save preset"
+msgstr "Gem forhåndsindstilling"
+
+#: src/skins/ui_equalizer.c:1087
+msgid "Save auto-preset"
+msgstr "Gem automatisk forhåndsindstilling"
+
+#: src/skins/ui_equalizer.c:1118 src/skins/ui_equalizer.c:1154
+msgid "Save equalizer preset"
+msgstr "Gem equalizerforhåndsindstilling"
+
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
+msgid "Delete preset"
+msgstr "Slet forhåndsindstilling"
+
+#: src/skins/ui_equalizer.c:1190
+msgid "Delete auto-preset"
+msgstr "Slet automatisk forhåndsindstilling"
+
+#: src/skins/ui_main.c:414
+msgid "kbps"
+msgstr "kbps"
+
+#: src/skins/ui_main.c:422
+msgid "kHz"
+msgstr "kHz"
+
+#: src/skins/ui_main.c:770
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Søg til %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/ui_main.c:791
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Lydstyrke: %d%%"
+
+#: src/skins/ui_main.c:814
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balance: %d%% venstre"
+
+#: src/skins/ui_main.c:816
+msgid "Balance: center"
+msgstr "Balance: centrum"
+
+#: src/skins/ui_main.c:818
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balance: %d%% højre"
+
+#: src/skins/ui_main.c:942
+msgid "Options Menu"
+msgstr "Menu for indstillinger"
+
+#: src/skins/ui_main.c:946
+msgid "Disable 'Always On Top'"
+msgstr "Deakiver »Altid øverst«"
+
+#: src/skins/ui_main.c:948
+msgid "Enable 'Always On Top'"
+msgstr "Aktiver »Altid øverst«"
+
+#: src/skins/ui_main.c:951
+msgid "File Info Box"
+msgstr "Filinformationsboks"
+
+#: src/skins/ui_main.c:956
+msgid "Visualization Menu"
+msgstr "Visualiseringsmenu"
+
+#: src/skins/ui_main.c:1591
+msgid "Single mode."
+msgstr "Tilstand for én."
+
+#: src/skins/ui_main.c:1593
+msgid "Playlist mode."
+msgstr "Afspilningstilstand."
+
+#: src/skins/ui_main.c:1615
+msgid "Stopping after song."
+msgstr "Stopper efter sang."
+
+#: src/skins/ui_main.c:1617
+msgid "Not stopping after song."
+msgstr "Stopper ikke efter sang."
+
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
+msgid "Autoscroll Song Name"
+msgstr "Rul automatisk sangnavn"
+
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
+msgid "Stop after Current Song"
+msgstr "Stop efter nuværende sang"
+
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
+msgid "Peaks"
+msgstr "Højdepunkter"
+
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
+msgid "Repeat"
+msgstr "Gentag"
+
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
+msgid "Shuffle"
+msgstr "Bland"
+
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
+msgid "No Playlist Advance"
+msgstr "Ingen næste afspilningsliste"
+
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
+msgid "Show Player"
+msgstr "Vis afspiller"
+
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
+msgid "Show Playlist Editor"
+msgstr "Vis redigeringsprogram for afspilningslister"
+
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
+msgid "Show Equalizer"
+msgstr "Vis equalizer"
+
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
+msgid "Always on Top"
+msgstr "Altid øverst"
+
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
+msgid "Put on All Workspaces"
+msgstr "Placer på alle arbejdsrum"
+
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
+msgid "Roll up Player"
+msgstr "Rul op-afspiller"
+
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
+msgid "Roll up Playlist Editor"
+msgstr "Rul op-redigeringsprogram for afspilningslister"
+
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
+msgid "Roll up Equalizer"
+msgstr "Rul op-equalizer"
+
+#: src/skins/ui_manager.c:114
+msgid "Analyzer"
+msgstr "Analyseprogram"
+
+#: src/skins/ui_manager.c:115
+msgid "Scope"
+msgstr "Omfang"
+
+#: src/skins/ui_manager.c:116
+msgid "Voiceprint"
+msgstr "Stemmeaftryk"
+
+#: src/skins/ui_manager.c:117
+msgid "Off"
+msgstr "Slukket"
+
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
+msgid "Normal"
+msgstr "Normal"
+
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+msgid "Fire"
+msgstr "Ild"
+
+#: src/skins/ui_manager.c:123
+msgid "Vertical Lines"
+msgstr "Lodrette linjer"
+
+#: src/skins/ui_manager.c:127
+msgid "Lines"
+msgstr "Linjer"
+
+#: src/skins/ui_manager.c:128
+msgid "Bars"
+msgstr "Bjælker"
+
+#: src/skins/ui_manager.c:132
+msgid "Dot Scope"
+msgstr "Punktumomfang"
+
+#: src/skins/ui_manager.c:133
+msgid "Line Scope"
+msgstr "LInjeomfang"
+
+#: src/skins/ui_manager.c:134
+msgid "Solid Scope"
+msgstr "Fast omfang"
+
+#: src/skins/ui_manager.c:140
+msgid "Ice"
+msgstr "Is"
+
+#: src/skins/ui_manager.c:145
+msgid "Smooth"
+msgstr "Blød"
+
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
+msgid "Slowest"
+msgstr "Langsomst"
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slow"
+msgstr "Langsom"
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
+msgid "Medium"
+msgstr "Mellem"
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Fast"
+msgstr "Hurtig"
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fastest"
+msgstr "Hurtigst"
+
+#: src/skins/ui_manager.c:165
+msgid "Time Elapsed"
+msgstr "Tid forløbet"
+
+#: src/skins/ui_manager.c:166
+msgid "Time Remaining"
+msgstr "Tid tilbage"
+
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
+msgid "Previous"
+msgstr "Forrige"
+
+#: src/skins/ui_manager.c:195
+msgid "Visualization"
+msgstr "Visualisering"
+
+#: src/skins/ui_manager.c:196
+msgid "Visualization Mode"
+msgstr "Visualiseringstilstand"
+
+#: src/skins/ui_manager.c:197
+msgid "Analyzer Mode"
+msgstr "Analysetilstand"
+
+#: src/skins/ui_manager.c:198
+msgid "Scope Mode"
+msgstr "Omfangstilstand"
+
+#: src/skins/ui_manager.c:199
+msgid "Voiceprint Mode"
+msgstr "Stemmeaftrykstilstand"
+
+#: src/skins/ui_manager.c:200
+msgid "WindowShade VU Mode"
+msgstr "WindowsShade VU-tilstand"
+
+#: src/skins/ui_manager.c:201
+msgid "Analyzer Falloff"
+msgstr ""
+
+#: src/skins/ui_manager.c:202
+msgid "Peaks Falloff"
+msgstr ""
+
+#: src/skins/ui_manager.c:207
+msgid "Playlist"
+msgstr "Afspilningsliste"
+
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
+msgid "Play Playlist"
+msgstr "Start afspilningsliste"
+
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
+msgid "New Playlist"
+msgstr "Ny afspilningsliste"
+
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
+msgid "Select Next Playlist"
+msgstr "Vælg næste afspilningsliste"
+
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
+msgid "Select Previous Playlist"
+msgstr "Vælg forrige afspilningsliste"
+
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
+msgid "Delete Playlist"
+msgstr "Slet afspilningsliste"
+
+#: src/skins/ui_manager.c:224
+msgid "Import Playlist"
+msgstr "Importer afspilningsliste"
+
+#: src/skins/ui_manager.c:225
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Indlæs en afspilningslistefil i den valgte afspilningsliste."
+
+#: src/skins/ui_manager.c:228
+msgid "Export Playlist"
+msgstr "Eksporter afspilningsliste"
+
+#: src/skins/ui_manager.c:229
+msgid "Saves the selected playlist."
+msgstr "Gem den valgte afspilningsliste."
+
+#: src/skins/ui_manager.c:231
+msgid "Refresh List"
+msgstr "Opdater liste"
+
+#: src/skins/ui_manager.c:232
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Opdaterer metadata forbundet med et afspilningslistepunkt."
+
+#: src/skins/ui_manager.c:235
+msgid "Playlist Manager"
+msgstr "Håndtering af afspilningslister"
+
+#: src/skins/ui_manager.c:238
+msgid "Queue Manager"
+msgstr "Køhåndtering"
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Vis"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "Grænseflade"
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr "Grænsefladepræferencer ..."
+
+#: src/skins/ui_manager.c:250
+msgid "Add Internet Address..."
+msgstr "Tilføj internetadresse ..."
+
+#: src/skins/ui_manager.c:251
+msgid "Adds a remote track to the playlist."
+msgstr "Tilføjer et eksternt nummer til afspilningslisten."
+
+#: src/skins/ui_manager.c:254
+msgid "Add Files..."
+msgstr "Tilføj filer ..."
+
+#: src/skins/ui_manager.c:255
+msgid "Adds files to the playlist."
+msgstr "Tilføjer filer til afspilningslisten."
+
+#: src/skins/ui_manager.c:260
+msgid "Search and Select"
+msgstr "Søg og vælg"
+
+#: src/skins/ui_manager.c:261
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr ""
+"Søger i afspilningslisten og vælger afspilningspunkter baseret på specifikke "
+"kriterier."
+
+#: src/skins/ui_manager.c:264
+msgid "Invert Selection"
+msgstr "Vend markering om"
+
+#: src/skins/ui_manager.c:265
+msgid "Inverts the selected and unselected entries."
+msgstr "Vend de valgte og uvalgte punkter om."
+
+#: src/skins/ui_manager.c:268
+msgid "Select All"
+msgstr "Vælg alle"
+
+#: src/skins/ui_manager.c:269
+msgid "Selects all of the playlist entries."
+msgstr "Vælg alle punkter i afspilningslisten."
+
+#: src/skins/ui_manager.c:272
+msgid "Select None"
+msgstr "Vælg ingen"
+
+#: src/skins/ui_manager.c:273
+msgid "Deselects all of the playlist entries."
+msgstr "Fravælger alle punkter i afspilningslisten."
+
+#: src/skins/ui_manager.c:278
+msgid "Remove All"
+msgstr "Fjern alle"
+
+#: src/skins/ui_manager.c:279
+msgid "Removes all entries from the playlist."
+msgstr "Fjern alle punkter fra afspilningslisten."
+
+#: src/skins/ui_manager.c:282
+msgid "Clear Queue"
+msgstr "Ryd kø"
+
+#: src/skins/ui_manager.c:283
+msgid "Clears the queue associated with this playlist."
+msgstr "Ryd køen forbundet med denne afspilningsliste."
+
+#: src/skins/ui_manager.c:286
+msgid "Remove Unavailable Files"
+msgstr "Fjern utilgængelige filer"
+
+#: src/skins/ui_manager.c:287
+msgid "Removes unavailable files from the playlist."
+msgstr "Fjern utilgængelige filer fra afspilningslisten."
+
+#: src/skins/ui_manager.c:290
+msgid "Remove Duplicates"
+msgstr "Fjern duplikater"
+
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
+msgid "By Title"
+msgstr "Efter titel"
+
+#: src/skins/ui_manager.c:293
+msgid "Removes duplicate entries from the playlist by title."
+msgstr "Fjerner duplikater fra afspilningslisten efter titel."
+
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
+msgid "By Filename"
+msgstr "Efter filnavn"
+
+#: src/skins/ui_manager.c:297
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr "Fjerner duplikate punkter fra afspilningslisten efter filnavn."
+
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
+msgid "By Path + Filename"
+msgstr "Efter sti + filnavn"
+
+#: src/skins/ui_manager.c:301
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr "Fjerner ens punkter fra afspilningslisten efter deres fulde sti."
+
+#: src/skins/ui_manager.c:304
+msgid "Remove Unselected"
+msgstr "Fjern dem som ikke er valgt"
+
+#: src/skins/ui_manager.c:305
+msgid "Remove unselected entries from the playlist."
+msgstr "Fjern dem som ikke er valgt fra afspilningslisten."
+
+#: src/skins/ui_manager.c:308
+msgid "Remove Selected"
+msgstr "Fjern de valgte"
+
+#: src/skins/ui_manager.c:309
+msgid "Remove selected entries from the playlist."
+msgstr "Fjern de valgte punkter fra afspilningslisten."
+
+#: src/skins/ui_manager.c:314
+msgid "Randomize List"
+msgstr "Sæt listen i vilkårlig rækkefølge"
+
+#: src/skins/ui_manager.c:315
+msgid "Randomizes the playlist."
+msgstr "Sæt afspilningslisten i vilkårlig rækkefølge"
+
+#: src/skins/ui_manager.c:318
+msgid "Reverse List"
+msgstr "Vend listen om"
+
+#: src/skins/ui_manager.c:319
+msgid "Reverses the playlist."
+msgstr "Vend afspilningslisten om."
+
+#: src/skins/ui_manager.c:322
+msgid "Sort List"
+msgstr "Sorter listen"
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "Sorts the list by title."
+msgstr "Sorter listen efter titel."
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+msgid "By Album"
+msgstr "Efter album"
+
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+msgid "Sorts the list by album."
+msgstr "Sorterer listen efter album."
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+msgid "By Artist"
+msgstr "Efter kunstner"
+
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+msgid "Sorts the list by artist."
+msgstr "Sorterer listen efter kunstner."
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "Sorts the list by filename."
+msgstr "Sorterer listen efter filnavn."
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "Sorts the list by full pathname."
+msgstr "Sorterer listen efter fuld stinavn."
+
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+msgid "By Date"
+msgstr "Efter dato"
+
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+msgid "Sorts the list by modification time."
+msgstr "Sorterer listen efter ændringstidspunkt."
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+msgid "By Track Number"
+msgstr "Efter rækkefølge"
+
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+msgid "Sorts the list by track number."
+msgstr "Sorterer listen efter rækkefølge"
+
+#: src/skins/ui_manager.c:352
+msgid "Sort Selected"
+msgstr "Sorter valgt"
+
+#: src/skins/ui_manager.c:388
+msgid "File"
+msgstr "Fil"
+
+#: src/skins/ui_manager.c:391
+msgid "Plugin Services"
+msgstr "Udvidelsesmodultjenester"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View Track Details"
+msgstr "Vis deltaljer for nummeret"
+
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+msgid "View track details"
+msgstr "Vis detaljer for nummeret"
+
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
+msgid "About Audacious"
+msgstr "Om Audacious"
+
+#: src/skins/ui_manager.c:402
+msgid "Play File"
+msgstr "Afspil fil"
+
+#: src/skins/ui_manager.c:403
+msgid "Load and play a file"
+msgstr "Indlæs og afspil en fil"
+
+#: src/skins/ui_manager.c:405
+msgid "Play Location"
+msgstr "Afspil sted"
+
+#: src/skins/ui_manager.c:406
+msgid "Play media from the selected location"
+msgstr "Afspil medie fra valgt sted"
+
+#: src/skins/ui_manager.c:408
+msgid "Plugin services"
+msgstr "Udvidelsesmodultjenester"
+
+#: src/skins/ui_manager.c:410
+msgid "Preferences"
+msgstr "Præferencer"
+
+#: src/skins/ui_manager.c:411
+msgid "Open preferences window"
+msgstr "Åbn vindue for præferencer"
+
+#: src/skins/ui_manager.c:414
+msgid "Quit Audacious"
+msgstr "Afslut Audacious"
+
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
+msgid "Set A-B"
+msgstr "Sæt A-B"
+
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
+msgid "Clear A-B"
+msgstr "Ryd A-B"
+
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Hop til fil"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
+msgid "Jump to Time"
+msgstr "Hop til tid"
+
+#: src/skins/ui_manager.c:428
+msgid "Queue Toggle"
+msgstr "Skift køstatus"
+
+#: src/skins/ui_manager.c:429
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Aktiverer/deaktiverer punktet i afspilningslistens kø."
+
+#: src/skins/ui_manager.c:432
+msgid "Copy"
+msgstr "Kopier"
+
+#: src/skins/ui_manager.c:435
+msgid "Cut"
+msgstr "Klip"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Indsæt"
+
+#: src/skins/ui_manager.c:445
+msgid "Load"
+msgstr "Indlæs"
+
+#: src/skins/ui_manager.c:446
+msgid "Import"
+msgstr "Importer"
+
+#: src/skins/ui_manager.c:447
+msgid "Save"
+msgstr "Gem"
+
+#: src/skins/ui_manager.c:448
+msgid "Delete"
+msgstr "Slet"
+
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
+msgid "Preset"
+msgstr "Forhåndsindstilling"
+
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
+msgid "Auto-load preset"
+msgstr "Automatisk forhåndsindstilling"
+
+#: src/skins/ui_manager.c:454
+msgid "Load auto-load preset"
+msgstr "Indlæs automatisk forhåndsindstilling"
+
+#: src/skins/ui_manager.c:457
+msgid "Load default preset into equalizer"
+msgstr "Indlæs forhåndsindstilling i equalizer"
+
+#: src/skins/ui_manager.c:459
+msgid "Zero"
+msgstr "Nul"
+
+#: src/skins/ui_manager.c:460
+msgid "Set equalizer preset levels to zero"
+msgstr "Sæt equalizerens forhåndsindstillingsniveauer til nul"
+
+#: src/skins/ui_manager.c:462
+msgid "From file"
+msgstr "Fra fil"
+
+#: src/skins/ui_manager.c:463
+msgid "Load preset from file"
+msgstr "Indlæs forhåndsindstilling fra fil"
+
+#: src/skins/ui_manager.c:465
+msgid "From WinAMP EQF file"
+msgstr "Fra WinAMP EQF-fil"
+
+#: src/skins/ui_manager.c:466
+msgid "Load preset from WinAMP EQF file"
+msgstr "Indlæs forhåndsindstilling fra WinAMP EQF-fil"
+
+#: src/skins/ui_manager.c:468
+msgid "WinAMP Presets"
+msgstr "WinAMP-forhåndsindstillinger"
+
+#: src/skins/ui_manager.c:469
+msgid "Import WinAMP presets"
+msgstr "Importer WinAMP-forhåndsindstillinger"
+
+#: src/skins/ui_manager.c:475
+msgid "Save auto-load preset"
+msgstr "Gem automatisk forhåndsindstilling"
+
+#: src/skins/ui_manager.c:478
+msgid "Save default preset"
+msgstr "Gem standardforhåndsindstilling"
+
+#: src/skins/ui_manager.c:480
+msgid "To file"
+msgstr "Til fil"
+
+#: src/skins/ui_manager.c:481
+msgid "Save preset to file"
+msgstr "Gem forhåndsindstilling til fil"
+
+#: src/skins/ui_manager.c:483
+msgid "To WinAMP EQF file"
+msgstr "Til WinAMP EQF-fil"
+
+#: src/skins/ui_manager.c:484
+msgid "Save preset to WinAMP EQF file"
+msgstr "Gem forhåndsindstilling til WinAMP EQF-fil"
+
+#: src/skins/ui_manager.c:490
+msgid "Delete auto-load preset"
+msgstr "Slet automatisk forhåndsindstilling"
+
+#: src/skins/ui_playlist.c:244
+msgid "Search entries in active playlist"
+msgstr "Søg i punkter i aktiv afspilningsliste"
+
+#: src/skins/ui_playlist.c:251
+msgid ""
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr ""
+"Vælg punkter i afspilningslisten ved at udfylde et eller flere felter. "
+"Felter bruger regulære udtryk, tager ikke hensyn til store/små bogstaver. "
+"Hvis du ikke ved hvordan regulære udtryk fungerer, så indsæt bare en lille "
+"del af hvad du søger efter."
+
+#: src/skins/ui_playlist.c:259
+msgid "Title: "
+msgstr "Titel:"
+
+#: src/skins/ui_playlist.c:267
+msgid "Album: "
+msgstr "Album:"
+
+#: src/skins/ui_playlist.c:275
+msgid "Artist: "
+msgstr "Kunstner:"
+
+#: src/skins/ui_playlist.c:283
+msgid "Filename: "
+msgstr "Filnavn:"
+
+#: src/skins/ui_playlist.c:292
+msgid "Clear previous selection before searching"
+msgstr "Ryd forrige valg før søgning"
+
+#: src/skins/ui_playlist.c:295
+msgid "Automatically toggle queue for matching entries"
+msgstr "Skift automatisk kø for matchende punkter"
+
+#: src/skins/ui_playlist.c:298
+msgid "Create a new playlist with matching entries"
+msgstr "Opret en ny afspilningsliste med matchende punkter"
+
+#: src/skins/ui_playlist.c:738
+msgid "Audacious Playlist Editor"
+msgstr "Redigeringsprogram for Audacious' afspilningslister"
+
+#: src/skins/ui_playlist.c:772
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d of %d)"
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr "Arkiveret Winamp 2.x-tema"
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr "Winamp 2.x-tema der ikke er i arkiv"
+
+#: src/skins/util.c:773
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr "Kunne ikke oprette mappe (%s): %s\n"
+
+#: src/sndfile/plugin.c:416
+msgid ""
+"Based on the xmms_sndfile plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+
+#: src/sndfile/plugin.c:435
+msgid "Sndfile Plugin"
+msgstr "Sndfile-udvidelsesmodul"
+
+#: src/sndio/sndio.c:172
+msgid "About Sndio Output Plugin"
+msgstr "Om Sndio Output-udvidelsesmodulet"
+
+#: src/sndio/sndio.c:173
+msgid ""
+"Sndio Output Plugin\n"
+"\n"
+"Written by Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Sndio Output-udvidelsesmodulet\n"
+"\n"
+"Skrevet af Thomas Pfaff <tpfaff@tp76.info>\n"
+
+#: src/sndio/sndio.c:248
+msgid "Unsupported format"
+msgstr "Format er ikke understøttet"
+
+#: src/sndio/sndio.c:249
+msgid ""
+"A format not supported by the audio device was requested.\n"
+"\n"
+"Please try again with the sndiod(1) server running."
+msgstr ""
+"Der blev forespurgt om et format der ikke understøttes af lydenheden.\n"
+"\n"
+"Prøv igen med sndiod(1)-serveren kørende."
+
+#: src/sndio/sndio.c:384
+msgid "sndio device"
+msgstr "sndio-enhed"
+
+#: src/sndio/sndio.c:400
+msgid "(empty means default)"
+msgstr "(tom er standard)"
+
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "O.k."
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Afbryd"
+
+#: src/song_change/song_change.c:54
+msgid "Song Change"
+msgstr "Sangændring"
+
+#: src/song_change/song_change.c:436
+msgid "Command to run when Audacious starts a new song."
+msgstr "Kommando der skal køres når Audacious starter en ny sang."
+
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
+msgid "Command:"
+msgstr "Kommando:"
+
+#: src/song_change/song_change.c:442
+msgid "Command to run toward the end of a song."
+msgstr "Kommando der skal køres mod slutningen af en sang."
+
+#: src/song_change/song_change.c:448
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr ""
+"Kommandoen der skal køres når Audacious når slutningen af afspilningslisten."
+
+#: src/song_change/song_change.c:454
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr ""
+"Kommando der skal køres når titlen ændres sig for en sang (dvs. titler for "
+"netværksudsendelser)."
+
+#: src/song_change/song_change.c:460
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command):\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%l: Length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr ""
+"Du kan bruge de følgende formatsternge som\n"
+"vil blive erstattet før kommandoen kaldes\n"
+"(ikke alle er nyttige til kommandoen for slut på afspilningslisten)\n"
+"\n"
+"%F: Frekvens (i hertz)\n"
+"%c: Antallet af kanaler\n"
+"%f: Filnavn (fuld sti)\n"
+"%l: Længde (i milllisekunder)\n"
+"%n eller %s: Sangnavn\n"
+"%r: Hastighed (i bit per sekund)\n"
+"%t: Afspilningslsitens position (%02d)\n"
+"%p: Afspiller i øjeblikket (1 eller 0)\n"
+"%a: Kunstner\n"
+"%b: Album\n"
+"%T: Nummerets titel"
+
+#: src/song_change/song_change.c:487
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr ""
+"Parametre sendt til skallen skal omsluttes af "
+"citationstegn. Alt andet er en sikkerhedsrisiko."
+
+#: src/song_change/song_change.c:498
+msgid "Commands"
+msgstr "Kommandoer"
+
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
+msgid "Speed and Pitch"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:226
+msgid "Speed:"
+msgstr "Hastighed:"
+
+#: src/speed-pitch/speed-pitch.c:229
+msgid "Pitch:"
+msgstr "Tonehøjde:"
+
+#: src/speed-pitch/speed-pitch.c:264
+msgid "Speed and Pitch"
+msgstr "Hastighed og tonehøjde"
+
+#: src/statusicon/statusicon.c:390
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+
+#: src/statusicon/statusicon.c:397
+msgid "Mouse Scroll Action"
+msgstr ""
+
+#: src/statusicon/statusicon.c:398
+msgid "Change volume"
+msgstr "Ændr lydstyrke"
+
+#: src/statusicon/statusicon.c:401
+msgid "Change playing song"
+msgstr "Ændr sang der afspilles"
+
+#: src/statusicon/statusicon.c:404
+msgid "Other Settings"
+msgstr "Andre indstillinger"
+
+#: src/statusicon/statusicon.c:405
+msgid "Disable the popup window"
+msgstr "Deaktiver pop op-vinduet"
+
+#: src/statusicon/statusicon.c:407
+msgid "Close to the system tray"
+msgstr ""
+
+#: src/statusicon/statusicon.c:409
+msgid "Advance in playlist when scrolling upward"
+msgstr "Gå fremad i afspilningslisten når der rulles opad"
+
+#: src/statusicon/statusicon.c:418
+msgid "Status Icon"
+msgstr "Statusikon"
+
+#: src/stereo_plugin/stereo.c:17
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+
+#: src/stereo_plugin/stereo.c:25
+msgid "Extra Stereo"
+msgstr "Ekstra stereo"
+
+#: src/stereo_plugin/stereo.c:36
+msgid "Extra Stereo"
+msgstr "Ekstra stereo"
+
+#: src/tonegen/tonegen.c:84
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.c:84
+msgid "Tone Generator: "
+msgstr "Tonegenerator:"
+
+#: src/tonegen/tonegen.c:197
+msgid ""
+"Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
+msgstr ""
+
+#: src/tonegen/tonegen.c:206
+msgid "Tone Generator"
+msgstr ""
+
+#: src/unix-io/unix-io.c:243
+msgid ""
+"File I/O Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
+msgstr ""
+
+#: src/unix-io/unix-io.c:266
+msgid "File I/O Plugin"
+msgstr "File I/O-udvidelsesmodul"
+
+#: src/voice_removal/voice_removal.c:58
+msgid "Voice Removal"
+msgstr "Stemmefjernelse"
+
+#: src/vorbis/vorbis.c:562
+msgid ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Based on the Xiph.org Foundation's Ogg Vorbis Plugin:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Original code by:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contributions from:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+
+#: src/vorbis/vorbis.c:582
+msgid "Ogg Vorbis Decoder"
+msgstr "Ogg Vorbis-afkoder"
+
+#: src/vtx/vtx.c:242
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+
+#: src/vtx/vtx.c:248
+msgid "VTX Decoder"
+msgstr "VTX-afkoder"
+
+#: src/wavpack/wavpack.c:282
+msgid "lossy (hybrid)"
+msgstr "kvalitetstab (hybrid)"
+
+#: src/wavpack/wavpack.c:284
+msgid "lossy"
+msgstr "kvalitetstab"
+
+#: src/wavpack/wavpack.c:334
+msgid ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
+msgstr ""
+
+#: src/wavpack/wavpack.c:341
+msgid "WavPack Decoder"
+msgstr "WavPack-afkoder"
+
+#: src/xsf/plugin.c:274
+msgid "2SF Decoder"
+msgstr "2SF-afkoder"
+
+#: src/xspf/xspf.c:440
+msgid "XML Shareable Playlists (XSPF)"
+msgstr "XML Shareable-afspilningslister (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - vælg fil"

audacious-plugins-3.3.4.tar.bz2/po/de.po -> audacious-plugins-3.4.2.tar.bz2/po/de.po Changed

@@ -1,593 +1,666 @@
 # German translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Maximilian Vesper <maximilian@mail.com>, 2013.
-# <mschwendt@fedoraproject.org>, 2012.
-# <ppt23@lkj.hopto.org>, 2012.
+# Cooligan <ppt23@lkj.hopto.org>, 2012
+# Maximilian Vesper <maximilian@mail.com>, 2013
+# mschwendt <mschwendt@fedoraproject.org>, 2012
+# mschwendt <mschwendt@fedoraproject.org>, 2012
+# Cooligan <ppt23@lkj.hopto.org>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2013-02-03 17:34+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-04 12:42+0000\n"
 "Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: German\n"
+"Language-Team: German (http://www.transifex.com/projects/p/audacious/"
+"language/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "Mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "Stereo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "Surround"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "AAC Dekodierer"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "Sequenziell"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib-Spieler)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "Ein Plugin, das genutzt werden kann, um zu\neiner bestimmten Zeit die Wiedergabe zu starten.\n\nUrsprünglich geschrieben von Adam Feakin und Daniel Stodden."
+msgstr ""
+"Ein Plugin, das genutzt werden kann, um zu\n"
+"einer bestimmten Zeit die Wiedergabe zu starten.\n"
+"\n"
+"Ursprünglich geschrieben von Adam Feakin und Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Dies ist dein Aufwach-Signal."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Alarm Einstellungen"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Uhrzeit"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "Stunden"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "Uhr"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Zeit\n"
+" Alarm um:\n"
+" Die Zeit, um die der Alarm ausgelöst wird.\n"
+"\n"
+" Still nach:\n"
+" Der Alarm wird nach dieser Zeit gestoppt.\n"
+" (sofern der Aufweck-Dialog nicht geschlossen wird)\n"
+"\n"
+"\n"
+"Tage\n"
+" Tag:\n"
+" Die Tage wählen, an denen der Alarm aktiviert wird.\n"
+"\n"
+" Zeit:\n"
+" Für jeden Tag einzeln die Zeit für den Alarm wählen\n"
+" oder den Alarm zur Standard-Zeit aktivieren.\n"
+"\n"
+"\n"
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "Minuten"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Lautstärke\n"
+" Übergang:\n"
+" Passt die Lautstärke an die gewählte Lautstärke\n"
+" in diesem Zeitraum an.\n"
+"\n"
+" Beginnen bei:\n"
+" Starte den Übergang bei dieser Lautstärke.\n"
+"\n"
+" Schluss:\n"
+" Die Lautstärke, bei der der Übergang stoppt.\n"
+" Falls die Übergangszeit 0 beträgt, wird die\n"
+" Wiedergabe schon mit dieser Lautstärke gestartet.\n"
+"\n"
+"\n"
+"Optionen:\n"
+" Zusätzlicher Befehl:\n"
+" Führe diesen Befehl bei Auslösung des Alarms aus.\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Still nach:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+" Wiedergabeliste:\n"
+" Lade diese Wiedergabeliste. Wenn keine Wiedergabeliste\n"
+" angegeben ist, wird die aktuelle verwendet.\n"
+" Die URL eines MP3-/OGG-Streams kann ebenso\n"
+" angegeben werden.\n"
+"\n"
+" Erinnerung:\n"
+" Zeige eine Erinnerung an, wenn der Alarm ausgelöst wird.\n"
+" Aktiviere dazu den Checkbutton und schreibe\n"
+" die Erinnerungsnachricht in die Textbox."
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Alarm um (Standard):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Dies ist dein Aufwach-Signal."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Tage wählen, an denen der Alarm ausgelöst werden soll"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Die Erinnerung für heute lautet..."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Standard"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Erinnerung"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Tag"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Montag"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Freitag"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Samstag"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Montag"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Alarm Einstellungen"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Uhrzeit"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Alarm um (Standard):"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "Uhr"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Still nach:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "Stunden"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "Minuten"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Tage wählen, an denen der Alarm ausgelöst werden soll"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Tag"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Standard"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Tage"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Übergang"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "Sekunden"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Lautstärke"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Momentan"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Beginnen bei"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Schluss"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Momentan"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Zusätzlicher Befehl"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "aktivieren"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Wiedergabeliste (optional)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Wiedergabeliste wählen"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Erinnerung"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Erinnerung benutzen"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Optionen"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Was bedeuten diese Einstellungen?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nZeit\n Alarm um: \n Die Zeit, um die der Alarm ausgelöst wird.\n\n Still nach: \n Der Alarm wird nach dieser Zeit gestoppt.\n (sofern der Aufweck-Dialog nicht geschlossen wird)\n\n\nTage\n Tag:\n Die Tage wählen, an denen der Alarm aktiviert wird.\n\n Zeit:\n Für jeden Tag einzeln die Zeit für den Alarm wählen\n oder den Alarm zur Standard-Zeit aktivieren.\n\n\nLautstärke\n Übergang: \n Passt die Lautstärke an die gewählte Lautstärke\n in diesem Zeitraum an.\n\n Beginnen bei: \n Starte den Übergang bei dieser Lautstärke.\n\n Schluss: \n Die Lautstärke, bei der der Übergang stoppt.\n Falls die Übergangszeit 0 beträgt, wird die\n Wiedergabe schon mit dieser Lautstärke gestartet.\n\n\nOptionen:\n Zusätzlicher Befehl:\n Führe diesen Befehl bei Auslösung des Alarms aus.\n\n Wiedergabeliste: \n Lade diese Wiedergabeliste zur Wiedergabe.\n Wenn keine Wiedergabeliste gegeben ist,\n werden die momentan in der\n Wiedergabeliste befindlichen Titel verwendet.\n Die URL eines MP3-/OGG-Streams kann ebenso\n angegeben werden.\n\n Erinnerung:\n Zeige eine Erinnerung an, wenn der Alarm ausgelöst wird.\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Hilfe"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Die Erinnerung für heute lautet.."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Danke"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Album Cover"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Standard-PCM-Gerät"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Standard-Mixer-Gerät"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
-msgstr "ALSA-Ausgabeplugin-Einstellungen"
+msgstr "ALSA-Ausgabeplugin Einstellungen"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "PCM-Gerät:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Mixer-Gerät:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Mixer-Element:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Workaround Drain-Hangup"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "ALSA Ausgabeplugin für Audacious\nCopyright 2009-2012 John Lindgren\n\nMein Dank geht an William Pitcock, Autor des ALSA Ausgabeplugins NG, dessen Code als Referenz gedient hat, wenn die ALSA Dokumentation nicht ausreichend war."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"ALSA Ausgabeplugin für Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"Mein Dank geht an William Pitcock, Autor des ALSA Ausgabeplugins NG, dessen "
+"Code als Referenz gedient hat, wenn die ALSA Dokumentation nicht ausreichend "
+"war."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "ALSA Ausgabe"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (MIDI-Spieler)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Du hast keinen einzigen Sequenz-Port für die MIDI-Wiedergabe angegeben. Dies kann in den MIDI-Plugin-Einstellungen getan werden."
+msgstr ""
+"Du hast keinen einzigen Sequenz-Port für die MIDI-Wiedergabe angegeben. Dies "
+"kann in den MIDI-Plugin Einstellungen getan werden."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI-Spieler)"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "ALSA-Backend "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Dieses Backend sendet MIDI Events an eine Gruppe von benutzerdefinierten ALSA Sequenzer-Ports. Das ALSA Sequenzer-Interface ist sehr vielseitig, es kann Ports sowohl für Hardware-Sequenzer (wie z.B. emu10k1) als auch für Software-Sequenzer und externe Geräte bereitstellen.\nDieses Backend erzeugt kein Audiomaterial, MIDI Events werden direkt von Geräten/Programmen verarbeitet. Zur Hardware gesendete MIDI Events werden also z.B. direkt abgespielt.\nBackend geschrieben von Giacomo Lozito."
+msgstr ""
+"Dieses Backend sendet MIDI Events an eine Gruppe von benutzerdefinierten "
+"ALSA Sequenzer-Ports. Das ALSA Sequenzer-Interface ist sehr vielseitig, es "
+"kann Ports sowohl für Hardware-Sequenzer (wie z.B. emu10k1) als auch für "
+"Software-Sequenzer und externe Geräte bereitstellen.\n"
+"Dieses Backend erzeugt kein Audiomaterial, MIDI Events werden direkt von "
+"Geräten/Programmen verarbeitet. Zur Hardware gesendete MIDI Events werden "
+"also z.B. direkt abgespielt.\n"
+"Backend geschrieben von Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "FluidSynth-Backend "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Diesed Backend erzeugt Audiomaterial durch Senden von MIDI Events an FluidSynth, ein Echtzeit-Software-Synthesizer basierend auf der SoundFont2 Spezifikation (www.fluidsynth.org).\nErzeugtes Audiomaterial kann via Effektplugins beeinflusst werden und wird vom ausgewähltem Ausgabeplugin weiterverarbeitet.\nBackend geschrieben von Giacomo Lozito."
+msgstr ""
+"Diesed Backend erzeugt Audiomaterial durch Senden von MIDI Events an "
+"FluidSynth, ein Echtzeit-Software-Synthesizer basierend auf der SoundFont2 "
+"Spezifikation (www.fluidsynth.org).\n"
+"Erzeugtes Audiomaterial kann via Effektplugins beeinflusst werden und wird "
+"vom ausgewähltem Ausgabeplugin weiterverarbeitet.\n"
+"Backend geschrieben von Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Port"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
-msgstr "Client-Name"
+msgstr "Benutzername"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Portname"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "ALSA-Ausgabe-Ports"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Soundkarte: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Mixersteuerung: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
-msgstr "Mixer-Einstellungen"
+msgstr "Mixer Einstellungen"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "ALSA-\nBackend"
+msgstr ""
+"ALSA-\n"
+"Backend"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - Backend-Information"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Backend-Auswahl"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
-msgstr "Wiedergabeeinstellungen"
+msgstr "Wiedergabe Einstellungen"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transponieren: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Drum-Shift: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Erweiterte Einstellungen"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "Länge von MIDI-Dateien in der Wiedergabeliste berechnen"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "Kommentare aus MIDI-Datei extrahieren (falls verfügbar)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "Liedtexte aus MIDI-Dateien extrahieren (falls verfügbar)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI-\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - Datei auswählen"
+msgstr ""
+"AMIDI-\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "AMIDI-Plug Einstellungen"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - SoundFont-Datei wählen"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "SoundFont Einstellungen"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Dateiname"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Größe (Bytes)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "SF beim Player-Start laden"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "SF beim Abspielen der ersten MIDI-Datei laden"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
-msgstr "Synthesizer-Einstellungen"
+msgstr "Synthesizer Einstellungen"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "Verstärkung"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "Standard benutzen"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "Wert:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "Polyfonie"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "Hall"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "Ja"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "Nein"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "Refrain"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "Abtastfrequenz"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "individuell"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "FluidSynth-\nBackend"
+msgstr ""
+"FluidSynth-\n"
+"Backend"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Name:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " MIDI Info "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Länge (ms):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Anzahl an Titeln:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "variabel"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (Wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Zeitmultiplex:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI Kommentare und Liedtexte "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* keine Kommentare in dieser MIDI-Datei verfügbar *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* keine Liedtexte in dieser MIDI-Datei verfügbar *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (ungültiges UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Über AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -608,7 +681,26 @@
 "\n"
 "Tony Vroon\n"
 "for the good help with alpha testing"
-msgstr "\nModularer MIDI Musikspieler\nhttp://www.develia.org/projects.php?p=amidiplug\n\ngeschrieben von Giacomo Lozito\n<james@develia.org>\n\nbesonderen Dank an...\n\nClemens Ladisch und Jaroslav Kysela\nfür ihre coolen Programme aplaymidi und amixer, welche\nneben der alsa-lib Dokumentation sehr hilfreich waren,\num mehr über die ALSA API zu erfahren\n\nAlfredo Spadafina\nfür das schöne MIDI Keyboard Logo\n\nTony Vroon\nfür die gute Hilfe beim Testen"
+msgstr ""
+"\n"
+"Modularer MIDI Musikspieler\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"geschrieben von Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"besonderen Dank an...\n"
+"\n"
+"Clemens Ladisch und Jaroslav Kysela\n"
+"für ihre coolen Programme aplaymidi und amixer, welche\n"
+"neben der alsa-lib Dokumentation sehr hilfreich waren,\n"
+"um mehr über die ALSA API zu erfahren\n"
+"\n"
+"Alfredo Spadafina\n"
+"für das schöne MIDI Keyboard Logo\n"
+"\n"
+"Tony Vroon\n"
+"für die gute Hilfe beim Testen"
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
@@ -651,7 +743,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Löst OSD aus, wenn sich während der Wiedergabe der Liedtitel ändert, aber der Dateiname gleich bleibt. Das ist hauptsächlich nützlich, um Titeländerungen bei Internetstreams anzuzeigen."
+msgstr ""
+"Löst OSD aus, wenn sich während der Wiedergabe der Liedtitel ändert, aber "
+"der Dateiname gleich bleibt. Das ist hauptsächlich nützlich, um "
+"Titeländerungen bei Internetstreams anzuzeigen."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -783,8 +878,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Composite-Manager nicht erkannt;\nSofern ein solcher nicht doch aktiv ist, bitte einen solchen aktivieren, ansonsten wird das OSD nicht funktionieren"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Composite-Manager nicht erkannt;\n"
+"Sofern ein solcher nicht doch aktiv ist, bitte einen solchen aktivieren, "
+"ansonsten wird das OSD nicht funktionieren"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -847,47 +946,47 @@
 msgid "Misc"
 msgstr "Verschiedenes"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "ASXv1/ASXv2 Wiedergabelisten"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious Wiedergabelisten (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Farbe"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Oszilloskop"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Bauer Stereofonisch-zu-Binaural Einstellungen"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Eingabepegel:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Grenzfrequenz:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Voreinstellungen:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Bauer Stereofonisch-zu-Binaural (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Spektrumanalysator"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -897,233 +996,247 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "Copyright (C) 2007-2012, Calin Crisan <ccrisan@gmail.com> und andere.\n\nVielen Dank an die libcdio-Entwickler <http://www.gnu.org/software/libcdio/>\nund die libcddb-Entwickler <http://libcddb.sourceforge.net/>.\n\nDanke auch an Tony Vroon für die Betreuung und die Hilfestellung.\n\nDas war ein Google Summer of Code 2007 Projekt."
+msgstr ""
+"Copyright (C) 2007-2012, Calin Crisan <ccrisan@gmail.com> und andere.\n"
+"\n"
+"Vielen Dank an die libcdio-Entwickler <http://www.gnu.org/software/libcdio/"
+">\n"
+"und die libcddb-Entwickler <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Danke auch an Tony Vroon für die Betreuung und die Hilfestellung.\n"
+"\n"
+"Das war ein Google Summer of Code 2007 Projekt."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Gerät"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Lesegeschwindigkeit:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Gerät überschreiben:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "CD-Text benutzen"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "CDDB benutzen"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "HTTP anstatt CDDBP benutzen"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Pfad:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Audio-CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Initialisieren des cdio Subsystems fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Ungültige URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Titel %d nicht gefunden."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Titel %d ist eine Datenspur."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Öffnen der Audioausgabe fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Fehler beim Lesen der Audio-CD."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Audio-CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Öffnen des CD-Laufwerks %s fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "Kein geeignetes CD-Laufwerk gefunden."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Abschließen der Initialisierung des CD-Laufwerks fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Abfragen der ersten/letzten Titelnummer fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Kann Start/Ende LSN für Titel %d nicht lesen."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Herstellen der CDDB Verbindung fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Abfragen des CDDB Servers fehlgeschlagen"
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Abfragen des CDDB Servers fehlgeschlagen: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Lesen der CDDB Information fehlgeschlagen: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Laufwerk ist leer."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Nicht unterstützter Disk-Typ."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "CD wiedergeben"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "CD hinzufügen"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Audio-CD Menu-Einträge"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Kompression"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Center Lautstärke:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Dynamischer Bereich:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Kompressor Plugin für Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Kompressor Plugin für Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Kompressor"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Spielekonsolen-Musik Dekodierer"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Allgemein"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Wiedergabe"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Bass:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "sek"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Höhe:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Standard-Liedlänge:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Resampling"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Audio-Resampling aktivieren"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Resampling-Frequenz:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Länge von SPC-Tags ignorieren"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Hall verstärken"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "Die standardmäßige Liedlänge (in Sekunden) wird für Lieder benutzt, die keine Längeninformation beinhalten (z.B. Lieder in einer Endlosschleife)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Die standardmäßige Liedlänge (in Sekunden) wird für Lieder benutzt, die "
+"keine Längeninformation beinhalten (z.B. Lieder in einer Endlosschleife)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1131,88 +1244,108 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "Dekodierer-Engine basierend auf Game_Music_Emu 0.5.2\nUnterstützte Formate: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n\nAudacious Plugin von:\nWilliam Pitcock <nenolod@dereferenced.org>\nShay Green <gblargg@gmail.com>"
+msgstr ""
+"Dekodierer-Engine basierend auf Game_Music_Emu 0.5.2\n"
+"Unterstützte Formate: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious Plugin von:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "Crossfading fehlgeschlagen, weil die Titel eine andere Anzahl an Kanälen hatten. Du kannst den Kanal-Mixer benutzen, um die Lieder auf die selbe Anzahl an Kanälen zu konvertieren."
+msgstr ""
+"Crossfading fehlgeschlagen, weil die Titel eine andere Anzahl an Kanälen "
+"hatten. Du kannst den Kanal-Mixer benutzen, um die Lieder auf die selbe "
+"Anzahl an Kanälen zu konvertieren."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Crossfading fehlgeschlagen, weil die Titel unterschiedliche Abtastraten hatten. Du kannst den Abtastraten-Konverter benutzen, um die Lieder auf die selbe Abtastrate zu resamplen."
+msgstr ""
+"Crossfading fehlgeschlagen, weil die Titel unterschiedliche Abtastraten "
+"hatten. Du kannst den Abtastraten-Konverter benutzen, um die Lieder auf die "
+"selbe Abtastrate zu resamplen."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Crossfade Plugin für Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Crossfade Plugin für Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Überschneiden:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intensität:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Cuesheet Plugin"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Echo"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Verzögerung:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Rückkopplung:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Lautstärke:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Echo Plugin\nVon Johan Levin, 1999\n\nSurround Echo von Carl van Schaik, 1999"
+msgstr ""
+"Echo Plugin\n"
+"Von Johan Levin, 1999\n"
+"\n"
+"Surround Echo von Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1220,9 +1353,15 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Multi-Format Audio-Decoding-Plugin für Audacious basierend\nauf dem FFmpeg Multimedia Framework (http://www.ffmpeg.org/)\n\nAudacious Plugin von:\nWilliam Pitcock <nenolod@nenolod.net>\nMatti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Multi-Format Audio-Decoding-Plugin für Audacious basierend\n"
+"auf dem FFmpeg Multimedia Framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious Plugin von:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg Plugin"
 
@@ -1290,7 +1429,20 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Dieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n\nDie Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n\nSie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
+msgstr ""
+"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der "
+"GNU General Public License, wie von der Free Software Foundation "
+"veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 "
+"der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n"
+"\n"
+"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen "
+"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die "
+"implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN "
+"BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n"
+"\n"
+"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem "
+"Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software "
+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1304,11 +1456,13 @@
 msgid "Joint Stereo"
 msgstr "Joint-Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1356,7 +1510,7 @@
 msgid "Error protection"
 msgstr "Fehlerschutz"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Qualität"
 
@@ -1436,542 +1590,624 @@
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis-Encoder-Konfiguration"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Qualitätsstufe (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "Verlustfrei"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Originaler Code von\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Originaler Code von\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "FLAC Dekodierer"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "GIO Plugin für Audacious\nCopyright 2009-2012 John Lindgren"
+msgstr ""
+"GIO Plugin für Audacious\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "GIO Plugin"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL Spektrumanalysator für Audacious\n"
+"Copyright 2013 Christophe Budé und John Lindgren\n"
+"\n"
+"Basierend auf dem XMMS Plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson und "
+"4Front Technologies\n"
+"\n"
+"Lizenz: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL Spektrumanalysator"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Gnome Tastenkürzel Plugin\nErmöglicht die Kontrolle von Audacious mit Gnome Tastenkürzeln.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"Gnome Tastenkürzel Plugin\n"
+"Ermöglicht die Kontrolle von Audacious mit Gnome Tastenkürzeln.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Gnome Tastenkürzel"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Titelnummer"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Titel"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Jahr"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Titel"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Genre"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Warteschlangen-Position"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Länge"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Dateipfad"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Benutzerdefinierter Titel"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Spalten auswählen"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Verfügbar:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Ausgewählt:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Links andocken"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Rechts andocken"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Oben andocken"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Unten andocken"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Abdocken"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Dateien öffnen ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "_URL öffnen ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "Dateien _hinzufügen ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "U_RL hinzufügen ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
-msgstr "Durch_suche Sammlung"
+msgstr "Durchsuche _Sammlung"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "_Info ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Einstellungen ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Wiedergeben"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "_Pause"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Stopp"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "_Vorheriger"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Nächster"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "Wieder_holen"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "_Zufällige Wiedergabe"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "Wiedergabeliste ni_cht weiterspielen"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "N_ach Titel stoppen"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Nach _diesem Titel stoppen"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "Titel-_Info ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Zu Z_eitangabe springen ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
-msgstr "Zu _Titel sp_ringen ..."
+msgstr "Zu _Titel springen ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Nach Titel_nummer"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Wiederholpunkt _A setzen"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Wiederholpunkt _B setzen"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "Wiederholpunkte _löschen"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Nach _Titel"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "Nach _Dateinamen"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "Nach Datei_pfad"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Nach Titel_nummer"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Nach _Künstler"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
 msgstr "Nach _Album"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Nach _Erscheinungsdatum"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "Nach _Länge"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Nach _Dateipfad"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Nach _benutzerdefiniertem Titel"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
-msgstr "V_ertausche Anordnung"
+msgstr "_Vertausche Anordnung"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
-msgstr "Zufällige Ano_rdnung"
+msgstr "_Zufällige Anordnung"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Wiedergabeliste abspielen"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Aktualisieren"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Nicht _verfügbare Dateien entfernen"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Sortieren"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Ausgewählte Sortieren"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "_Duplikate entfernen"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Nicht _verfügbare Dateien entfernen"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Neu"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "_Umbenennen ..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "S_chließen"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importieren ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Exportieren ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "_Wiedergabelisten-Manager ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Warte_schlangen-Manager ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "Lautstärke er_höhen"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "Lautstärke _verringern"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Equalizer"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_ffekte"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Interface"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Visualisierungen"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "_Menüleiste anzeigen"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "I_nfobereich anzeigen"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Vis_ualisierungen im Infobereich"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "_Statusleiste anzeigen"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Verbleibende _Zeit anzeigen"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Schließen-_Buttons anzeigen"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Spaltenüberschriften _anzeigen"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Spalten aus_wählen ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Mit Titelwechsel scrol_len"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Datei"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Wiedergabe"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "W_iedergabeliste"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "Di_enste"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Ausgabe"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "An_sicht"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "In/Aus _Warteschlange"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "Aus_schneiden"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "_Alles auswählen"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Umbenennen ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "GTK Interface"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Puffern ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Fehler"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d Kanal"
 msgstr[1] "%d Kanäle"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr "Vorheriger Titel"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Wiedergabe"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pause"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Stopp"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "Nächster Titel"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "5 Sek. vorspulen"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "5 Sekunden vorspulen"
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "5 Sek. zurückspulen"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
+msgstr "5 Sekunden zurückspulen"
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
 msgstr "Stumm"
 
-#: src/hotkey/gui.c:80
-msgid "Volume Up"
+#: src/hotkey/gui.c:78
+msgid "Volume up"
 msgstr "Lautstärke erhöhen"
 
-#: src/hotkey/gui.c:81
-msgid "Volume Down"
+#: src/hotkey/gui.c:79
+msgid "Volume down"
 msgstr "Lautstärke verringern"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
 msgstr "Zu Titel springen"
 
-#: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
 msgstr "Fenster anzeigen/verstecken"
 
-#: src/hotkey/gui.c:84
+#: src/hotkey/gui.c:82
 msgid "Show On-Screen-Display"
 msgstr "On-Screen-Display anzeigen"
 
-#: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
 msgstr "Wiederholen ein-/ausschalten"
 
-#: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
 msgstr "Zufällige Wiedergabe ein-/ausschalten"
 
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr "Nach diesem Titel stoppen ein-/ausschalten"
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
 msgstr "Fenster in den Vordergrund holen"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(keine)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Es wird nicht empfohlen die primären Maustasten hierfür zu benutzen.\n\nTrotzdem fortfahren?"
+msgstr ""
+"Es wird nicht empfohlen die primären Maustasten hierfür zu benutzen.\n"
+"\n"
+"Trotzdem fortfahren?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Maustastenkombinationen"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Globale Tastenkürzel Einstellungen"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Bitte eine Tastenkombination innerhalb eines Textfelds drücken.\nEs ist auch möglich, Maustasten zu verwenden."
+msgstr ""
+"Bitte eine Tastenkombination innerhalb eines Textfelds drücken.\n"
+"Es ist auch möglich, Maustasten zu verwenden."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Tastenkürzel:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Aktion:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Tastenkombination:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1984,104 +2220,130 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "Globale Tastenkürzel Plugin\nAudacious mit globalen Tastenkürzeln oder Multimediatasten bedienen.\n\nCopyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n\nMitwirkende:\nCopyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n Bryn Davies <curious@ihug.com.au>,\n Jonathan A. Davis <davis@jdhouse.org>,\n Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"Globale Tastenkürzel Plugin\n"
+"Audacious mit globalen Tastenkürzeln oder Multimediatasten bedienen.\n"
+"\n"
+"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Mitwirkende:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Globale Tastenkürzel"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Basierend auf xmms-jack, von Chris Morgan:\nhttp://xmms-jack.sourceforge.net/\n\nPortiert für Audacious von Giacomo Lozito"
+msgstr ""
+"Basierend auf xmms-jack, von Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Portiert für Audacious von Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "JACK Ausgabe"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s Einstellungen"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "LADSPA Einstellungen"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Modulpfade:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Trenne mehrere Pfade mit einem Doppelpunkt.\nDiese Pfade werden zusätzlich zum LADSPA_PATH durchsucht.\nNach dem Hinzufügen neuer Pfade Enter drücken, um neue Plugins zu suchen."
+msgstr ""
+"Trenne mehrere Pfade mit einem Doppelpunkt.\n"
+"Diese Pfade werden zusätzlich zum LADSPA_PATH durchsucht.\n"
+"Nach dem Hinzufügen neuer Pfade Enter drücken, um neue Plugins zu suchen.</"
+"small>"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Verfügbare Plugins:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Aktive Plugins:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "LADSPA Host für Audacious\nCopyright 2011 John Lindgren"
+msgstr ""
+"LADSPA Host für Audacious\n"
+"Copyright 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "LADSPA Host"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: konnte LIRC Unterstützung nicht initialisieren\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: konnte LIRC Konfigurationsdatei nicht lesen\n%s: lies bitte in der Dokumentation von LIRC\n%s: wie man eine korrekte Datei erstellt\n"
+msgstr ""
+"%s: konnte LIRC Konfigurationsdatei nicht lesen\n"
+"%s: lies bitte in der Dokumentation von LIRC\n"
+"%s: wie man eine korrekte Datei erstellt\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: versuche neu zu verbinden...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: unbekannter Befehl \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: von LIRC getrennt\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: versuche jede %d Sekunden neu zu verbinden...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2095,155 +2357,324 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "Ein einfaches Plugin, um Audacious über den LIRC Daemon zu steuern\n\nPortiert für Audacious von:\nTony Vroon <chainsaw@gentoo.org>\nJoonas Harjumäki <jharjuma@gmail.com>\n\nBasierend auf dem XMMS LIRC Plugin von:\nCarl van Schaik <carl@leg.uct.ac.za>\nChristoph Bartelmus <xmms@bartelmus.de>\nAndrew O. Shadoura <bugzilla@tut.by>\n\nFür weitere Informationen über LIRC, besuche http://lirc.org."
+msgstr ""
+"Ein einfaches Plugin, um Audacious über den LIRC Daemon zu steuern\n"
+"\n"
+"Portiert für Audacious von:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Basierend auf dem XMMS LIRC Plugin von:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Für weitere Informationen über LIRC, besuche http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Verbindung"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Zum LIRC Server wiederverbinden"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Zeitspanne bis zum Wiederverbinden:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "LIRC Plugin"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Keine Liedtexte verfügbar"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Abrufen von %s nicht möglich"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Parsen von %s nicht möglich"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Suche nach Liedtexten ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Fehlende Titel-Metadaten"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Verbinde zu lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki Plugin"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "M3U Wiedergabelisten"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takt-Generator: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takt-Generator: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "Ein Takt-Generator von Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nUm ihn zu benutzen, füge eine URL hinzu: tact://Schläge*Zähler/Nenner\nz.B. tact://77 zum Spielen von 77 Schlägen pro Minute\noder tact://60*3/4 zum Spielen von 60 bpm im 3/4-Takt"
+msgstr ""
+"Ein Takt-Generator von Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Um ihn zu benutzen, füge eine URL hinzu: tact://Schläge*Zähler/Nenner\n"
+"z.B. tact://77 zum Spielen von 77 Schlägen pro Minute\n"
+"oder tact://60*3/4 zum Spielen von 60 bpm im 3/4-Takt"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Takt-Generator"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Kanal-Mixer Plugin für Audacious\nCopyright 2011-2012 John Lindgren und Michał Lipski"
+msgstr ""
+"Kanal-Mixer Plugin für Audacious\n"
+"Copyright 2011-2012 John Lindgren und Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Kanal-Mixer"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Ausgabe-Kanäle:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Kanal-Mixer"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "MMS Plugin"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Auflösung"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-Bit"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-Bit"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Kanäle"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Resampling"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Nächstliegend (am schnellsten)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Linear (schnell)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Spline (gute Qualität)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Polyphase (beste Qualität)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Abtastfrequenz"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Pegel:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Grenzfrequenz:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Hall"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Bassverstärkung"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Surround"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Vorverstärkung"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Sonstiges"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Oversampling"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Geräuschreduktion"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Amiga MOD abspielen"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Wiederholen"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Wiederholzahl:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Für eine endlose Wiederholung, den obigen Wert auf -1 setzen."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Modul-Spieler)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "MPG123 Plugin"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 Server"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Gestoppt"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious spielt gerade nichts ab."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Desktop-Benachrichtigungen Plugin für Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren und Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Basierend auf libnotify-aosd von Maximilian Bogner:\nhttp://www.mbogner.de/projects/libnotify-aosd/\n\nCopyright (C) 2010 Maximilian Bogner\nCopyright (C) 2011 John Lindgren\n\nDieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n\nDie Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n\nSie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
+"Dieses Plugin ist freie Software. Sie können es unter den Bedingungen der "
+"GNU General Public License, wie von der Free Software Foundation "
+"veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 3 "
+"der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n"
+"\n"
+"Die Veröffentlichung dieses Plugins erfolgt in der Hoffnung, dass es Ihnen "
+"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die "
+"implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN "
+"BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n"
+"\n"
+"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem "
+"Programm erhalten haben. Falls nicht, siehe <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Bedienelemente für Wiedergabe anzeigen"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Benachrichtigungen immer anzeigen"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Desktop-Benachrichtigungen"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Anzeigen"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pause"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Nächster"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Standardgerät"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Audiogerät:"
 
@@ -2268,22 +2699,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "OSS4 Ausgabeplugin für Audacious\nCopyright 2010-2012 Michał Lipski\n\nIch möchte den Personen auf #audacious danken, vor allem Tony Vroon und John Lindgren sowie natürlich den Autoren des bisherigen OSS Plugins."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"OSS4 Ausgabeplugin für Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"Ich möchte den Personen auf #audacious danken, vor allem Tony Vroon und John "
+"Lindgren sowie natürlich den Autoren des bisherigen OSS Plugins."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "OSS4 Ausgabe"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "PLS Wiedergabelisten"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 Dekodierer"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2301,162 +2738,242 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Audacious PulseAudio Ausgabeplugin\n\nDieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n\nDie Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n\nSie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
+msgstr ""
+"Audacious PulseAudio Ausgabeplugin\n"
+"\n"
+"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der "
+"GNU General Public License, wie von der Free Software Foundation "
+"veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 "
+"der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n"
+"\n"
+"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen "
+"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die "
+"implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN "
+"BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n"
+"\n"
+"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem "
+"Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software "
+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "PulseAudio Ausgabe"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Abtastraten-Konverter Plugin für Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Abtastraten-Konverter Plugin für Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Überspringen/Wiederholen der Samples"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Lineare Interpolation"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Schnelle Sinc-Interpolation"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Mittlere Sinc-Interpolation"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Beste Sinc-Interpolation"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Konvertierung"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Abtastrate:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Rate Mappings"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Nutze Rate-Mappings"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Abtastraten-Konverter"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Passwort ändern"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "OK. Scrobbeln für Profil: %s"
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Dienste"
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Zugriff verweigert"
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Besuche den folgenden Link, um Audacious das Scrobbeln deiner Titel zu "
+"erlauben:"
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Benutzername:"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Lasse das Fenster geöffnet und klicke erneut auf «Berechtigung überprüfen».\n"
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Passwort:"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"Keine Sorge, deine Scrobbels sind auf deinem Computer gespeichert.\n"
+"Sie werden übermittelt, sobald Audacious die Berechtigung dazu hat."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Netzwerkproblem."
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+"Es gab ein Problem bei der Verbindung zu Last.fm. Bitte später nochmals "
+"probieren."
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Überprüfen..."
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "Scrobbler-URL:"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "_Berechtigung überprüfen"
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "Berechtigung _entziehen"
+
+#: src/scrobbler2/config_window.c:221
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Du musst Audacious erlauben, Titel zu deinem Last.fm Profil scrobbeln zu "
+"dürfen.\n"
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Das Scrobbler Plugin konnte nicht gestartet werden.\n"
+"Es könnte sich dabei um ein Installationsproblem handeln."
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Audacious Scrobbler Plugin 2.0 von Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Danke an John Lindgren für die anfängliche Hilfe bei diesem Projekt.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Audacious AudioScrobbler Plugin\n\nUrsprünglich geschrieben von:\nAudun Hove <audun@nlc.no>\nPipian <pipian@pipian.com>"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
 
-#: src/sdlout/plugin.c:27
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious benutzt jetzt die verbesserte Version des Last.fm Scrobblers.\n"
+"Bitte prüfe die Einstellungen für das Scrobbler Plugin."
+
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "SDL Ausgabeplugin für Audacious\nCopyright 2010 John Lindgren"
+msgstr ""
+"SDL Ausgabeplugin für Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "SDL Ausgabe"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Sammlung"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Unbekannter Künstler"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Unbekannes Album"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\n aus %s von %s"
+msgstr ""
+"%s\n"
+" aus %s von %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d Album"
 msgstr[1] "%d Alben"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2464,10 +2981,14 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d Titel"
-msgstr[1] "%s\n %s, %d Titel"
+msgstr[0] ""
+"%s\n"
+" %s, %d Titel"
+msgstr[1] ""
+"%s\n"
+" %s, %d Titel"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2475,78 +2996,84 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d Titel von %s"
-msgstr[1] "%s\n %d Titel von %s"
+msgstr[0] ""
+"%s\n"
+" %d Titel von %s"
+msgstr[1] ""
+"%s\n"
+" %d Titel von %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "Wiedergabeliste _erstellen"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "Zur Wiedergabeliste _hinzufügen"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Durchsuche Sammlung"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Wähle einen Ordner und klicke auf \"Aktualisieren\", um deine Musiksammlung in Audacious zu importieren."
+msgstr ""
+"Wähle einen Ordner und klicke auf «Aktualisieren», um deine Musiksammlung in "
+"Audacious zu importieren."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Bitte warten ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Ordner auswählen"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Suchwerkzeug"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Winamp Interface"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Hauptfenster:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Hauptfenster-Schrift auswählen:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Wiedergabeliste:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Wiedergabelisten-Schrift auswählen:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
-msgstr "Schriftarten"
+msgstr "Schri_ftarten"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Benutze Bitmap-Schriftarten (nur ASCII-Unterstützung)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Titel in beide Richtungen scrollen"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Skin"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
-msgstr "Interface-Einstellungen"
+msgstr "Interface Einstellungen"
 
 #: src/skins/ui_equalizer.c:328
 msgid "Preamp"
@@ -2600,7 +3127,7 @@
 msgid "Presets"
 msgstr "Standard"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Voreinstellungen laden"
 
@@ -2613,7 +3140,7 @@
 msgid "Load equalizer preset"
 msgstr "Equalizer-Voreinstellungen laden"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Speichere Voreinstellungen"
 
@@ -2625,7 +3152,7 @@
 msgid "Save equalizer preset"
 msgstr "Equalizer-Voreinstellungen speichern"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Lösche Voreinstellungen"
 
@@ -2633,739 +3160,752 @@
 msgid "Delete auto-preset"
 msgstr "Lösche automatische Voreinstellungen"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Suche nach %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Lautstaerke: (%d%%)"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% links"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Balance: Mitte"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% rechts"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Optionen"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "'Immer im Vordergrund' aus"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "'Immer im Vordergrund' an"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Dateiinformationen"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Visualisierungs-Menü"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Single-Modus."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Wiedergabelistenmodus."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Nach Titel stoppen."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Nicht nach Titel stoppen."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Wiederholpunkt A gesetzt."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Wiederholpunkt B gesetzt."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Wiederholpunkte geloescht."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Autoscrollen des Titelnamens"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Nach aktuellem Titel stoppen"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Spitzen"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Wiederholen"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Zufällige Wiedergabe"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Wiedergabeliste nicht weiterspielen"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Hauptfenster anzeigen"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Wiedergabelisten-Editor anzeigen"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Equalizer anzeigen"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Immer im Vordergrund"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Auf allen Arbeitsflächen"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Hauptfenster aufrollen"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Wiedergabelisten-Editor aufrollen"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Equalizer aufrollen"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analysator"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Oszilloskop"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Spektrogramm"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Aus"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Feuer"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Vertikale Linien"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Linien"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Balken"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Punkte"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Linien"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Beständig"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Eis"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Weich"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Am langsamsten"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Langsam"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Schnell"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Am schnellsten"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Verstrichene Zeit"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Verbleibende Zeit"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pause"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Vorheriger"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Nächster"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Visualisierung"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Visualisierungs-Modus"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Analysator-Modus"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Oszilloskop-Modus"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Spektrogramm-Modus"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "WindowShadeVU-Modus"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Analysator-Fallgeschwindigkeit"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Spitzen-Fallgeschwindigkeit"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Wiedergabeliste"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Wiedergabeliste abspielen"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Neue Wiedergabeliste"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Nächste Wiedergabeliste wählen"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Vorherige Wiedergabeliste wählen"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Wiedergabeliste löschen"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Wiedergabeliste importieren"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Lade Wiedergabeliste in ausgewählte Wiedergabeliste."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Wiedergabeliste exportieren"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Ausgewählte Wiedergabelisten speichern."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Liste aktualisieren"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Metadaten aktualisieren."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Wiedergabelisten-Manager"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Warteschlangen-Manager"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Ansicht"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Interface"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
-msgstr "Interface-Einstellungen ..."
+msgstr "Interface Einstellungen ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Internetadresse hinzufügen..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Entfernter Titel hinzufügen."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Dateien hinzufügen..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Fügt Dateien in Wiedergabeliste ein."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Suchen und Auswählen"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "Wiedergabeliste nach bestimmte Suchkriterien durchsuchen lassen."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Auswahl invertieren"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Invertiere alle Einträge."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Wähle alle Einträge aus."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Keine auswählen"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Alle ausgewählten Einträge abwählen."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Alle entfernen"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Entfernt alle Warteschlangeneinträge."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Warteschlange löschen"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Zugehörige Warteschlange der Wiedergabeliste entfernen."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Nicht verfügbare Dateien entfernen"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Enfernt alle nicht verfügbaren Dateien aus der Liste."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Duplikate entfernen"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Nach Titel"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Duplikate nach Titel entfernen."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Nach Dateinamen"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Duplikate nach Dateinamen entfernen."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Nach Pfad + Dateinamen"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Duplikate nach vollem Pfad entfernen."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Nicht ausgewählte entfernen"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Entferne nicht ausgewählte Titel."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Auswahl entfernen"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Ausgewählte Wiedergabelisteneinträge entfernen."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Liste zufällig anordnen"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Ordne Liste zufällig an."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Liste umkehren"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Wiedergabeliste umkehren."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Liste sortieren"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Sortiere Liste nach Titel."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Nach Album"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Sortiere Liste nach Album."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Nach Künstler"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Sortiere Liste nach Künstler."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Sortiere Liste nach Dateiname."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Sortiere Liste nach Pfadnamen."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Nach Datum"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Sortiere Liste nach Modifizierungszeitpunkt."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Nach Titelnummer"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Sortiere Liste nach Titelnummer."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Ausgewählte Sortieren"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Datei"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Plugin-Dienste"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Zeige Titeldetails"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Zeige Titeldetails"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Über Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Datei abspielen"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Datei laden und abspielen"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Internetadresse spielen"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Medien von bestimmter Adresse abspielen"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Plugin-Dienste"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Einstellungen anzeigen"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Audacious beenden"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "A-B setzen"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "A-B leeren"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Zu Titel springen"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Zu Zeitangabe springen"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "In/aus Warteschlange"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Eintrag in der Warteschlange aktivieren/deaktivieren."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Einfügen"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Laden"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importieren"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Speichern"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Voreinstellung"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Voreinstellungen automatisch laden"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Voreinstellungen laden"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Standardwerte in Equalizer laden"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Null"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Equalizer Einstellungen auf Null setzen"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Aus Datei"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Standardwerte aus Datei laden"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Aus einer WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Lade Standard aus WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP Standard"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importiere WinAMP Standard"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Speichere"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Standardwerte speichern"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "in Datei"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Speichere in Datei"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "in WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Speichere in WinAMP-EQF-Datei"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Lösche Voreinstellungen"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Suche Einträge in aktiver Wiedergabeliste"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Wähle Einträge in der Wiedergabeliste durch Ausfüllen eines oder mehrerer Eingabefelder aus. Diese nutzen reguläre Ausdrücke, unterscheiden Groß- und Kleinschreibung aber nicht. Falls du nicht weißt, wie reguläre Ausdrücke funktionieren, gebe einfach nur einen Teilbegriff für deine Suche ein."
+msgstr ""
+"Wähle Einträge in der Wiedergabeliste durch Ausfüllen eines oder mehrerer "
+"Eingabefelder aus. Diese nutzen reguläre Ausdrücke, unterscheiden Groß- und "
+"Kleinschreibung aber nicht. Falls du nicht weißt, wie reguläre Ausdrücke "
+"funktionieren, gebe einfach nur einen Teilbegriff für deine Suche ein."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Titel: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Künstler: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Dateiname: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Vorherige Auswahl vor dem Suchen löschen"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Automatisch zwischen passenden Einträgen wechseln"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Erstelle neue Wiedergabeliste mit passenden Einträgen"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Audacious Wiedergabelisten-Editor"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d von %d)"
@@ -3383,81 +3923,123 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Konnte Ordner nicht erstellen (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Basierend auf dem xmms_sndfile Plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Portiert für Audacious von Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Basierend auf dem xmms_sndfile Plugin:\nCopyright (C) 2000, 2002 Erik de Castro Lopo\n\nPortiert für Audacious von Tony Vroon <chainsaw@gentoo.org>\n\nDieses Programm ist freie Software. Sie können es unter den Bedingungen der GNU General Public License, wie von der Free Software Foundation veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n\nDie Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n\nSie sollten ein Exemplar der GNU General Public License zusammen mit diesem Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
+"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der "
+"GNU General Public License, wie von der Free Software Foundation "
+"veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2 "
+"der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n"
+"\n"
+"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen "
+"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die "
+"implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN "
+"BESTIMMTEN ZWECK. Details finden Sie in der GNU General Public License.\n"
+"\n"
+"Sie sollten ein Exemplar der GNU General Public License zusammen mit diesem "
+"Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software "
+"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Sndfile Plugin"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Über Sndio Ausgabe Plugin"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Sndio Ausgabe Plugin\n\nGeschrieben von Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Sndio Ausgabeplugin\n"
+"\n"
+"Geschrieben von Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Nicht unterstütztes Format"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Ein Format, das nicht vom Audiogerät unterstützt wird, wurde angefordert.\n\nBitte versuche es erneut mit einem laufenden sndiod(1) Server."
+msgstr ""
+"Ein Format, das nicht vom Audiogerät unterstützt wird, wurde angefordert.\n"
+"\n"
+"Bitte versuche es erneut mit einem laufenden sndiod(1) Server."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "sndio Gerät"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(Leer bedeutet Standard)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Titelwechsel"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Auszuführender Befehl, wenn Audacious einen neuen Titel startet."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Befehl:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Auszuführender Befehl am Ende eines Titels."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Auszuführender Befehl am Ende der Wiedergabeliste."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Auszuführender Befehl, wenn sich der Titel eines Lieds ändert (z.B. bei Netzwerk-Streams)."
+msgstr ""
+"Auszuführender Befehl, wenn sich der Titel eines Lieds ändert (z.B. bei "
+"Netzwerk-Streams)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3474,35 +4056,91 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Verwendbar sind folgende Zeichenketten, die ersetzt\n werden, bevor ein Befehl aufgerufen wird\n(es sind jedoch nicht alle nützlich für den Ende-der-Wiedergabeliste-Befehl):\n\n%F: Frequenz (in Hertz)\n%c: Anzahl der Kanäle\n%f: Dateiname (absoluter Pfad)\n%l: Länge (in Millisekunden)\n%n oder %s: Titel\n%r: Bitrate (in Bits pro Sekunde)\n%t: Wiedergabelisten-Position (%02d)\n%p: Wiedergabe momentan aktiv? (1 oder 0)\n%a: Künstler\n%b: Album\n%T: Titelname"
+msgstr ""
+"Verwendbar sind folgende Zeichenketten, die ersetzt\n"
+" werden, bevor ein Befehl aufgerufen wird\n"
+"(es sind jedoch nicht alle nützlich für den Ende-der-Wiedergabeliste-"
+"Befehl):\n"
+"\n"
+"%F: Frequenz (in Hertz)\n"
+"%c: Anzahl der Kanäle\n"
+"%f: Dateiname (absoluter Pfad)\n"
+"%l: Länge (in Millisekunden)\n"
+"%n oder %s: Titel\n"
+"%r: Bitrate (in Bits pro Sekunde)\n"
+"%t: Wiedergabelisten-Position (%02d)\n"
+"%p: Wiedergabe momentan aktiv? (1 oder 0)\n"
+"%a: Künstler\n"
+"%b: Album\n"
+"%T: Titelname"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Parameter sollten zwischen Anführungszeichen stehen, ohne besteht ein Sicherheitsrisiko."
+msgstr ""
+"Parameter sollten zwischen Anführungszeichen stehen, ohne "
+"besteht ein Sicherheitsrisiko."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Befehle"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"SoX Resampler Plugin für Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Basierend auf dem Abtastraten-Konverter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Schnell"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Niedrig"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Hoch"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Sehr hoch"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Qualität:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "SoX Resampler"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Geschwindigkeit und Tonhöhe"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Geschwindigkeit:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Tonhöhe:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Geschwindigkeit und Tonhöhe"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3511,94 +4149,114 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "Status Icon Plugin\n\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nDieses Plugin stellt ein Status-Icon bereit, welches\nin der Taskleiste des Fenstermanagers angezeigt wird."
+msgstr ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Dieses Plugin stellt ein Status-Icon bereit, welches\n"
+"in der Taskleiste des Fenstermanagers angezeigt wird."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Maus-Scroll-Aktion"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Lautstärke ändern"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Aktiven Titel ändern"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Andere Einstellungen"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "PopUp-Fenster deaktivieren"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "In die Taskleiste minimieren"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Durch Hochscrollen in Wiedergabeliste fortschreiten"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Status Icon"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Extra Stereo Plugin\n\nVon Johan Levin, 1999"
+msgstr ""
+"Extra Stereo Plugin\n"
+"\n"
+"Von Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Ton-Generator: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "Sinuston-Generator von Håvard Kvålen <havardk@xmms.org>\nModifiziert von Daniel J. Peng <danielpeng@bigfoot.com>\n\nUm ihn zu benutzen, füge eine URL hinzu:\ntone://frequenz1;frequenz2;frequenz3;...\nz.B. tone://2000;2005 für einen Ton mit 2000 Hz und einen mit 2005 Hz"
+msgstr ""
+"Sinuston-Generator von Håvard Kvålen <havardk@xmms.org>\n"
+"Modifiziert von Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Um ihn zu benutzen, füge eine URL hinzu:\n"
+"tone://frequenz1;frequenz2;frequenz3;...\n"
+"z.B. tone://2000;2005 für einen Ton mit 2000 Hz und einen mit 2005 Hz"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Ton-Generator"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "Datei E/A Plugin für Audacious\nCopyright 2009-2012 John Lindgren\n\nDIESES PLUGIN WIRD BENÖTIGT. NICHT DEAKTIVIEREN."
+msgstr ""
+"Datei E/A Plugin für Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"DIESES PLUGIN WIRD BENÖTIGT. NICHT DEAKTIVIEREN."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Datei E/A Plugin"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Stimmenaufhebung"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3617,46 +4275,75 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Audacious Ogg Vorbis Dekodierer\n\nBasierend auf dem Ogg Vorbis Plugin der Xiph.org Foundation:\nhttp://www.xiph.org/\n\nOriginal-Code von:\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nBeiträge von:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Audacious Ogg Vorbis Dekodierer\n"
+"\n"
+"Basierend auf dem Ogg Vorbis Plugin der Xiph.org Foundation:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Original-Code von:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Beiträge von:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis Dekodierer"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr "Vortex-Dateiformat-Spieler von Sashnov Alexander <sashnov@ngs.ru>\nBasierend auf in_vtx.dll von Roman Sherbakov <v_soft@microfor.ru>\nAudacious Plugin von Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Vortex-Dateiformat-Spieler von Sashnov Alexander <sashnov@ngs.ru>\n"
+"Basierend auf in_vtx.dll von Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious Plugin von Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "VTX Dekodierer"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "Verlustbehaftet (Hybrid)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "Verlustbehaftet"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n\nEin Teil des Plugin-Codes ist von Miles Egan."
+msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Ein Teil des Plugin-Codes ist von Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "WavPack Dekodierer"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "2SF Dekodierer"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Wiedergabelisten (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - Datei wählen"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "_Auswahl sortieren"

audacious-plugins-3.3.4.tar.bz2/po/el.po -> audacious-plugins-3.4.2.tar.bz2/po/el.po Changed

@@ -1,591 +1,594 @@
 # Greek translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2012.
+# noskamaru <jim.thomas.zks@gmail.com>, 2013
+# noskamaru <jim.thomas.zks@gmail.com>, 2013
+# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-16 23:46+0000\n"
-"Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: Greek\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-08-30 00:36+0000\n"
+"Last-Translator: Γιάννης Ανθυμίδης <yannanth@gmail.com>\n"
+"Language-Team: Greek (http://www.transifex.com/projects/p/audacious/language/"
+"el/)\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "μονοφωνικό"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "στερεοφωνικό"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
-msgstr "περιβάλλων"
+msgstr "περιφερειακό"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Αποκωδικοποιητής AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr ""
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Αναπαραγωγή AdLib)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Ξυπνητήρι"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
 msgstr ""
 
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "Εντάξει"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Ρυθμίσεις Ξυπνιτηριού"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Χρόνος"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "ώρες"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "ώ"
-
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "λεπτά"
-
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Σίγαση μετά από"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Διαλέξτε τις ημέρες που θα χτυπήσει το ξυπνιτήρι"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Αυτή είναι η κλήση αφύπνισης."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Προεπιλογή"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Η υπενθύμιση σας για σήμερα είναι..."
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Ημέρα"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Υπενθύμιση"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Δευτέρα"
+
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Κυριακή"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Δευτέρα"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Ρυθμίσεις Ξυπνιτηριού"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Χρόνος"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Κτύπα στις (προεπιλογή):"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "ώ"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Σίγαση μετά από"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "ώρες"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "λεπτά"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Διαλέξτε τις ημέρες που θα χτυπήσει το ξυπνητήρι"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Ημέρα"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Προεπιλογή"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Ημέρες"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
-msgstr ""
+msgstr "Ξεθωριάζει"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "δευτερόλεπτα"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Ένταση"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr ""
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
-msgstr ""
-
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
+msgstr "Ξεκινάει στις"
 
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
-msgstr ""
+msgstr "Τελικό"
+
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Τωρινό"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Επιπλέον Εντολή"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "ενεργοποίηση"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Λίστα αναπαραγωγής (προαιρετική)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Επιλέξτε μια λίστα αναπαραγωγής"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Υπενθύμιση"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Χρήση υπενθύμισης"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Επιλογές"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Τι σημαίνουν αυτές οι επιλογές;"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Βοήθεια"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Η υπενθύμισή σας για σήμερα είναι..."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr ""
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
-msgstr ""
+msgstr "Εξώφυλλο Άλμπουμ"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
-msgstr ""
+msgstr "Προεπιλεγμένη συσκευή PCM "
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
-msgstr ""
+msgstr "Προεπιλεγμένη συσκευή μείκτη"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
-msgstr ""
+msgstr "Προτιμήσεις Εξόδου Πρόσθετου ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
-msgstr ""
+msgstr "Συσκευή PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Συσκευή μείκτη:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
-msgstr ""
+msgstr "Στοιχείο μείκτη:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
-msgstr ""
+msgstr "Έξοδος ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
 msgstr ""
+"Δεν έχετε επιλέξει καμμία ακολουθία θυρών για την αναπαραγωγή MIDI αρχείων."
+"Μπορείτε να το επιλέξετε στις ρυθμίσεις του MIDI προσθέτου"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
-msgid "ALSA Backend "
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
+msgid "ALSA Backend "
+msgstr "Σύστημα υποστήριξης ALSA "
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr ""
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Θύρα"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
-msgstr ""
+msgstr "Όνομα πελάτη"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Όνομα θύρας"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
-msgstr ""
+msgstr "Θύρες εξόδου ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Κάρτα ήχου: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
-msgstr "Έλεγχος Μείκτη:"
+msgstr "Έλεγχος μείκτη:"
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
-msgstr "Ρυθμίσεις Μείκτη"
+msgstr "Ρυθμίσεις μείκτη"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
 msgstr ""
+"Σύστημα υποστήριξης\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
-msgstr ""
+msgstr "AMIDI-Plug - πληροφορίες συστήματος υποστήριξης"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
-msgstr ""
+msgstr "Επιλογή συστήματος υποστήριξης"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
-msgstr ""
+msgstr "Ρυθμίσεις αναπαραγωγής"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
-msgstr ""
+msgstr "Μεταφορά: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
-msgstr ""
+msgstr "Ρυθμίσεις για προχωρημένους"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
 msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr ""
-
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
-msgstr ""
+msgstr "AMIDI-Plug Ρυθμίσεις"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr ""
+msgstr "AMIDI-Plug - επιλέξτε αρχείο SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
-msgstr ""
+msgstr "Ρυθμίσεις SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Όνομα αρχείου"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
-msgstr "Μέγεθος (bytes)"
+msgstr "Μέγεθος (byte)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
-msgstr ""
+msgstr "Φόρτωση SF κατά την έναρξη του αναπαραγωγέα"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
-msgstr ""
+msgstr "Φόρτωση SF κατά την πρώτη αναπαραγωγή αρχείου MIDI"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
-msgstr ""
+msgstr "Ρυθμίσεις synthesizer"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
-msgstr ""
+msgstr "αποκτά"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
-msgstr "χρήση προεπιλεγμένου"
+msgstr "χρήση προεπιλογής"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "τιμή:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "πολυφωνία"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
-msgstr ""
+msgstr "αντήχηση"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "ναι"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "όχι"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
-msgstr ""
+msgstr "ρεφρέν"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
-msgstr ""
+msgstr "ρυθμός δείγματος"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
-msgstr "προσαρμοσμένο"
+msgstr "προσαρμοσμένο "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
 msgstr ""
+"Σύστημα υποστήριξης\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
-msgstr ""
+msgstr " Πληροφορίες MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Μορφή:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Μήκος (ms):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
-msgstr ""
+msgstr "Αρ. Κομματιών"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
-msgstr ""
+msgstr "μεταβλητή"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
-msgstr " Σχόλεια και Στοίχοι MIDI "
+msgstr " Σχόλια και Στοίχοι MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* δεν υπάρχουν σχόλια σε αυτό το αρχείο MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* δεν υπάρχουν στοίχοι σε αυτό το αρχείο MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (μη έγκυρο UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Σχετικά με το AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr ""
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -634,7 +637,7 @@
 
 #: src/aosd/aosd_trigger.c:74
 msgid "Playback Start"
-msgstr ""
+msgstr "Έναρξη αναπαραγωγής"
 
 #: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
@@ -669,7 +672,7 @@
 
 #: src/aosd/aosd_ui.c:168
 msgid "Placement"
-msgstr ""
+msgstr "Τοποθέτηση"
 
 #: src/aosd/aosd_ui.c:200
 msgid "Relative X offset:"
@@ -685,7 +688,7 @@
 
 #: src/aosd/aosd_ui.c:225
 msgid "Multi-Monitor options"
-msgstr ""
+msgstr "Επιλογές για πολλαπλές οθόνες"
 
 #: src/aosd/aosd_ui.c:229
 msgid "Display OSD using:"
@@ -693,12 +696,12 @@
 
 #: src/aosd/aosd_ui.c:231
 msgid "all monitors"
-msgstr ""
+msgstr "όλες οι οθόνες"
 
 #: src/aosd/aosd_ui.c:234
 #, c-format
 msgid "monitor %i"
-msgstr ""
+msgstr "οθόνη %i"
 
 #: src/aosd/aosd_ui.c:287
 msgid "Timing (ms)"
@@ -739,7 +742,7 @@
 
 #: src/aosd/aosd_ui.c:462
 msgid "Select Skin File"
-msgstr ""
+msgstr "Επιλογή Skin Αρχείου"
 
 #: src/aosd/aosd_ui.c:573
 msgid "Render Style"
@@ -781,7 +784,8 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
 msgstr ""
 
 #: src/aosd/aosd_ui.c:799
@@ -845,47 +849,47 @@
 msgid "Misc"
 msgstr "Διάφορα"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "Λίστες Αναπαραγωγής ASXv1/ASXv2"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Λίστες Αναπαραγωγής Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Χρώμα"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr ""
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr ""
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr ""
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
-msgstr ""
+msgstr "Προεπιλογές:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
-msgstr ""
+msgstr "Αναλυτής Φάσματος"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -896,232 +900,242 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> και άλλοι.\n"
+"\n"
+"Πολύ ευχαριστώ τους δημιουργούς του libcdio <http://www.gnu.org/software/"
+"libcdio/>\n"
+"και του libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Επίσης ευχαριστώ τον Tony Vroon για την καθοδήγησή του.\n"
+"\n"
+"Αυτό το πρόσθετο δημιουργήθηκε κατά το Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Συσκευή"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Ταχύτητα ανάγνωσης:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
-msgstr ""
+msgstr "Παράκαμψη συσκευής:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
-msgstr ""
+msgstr "Μεταδεδομένα"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Χρήση CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Χρήση CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Χρήση HTTP αντί CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Εξυπηρετητής:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Διαδρομή:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Θύρα:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
-msgstr ""
+msgstr "Πρόσθετο Μουσικών CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
-msgstr ""
+msgstr "Απέτυχε η αρχικοποίηση του υποσυστήματος cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
-msgstr ""
+msgstr "Μη έγκυρο URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
-msgstr ""
+msgstr "Το κομμάτι %d δεν βρέθηκε."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Μουσικό CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Αναπαραγωγή CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Προσθήκη CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr ""
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
-msgstr ""
+msgstr "Συμπίεση"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr ""
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr ""
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr ""
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Αποκωδικοποιητής Μουσικής Κονσόλας Παιχνιδιών"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Γενικά"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Αναπαραγωγή"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Μπάσο:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "δευτ"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr ""
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr ""
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
-msgstr ""
+msgstr "Ανασχεδίαση"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
-msgstr ""
+msgstr "Ενεργοποίηση ανασχεδίασης ήχου"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
-msgstr ""
-
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+msgstr "Ρυθμός ανασχεδίασης:"
+
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
-msgstr ""
+msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr ""
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
-msgstr ""
+msgstr "Αύξηση αντίχησης"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
 msgstr ""
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1130,87 +1144,101 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Η μηχανή αποκωδικοποίησης μουσικής κονσολών βασίστηκε στο Game_Music_Emu "
+"0.5.2\n"
+"Υποστηριζόμενοι τύποι αρχείου: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, "
+"VGM, VGZ\n"
+"\n"
+"Πρόσθετο Audacious από τους:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Ένταση:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Ηχώ"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Καθυστέρηση:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Ανάδραση:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Ένταση:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
+"Πρόσθετο Ηχού\n"
+"Του Johan Levin, 1999\n"
+"\n"
+"Περιφερειακή ηχώ από τον Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Ηχώ"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1220,7 +1248,7 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Πρόσθετο FFmpeg"
 
@@ -1302,11 +1330,13 @@
 msgid "Joint Stereo"
 msgstr "Πολυπλεγμένο Στερεοφωνικό"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Στερεοφωνικό"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Μονοφωνικό"
 
@@ -1328,7 +1358,7 @@
 
 #: src/filewriter/mp3.c:772
 msgid "Bitrate / Compression ratio:"
-msgstr ""
+msgstr "Αναλογία ρυθμού μετάδοσης / συμπίεσης:"
 
 #: src/filewriter/mp3.c:796
 msgid "Bitrate (kbps):"
@@ -1336,11 +1366,11 @@
 
 #: src/filewriter/mp3.c:829
 msgid "Compression ratio:"
-msgstr ""
+msgstr "Λόγος συμπίεσης:"
 
 #: src/filewriter/mp3.c:853
 msgid "Audio Mode:"
-msgstr ""
+msgstr "Λειτουργία Ήχου:"
 
 #: src/filewriter/mp3.c:878
 msgid "Misc:"
@@ -1348,13 +1378,13 @@
 
 #: src/filewriter/mp3.c:889
 msgid "Enforce strict ISO complience"
-msgstr ""
+msgstr "Εξαναγκασμός αυστηρής συμμόρφωσης με ISO"
 
 #: src/filewriter/mp3.c:900
 msgid "Error protection"
-msgstr ""
+msgstr "Προστασία σφαλμάτων"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Ποιότητα"
 
@@ -1372,15 +1402,15 @@
 
 #: src/filewriter/mp3.c:980
 msgid "Minimum bitrate (kbps):"
-msgstr ""
+msgstr "Ελάχιστος ρυθμός μετάδοσης (kbps):"
 
 #: src/filewriter/mp3.c:1007
 msgid "Maximum bitrate (kbps):"
-msgstr ""
+msgstr "Μέγιστος ρυθμός μετάδοσης (kbps):"
 
 #: src/filewriter/mp3.c:1030
 msgid "Strictly enforce minimum bitrate"
-msgstr ""
+msgstr "Αυστηρά εφάρμοσε ελάχιστο ρυθμό μετάδοσης"
 
 #: src/filewriter/mp3.c:1042
 msgid "ABR Options:"
@@ -1388,7 +1418,7 @@
 
 #: src/filewriter/mp3.c:1052
 msgid "Average bitrate (kbps):"
-msgstr ""
+msgstr "Μέσος ρυθμός μετάδοσης (kbps):"
 
 #: src/filewriter/mp3.c:1080
 msgid "VBR quality level:"
@@ -1424,29 +1454,29 @@
 
 #: src/filewriter/mp3.c:1177
 msgid "Only add v1 tag"
-msgstr ""
+msgstr "Πρόσθεσε μόνο ετικέτα v1"
 
 #: src/filewriter/mp3.c:1184
 msgid "Only add v2 tag"
-msgstr ""
+msgstr "Πρόσθεσε μόνο ετικέτα v2"
 
 #: src/filewriter/mp3.c:1205
 msgid "Tags"
 msgstr "Ετικέτες"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Διαμόρφωση Κωδικοποιητή Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Επίπεδο ποιότητας (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1454,21 +1484,37 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Αποκωδικοποιητής FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Πρόσθετο GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
@@ -1476,500 +1522,543 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Συντομεύσεις GNOME"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr ""
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Τίτλος"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Καλλιτέχνης"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Έτος"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Άλμπουμ"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Κομμάτι"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Είδος"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Θέση ουράς"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Διάρκεια"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Διαδρομή αρχείου"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Προσαρμοσμένος τίτλος"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
-msgstr "Ρυθμός διαμεταγωγής (bitrate)"
+msgstr "Ρυθμός μετάδοσης (bitrate)"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Επιλογή Στηλών"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Διαθέσιμες:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Επιλεγμένες:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr ""
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Άνοιγμα Αρχείων..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Άνοιγμα _URL..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Προσθήκη Αρχείων..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Προσθήκη U_RL..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Αναζήτηση Βιβλιοθήκης"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "Σ_χετικά ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Προτιμήσεις ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Αναπαραγωγή"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Παύσ_η"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Διακοπή"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "Προ_ηγούμενο"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Επόμενο"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "_Επανάληψη"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "Α_νακάτεμα"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Κατά Αριθμό_Κομματιού:"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Κατά _Τίτλο"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Κατά Αριθμό_Κομματιού:"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Κατά _Καλλιτέχνη"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Κατά Ά_λμπουμ"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Κατά Ημερομηνία_Έκδοσης"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Κατά _Διαδρομή Αρχείου"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Κατά _Προσαρμοσμένο Τίτλο"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "Α_ντίστροφη Σειρά"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "_Τυχαία Σειρά"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr ""
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Ανανέωση"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr ""
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Ταξινόμηση"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Ταξινόμηση Επιλεγμένων"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr ""
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Νέο"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Μετ_ονομασία ..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Εισαγωγή..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Εξαγωγή..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Διαχειριστής Λιστών _Αναπαραγωγής ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "_Διαχειριστής Ουράς Αναμονής ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "Αύξηση_Έντασης"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "Μείωση_Έντασης"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Ισοσταθμιστής"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "Ε_φέ"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Διεπαφή"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Απεικονίσεις"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Εμφάνιση _Γραμμής Μενού"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Εμφάνιση Π_λαισίου Πληροφοριών"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Εμφάνιση Απεικόνισης Πλαισίου Πλη_ροφοριών"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Εμφάνιση _Γραμμής Κατάστασης"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Εμφάνιση Κουμπιά _Κλεισίματος"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Εμφάνιση Κεφαλίδων _Στηλών"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Επιλογή _Στηλών..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr ""
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Αρχείο"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Αναπαραγωγή"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr ""
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Υπηρεσίες"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
-msgstr ""
+msgstr "_Έξοδος"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Προβολή"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Εισαγωγή/Αφαίρεση στην/από την Ουρά"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "Αποκο_πή"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Αντιγραφή"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Επικόλληση"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Επιλογή _Όλων"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Μετονομασία..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Διεπαφή GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Γέμισμα ενδιάμεσης μνήμης..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Σφάλμα"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d κανάλι"
 msgstr[1] "%d κανάλια"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Προηγούμενο Κομμάτι"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Αναπαραγωγή"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Παύση/Συνέχεια"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Διακοπή"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "Μπροστά 5 δευτερόλεπτα"
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Επόμενο Κομμάτι"
+msgid "Rewind 5 seconds"
+msgstr "Πίσω 5 δευτερόλεπτα"
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Μπροστά 5 Δευτερόλεπτα"
+msgid "Mute"
+msgstr "Σίγαση"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Πίσω 5 Δευτερόλεπτα"
+msgid "Volume up"
+msgstr "Αύξηση έντασης"
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Σίγαση"
+msgid "Volume down"
+msgstr "Μείωση έντασης"
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Αύξηση Έντασης"
+msgid "Jump to file"
+msgstr "Μεταπήδηση στο αρχείο"
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Μείωση Έντασης"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Μεταπήδηση στο Αρχείο"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr ""
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+msgid "Toggle repeat"
 msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
+msgid "Toggle shuffle"
 msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
+msgid "Toggle stop after current"
 msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr ""
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr ""
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr ""
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Συντομεύσεις:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Ενέργεια:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr ""
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1984,11 +2073,11 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
@@ -1996,62 +2085,64 @@
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "Έξοδος JACK"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Ρυθμίσεις %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr ""
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr ""
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
 msgstr ""
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Διαθέσιμα πρόσθετα:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Ενεργοποιημένα πρόσθετα:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr ""
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr ""
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2059,27 +2150,27 @@
 "%s: how to create a proper config file\n"
 msgstr ""
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: προσπαθεί να επανασυνδεθεί...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: άγνωστη εντολή «%s»\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
-msgstr ""
+msgstr "%s: αποσύνδεση από LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: θα προσπαθήσει να επανασυνδεθεί κάθε %d δευτερόλεπτα...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2095,67 +2186,67 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Σύνδεση"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Επανασύνδεση με εξυπηρετητή LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "Πρόσθετο LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Αναζήτηση για στοίχους ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Σύνδεση με lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "Πρόσθετο LyricsWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "Λίστες Αναπαραγωγής M3U"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2164,90 +2255,224 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr ""
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Μείκτης Καναλιών:"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Κανάλια εξόδου:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Μείκτης Καναλιών"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Πρόσθετο MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bit"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bit"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Κανάλια"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Επίπεδο:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Αντίχηση"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Περιφερειακό"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Διάφορα"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Μείωση θορύβου"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Αναπαραγωγή MOD του Amiga"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Επανάληψη"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Μέτρηση επαναλήψεων:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
-msgstr "Περιβάλλων (Surround)"
+msgstr "Περιφερειακό"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "Πρόσθετο MPG123"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "Εξυπηρετητής MPRIS 2"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Πρόσθετο Neon HTTP/HTTPS"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Το Audacious δεν αναπαράγει."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr ""
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Εμφάνιση"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Παύση"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Επόμενο"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Προεπιλεγμένη συσκευή"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Συσκευή ήχου:"
 
 #: src/oss4/plugin.c:77
 msgid "Use alternate device:"
-msgstr ""
+msgstr "Χρησιμοποίησε εναλλακτική συσκευή:"
 
 #: src/oss4/plugin.c:81
 msgid "Save volume between sessions."
@@ -2266,22 +2491,23 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "Έξοδος OSS4"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "Λίστες Αναπαραγωγής PLS"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Αποκωδικοποιητής OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2301,160 +2527,204 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "Έξοδος PulseAudio"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr ""
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Μετατροπή"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Μέθοδος:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Ρυθμός:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr ""
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr ""
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr ""
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Αλλαγή κωδικού"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Άρνηση Πρόσβασης"
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Υπηρεσίες"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Γίνεται έλεγχος..."
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Όνομα χρήστη:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Κωδικός:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "URL του Scrobbler"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Πρόσθετο Εξόδου SDL για το Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "Έξοδος SDL"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Βιβλιοθήκη"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Άγνωστος Καλλιτέχνης"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Άγνωστο Άλμπουμ"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
 msgstr ""
+"%s\n"
+" στο %s του %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d δίσκος"
 msgstr[1] "%d δίσκοι"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2462,10 +2732,14 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d τραγούδι"
-msgstr[1] "%s\n %s, %d τραγούδια"
+msgstr[0] ""
+"%s\n"
+" %s, %d τραγούδι"
+msgstr[1] ""
+"%s\n"
+" %s, %d τραγούδια"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2473,76 +2747,82 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d τραγούδι από %s"
-msgstr[1] "%s\n %d τραγούδια από %s"
+msgstr[0] ""
+"%s\n"
+" %d τραγούδι από %s"
+msgstr[1] ""
+"%s\n"
+" %d τραγούδια από %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Δημιουργία Λίστας Αναπαραγωγής"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Προσθήκη στη Λίστα Αναπαραγωγής"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Αναζήτηση βιοθήκης"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Για να εισάγεται τη συλλογή μουσικής σας στο Audacious, διαλέξτε έναν φάκελο και κάνετε κλικ στο εικονίδιο «ανανέωση»."
+msgstr ""
+"Για να εισάγεται τη συλλογή μουσικής σας στο Audacious, διαλέξτε έναν φάκελο "
+"και κάνετε κλικ στο εικονίδιο «ανανέωση»."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Παρακαλώ περιμένετε ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Επιλογή Φακέλου"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Εργαλέιο Αναζήτησης"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Κλασσική Διεπαφή Winamp"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Αναπαραγωγέας:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Επιλέξτε τη γραμματοσειρά του κύριου παραθύρου:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Λίστα αναπαραγωγής:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Επιλέξτε τη γραμματοσειρά της λίστας αναπαραγωγής:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Γραμματοσειρές"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr ""
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Προτιμήσεις Διεπαφής"
 
@@ -2598,7 +2878,7 @@
 msgid "Presets"
 msgstr "Προρυθμίσεις"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Φόρτωση προρύθμισης"
 
@@ -2611,7 +2891,7 @@
 msgid "Load equalizer preset"
 msgstr "Φόρτωση προρύθμιση ισοσταθμιτή"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Αποθήκευση προρύθμισης"
 
@@ -2623,7 +2903,7 @@
 msgid "Save equalizer preset"
 msgstr "Αποθήκευση προρύθμισης ισοσταθμιτή"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Διαγραφή προρύθμισης"
 
@@ -2631,739 +2911,757 @@
 msgid "Delete auto-preset"
 msgstr "Διαγραφή αυτόματης προρύθμισης"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kb/s"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Ένταση: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
-msgstr ""
+msgstr "Ισορροπία: %d%% αριστερά"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
-msgstr ""
+msgstr "Ισορροπία: κέντρο"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
-msgstr ""
+msgstr "Ισορροπία: %d%% δεξιά"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Μενού Επιλογών"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Μενού Οπτικοποίησης"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr ""
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Λειτουργία λίστας αναπαραγωγής."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Διακοπή στο τέλους του κομματιού."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Δεν διακόπτει στο τέλος του κομματιού."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr ""
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Διακοπή μετά το Τρέχον Κομμάτι"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr ""
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Επανάληψη"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Ανακάτεμα"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr ""
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Εμφάνιση Αναπαραγωγέα"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr ""
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr ""
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr ""
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Αναλυτής"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
-msgstr ""
+msgstr "Εμβέλεια"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
-msgstr ""
+msgstr "Αποτύπωμα φωνής"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
-msgstr ""
+msgstr "Μακριά"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr ""
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr ""
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
-msgstr ""
+msgstr "Κατακόρυφες Γραμμές"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
-msgstr ""
+msgstr "Γραμμές"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
-msgstr ""
+msgstr "Μπάρες"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr ""
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr ""
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Ομαλό"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Αργότερο"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Αργό"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Μεσαίο"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Γρήγορο"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Γρηγορότερο"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Χρόνος που Πέρασε"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Χρόνος που Απομένει"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Παύση"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Προηγούμενο"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Επόμενο"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Οπτικοποίηση"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Λειτουργία Οπτικοποίησης"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Λειτουργία Αναλυτή"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr ""
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Λίστα Αναπαραγωγής"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Αναπαραγωγή Λίστας Αναπαραγωγής"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Νέα Λίστα Αναπαραγωγής"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Επιλογή Επόμενης Λίστας Αναπαραγωγής"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Επιλογη Προηγούμενης Λίστας Αναπαραγωγής"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Διαγραφή Λίστας Αναπαραγωγής"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Εισαγωγή Λίστας Αναπαραγωγής"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
-msgstr "Φορτώνει ένα αρχείο λίστας Αναπαραγωγής στην επιλεγμένη λίστα αναπαραγωγής."
+msgstr ""
+"Φορτώνει ένα αρχείο λίστας Αναπαραγωγής στην επιλεγμένη λίστα αναπαραγωγής."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Εξαγωγή Λίστας Αναπαραγωγής"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Αποθηκεύει την επιλεγμένη λίστα αναπαραγωγής."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Ανανέωση Λίστας"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr ""
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Διαχειριστής Λίστών Αναπαραγωγής"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Διαχειριστής Ουράς Αναμονής"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Προβολή"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Προτιμήσεις Διεπαφής ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Προσθήκη Διεύθυνσης Διαδικτύου"
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
-msgstr ""
+msgstr "Προσθέτει ένα απομακρυσμένο αρχείο στη λίστα αναπαραγωγής."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Προσθήκη Αρχείων..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Προσθήκη αρχείων στη λίστα αναπαραγωγής."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Αναζήτηση και Επιλογή"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
+"Ψάχνει στη λίστα αναπαραγωγής και επιλέγει καταχωρήσεις με συγκεκριμένα "
+"κριτήρια."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Αντιστροφή Επιλογής"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Αντιστρέφει τις επιλεγμένες και μη-επιλεγμένες καταχωρήσεις."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Επιλογή Όλων"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Επιλέγει όλες τις καταχωρήσεις της λίστας αναπαραγωγής."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Επιλογή Κανενός"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Αποεπιλέγει όλες τις καταχωρήσεις της λίστας αναπαραγωγής."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Αφαίρεση Όλων"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Αφερεί όλες τις καταχωρήσεις από την λίστα αναπαραγωγής."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Εκκαθάριση Ουράς"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
-msgstr "Καθαρίζει την ουρά αναμονής συσχετισμένη με αυτήν την λίστα αναπαραγωγής."
+msgstr ""
+"Καθαρίζει την ουρά αναμονής συσχετισμένη με αυτήν την λίστα αναπαραγωγής."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Αφαίρεση Μη Διαθέσιμων Αρχείων"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Αφαιρεί τα μη-διαθέσιμα αρχεία από την λίστα αναπαραγωγής."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Αφαίρεση Διπλών"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Κατά Τίτλο"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Αφαιρεί τις διπλές καταχωρήσεις από την λίστα αναπαραγωγής."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Κατά Όνομα Αρχείου"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Αφαιρεί τις διπλές καταχωρήσεις από την λίστα αναπαραγωγής κατά όνομα αρχείου."
+msgstr ""
+"Αφαιρεί τις διπλές καταχωρήσεις από την λίστα αναπαραγωγής κατά όνομα "
+"αρχείου."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Κατά Διαδρομή + Όνομα Αρχείου"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Αφαιρεί τις διπλές καταχωρήσεις από την λίστα αναπαραγωγής κατά την διαδρομή τους."
+msgstr ""
+"Αφαιρεί τις διπλές καταχωρήσεις από την λίστα αναπαραγωγής κατά την διαδρομή "
+"τους."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Αφαίρεση Μη Επιλεγμένων"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Αφαιρεί τις μη επιλεγμένες καταχωρήσεις από την λίστα αναπαραγωγής."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Αφαίρεση Επιλεγμένων"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Αφαιρεί τις επιλεγμένες καταχωρήσεις από την λίστα αναπαραγωγής."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Τυχαιοποίηση Λίστας"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Τυχαιοποιεί την λίστα αναπαραγωγής."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Αντίστροφη Λίστας"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Στρέφει αντίθετα την λίστα αναπαραγωγής."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Ταξινόμηση Λίστας"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Ταξινομεί τη λίστα κατά τον τίτλο."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Κατά Δίσκο"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Ταξινομεί τη λίστα κατά άλμπουμ."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Κατά Καλλιτέχνη"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Ταξινομεί τη λίστα κατά καλλιτέχνη."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Ταξινομεί τη λίστα κατά όνομα αρχείου."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Ταξινομεί τη λίστα κατά της πλήρης διαδρομής του αρχείου."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Κατά Ημερομηνία"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Ταξινομεί τη λίστα κατά ώρα τροποποίησης."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Κατά Αριθμό Κομματιού:"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Ταξινομεί τη λίστα κατά αριθμό κομματιού."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Ταξινόμηση Επιλεγμένων"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Αρχείο"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Υπηρεσίες Πρόσθετων Λειτουργιών"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Εμφάνιση Λεπτομερειών Κομματιού"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Εμφάνιση λεπτομερειών κομματιού"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Σχετικά με το Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Αναπαραγωγή Αρχείου"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Φόρτωση και αναπαραγωγή αρχείου"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr ""
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr ""
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Υπηρεσίες πρόσθετων λειτουργιών"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Άνοιγμα του παραθύρου προτιμήσεων"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Έξοδος από το Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr ""
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr ""
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Μεταπήδηση στο Αρχείο"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr ""
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr ""
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Ενεργοποιεί/απενεργοποιεί την καταχωρήση στην ουρα της λίστας αναπαραγωγής."
+msgstr ""
+"Ενεργοποιεί/απενεργοποιεί την καταχωρήση στην ουρα της λίστας αναπαραγωγής."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Φόρτωση"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Αποθήκευση"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Προρύθμιση"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
-msgstr ""
+msgstr "Μηδέν"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Από αρχείο"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Φόρτωση προρύθμισης από αρχείο"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Από αρχείο EQF του Winamp"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Φόρτωση προρύθμισης από αρχείο EQF του Winamp"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Προρυθμίσεις WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Εισαγωγή προρυθμίσεων WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
-msgstr "Σε αρχείοο"
+msgstr "Σε αρχείο"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Αποθήκευση προρύθμισης σε αρχείο"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Σε αρχείο EQF του Winamp"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Αποθήκευση προρύθμισης σε αρχείο EQF του WinAMP"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Τίτλος: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Δίσκος: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Καλλιτέχνης: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Όνομα αρχείου: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d από %d)"
@@ -3381,81 +3679,99 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr ""
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Πρόσθετο Sndfile"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 msgstr ""
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Ο τύπος δεν υποστηρίζεται"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
 msgstr ""
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr ""
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr ""
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Εντάξει"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Ακύρωση"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Αλλαγή Τραγουδιού"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Εντολή για εκτέλεση όταν το Audacious αρχίζει νέο τραγούδι."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Εντολή:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Εντολή για εκτέλεση πλησιάζωντας το τέλος ενός τραγουδιού."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Εντολή για εκτέλεση όταν το Audacious φτάνει το τέλος της λίστας αναπαραγωγής."
+msgstr ""
+"Εντολή για εκτέλεση όταν το Audacious φτάνει το τέλος της λίστας "
+"αναπαραγωγής."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3474,33 +3790,66 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Εντολές"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Ταχύτητα και Χροιά"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Ταχύτητα:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Χροιά:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Ταχύτητα και Χροιά:"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3511,63 +3860,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Αλλαγή έντασης"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr ""
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Άλλες Ρυθμίσεις"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr ""
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
-msgstr ""
+msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
-msgstr ""
+msgstr "Γεννήτρια Τόνων: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3576,27 +3925,31 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
-msgstr ""
+msgstr "Γεννήτρια Τόνων"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
+"Πρόσθετο Ε/Ε Αρχείων για το Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"ΑΥΤΟ ΤΟ ΠΡΟΣΘΕΤΟ ΕΙΝΑΙ ΑΠΑΙΡΑΙΤΗΤΟ. ΜΗΝ ΤΟ ΑΠΕΝΕΡΓΟΠΟΙΗΣΕΤΕ."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr ""
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Αφαίρεση Φωνής"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3616,45 +3969,70 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"Αποκωδικοποιητής Ogg Vorbis\n"
+"\n"
+"Βασισμένο στο Πρόσθετο Ogg Vorbis του Ιδρύματος Xiph.org\n"
+"\n"
+"Πρωτότυπος κώδικας του:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Συνεισφορές από τους:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Αποκωδικοποιητής Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
+"Αναπαραγωγέας αρχείων τύπου VTX του Sashnov Alexander <sashnov@ngs.ru>\n"
+"Βασισμένο στο in_vtx.dll του Roman Sherbakov <v_soft@microfor.ru>\n"
+"Πρόσθετο για το Audacious από τον Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Αποκωδικοποιητής VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
-msgstr ""
+msgstr "με απώλεια (υβριδικός)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
-msgstr ""
+msgstr "με απώλεια"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Μερικός κώδικας εγγράφει από τον Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Αποκωδικοποιητής WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Αποκωδικοποιητής 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Διαμοιραζόμενες Λίστες Αναπαραγωγής ΧΜL (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - επιλέξτε αρχείο"

audacious-plugins-3.4.2.tar.bz2/po/en_GB.po Added

@@ -0,0 +1,3988 @@
+# English (United Kingdom) translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Andi Chandler <andi@gowling.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-10-30 22:44+0000\n"
+"Last-Translator: Andi Chandler <andi@gowling.com>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
+"audacious/language/en_GB/)\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
+msgid "mono"
+msgstr "mono"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
+msgid "stereo"
+msgstr "stereo"
+
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
+msgid "surround"
+msgstr "surround"
+
+#: src/aac/libmp4.c:930
+msgid "AAC Decoder"
+msgstr ""
+
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
+msgid "sequenced"
+msgstr ""
+
+#: src/adplug/plugin.c:14
+msgid "AdPlug (AdLib Player)"
+msgstr ""
+
+#: src/alarm/alarm.c:809
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr ""
+
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
+msgid "Alarm"
+msgstr "Alarm"
+
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "This is your wakeup call."
+
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
+
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Reminder"
+
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Monday"
+
+#: src/alarm/interface.c:140
+msgid "Tuesday"
+msgstr "Tuesday"
+
+#: src/alarm/interface.c:140
+msgid "Wednesday"
+msgstr "Wednesday"
+
+#: src/alarm/interface.c:141
+msgid "Thursday"
+msgstr "Thursday"
+
+#: src/alarm/interface.c:141
+msgid "Friday"
+msgstr "Friday"
+
+#: src/alarm/interface.c:141
+msgid "Saturday"
+msgstr "Saturday"
+
+#: src/alarm/interface.c:141
+msgid "Sunday"
+msgstr "Sunday"
+
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Alarm Settings"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Time"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Alarm at (default):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Quiet after:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "hours"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minutes"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Choose the days for the alarm to come on"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Day"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Default"
+
+#: src/alarm/interface.c:310
+msgid "Days"
+msgstr "Days"
+
+#: src/alarm/interface.c:319
+msgid "Fading"
+msgstr "Fading"
+
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
+msgid "seconds"
+msgstr "seconds"
+
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
+msgid "Volume"
+msgstr "Volume"
+
+#: src/alarm/interface.c:339
+msgid "Start at"
+msgstr "Start at"
+
+#: src/alarm/interface.c:357
+msgid "Final"
+msgstr "Final"
+
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Current"
+
+#: src/alarm/interface.c:387
+msgid "Additional Command"
+msgstr "Additional Command"
+
+#: src/alarm/interface.c:393
+msgid "enable"
+msgstr "enable"
+
+#: src/alarm/interface.c:400
+msgid "Playlist (optional)"
+msgstr "Playlist (optional)"
+
+#: src/alarm/interface.c:407
+msgid "Select a playlist"
+msgstr ""
+
+#: src/alarm/interface.c:419
+msgid "Use reminder"
+msgstr "Use reminder"
+
+#: src/alarm/interface.c:428
+msgid "Options"
+msgstr "Options"
+
+#: src/alarm/interface.c:433
+msgid "What do these options mean?"
+msgstr "What do these options mean?"
+
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
+msgid "Help"
+msgstr "Help"
+
+#: src/albumart/albumart.c:143
+msgid "Album Art"
+msgstr ""
+
+#: src/alsa/config.c:212
+msgid "Default PCM device"
+msgstr "Default PCM device"
+
+#: src/alsa/config.c:241
+msgid "Default mixer device"
+msgstr "Default mixer device"
+
+#: src/alsa/config.c:428
+msgid "ALSA Output Plugin Preferences"
+msgstr "ALSA Output Plug-in Preferences"
+
+#: src/alsa/config.c:434
+msgid "PCM device:"
+msgstr "PCM device:"
+
+#: src/alsa/config.c:436
+msgid "Mixer device:"
+msgstr "Mixer device:"
+
+#: src/alsa/config.c:438
+msgid "Mixer element:"
+msgstr "Mixer element:"
+
+#: src/alsa/config.c:441
+msgid "Work around drain hangup"
+msgstr "Work around drain hangup"
+
+#: src/alsa/plugin.c:25
+msgid ""
+"ALSA Output Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+
+#: src/alsa/plugin.c:32
+msgid "ALSA Output"
+msgstr ""
+
+#: src/amidi-plug/amidi-plug.c:248
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plug-in preferences."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr ""
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
+msgid "ALSA Backend "
+msgstr "ALSA Backend "
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesisers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
+msgid "FluidSynth Backend "
+msgstr "FluidSynth Backend "
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+
+#: src/amidi-plug/i_configure-alsa.c:353
+msgid "Port"
+msgstr "Port"
+
+#: src/amidi-plug/i_configure-alsa.c:355
+msgid "Client name"
+msgstr "Client name"
+
+#: src/amidi-plug/i_configure-alsa.c:357
+msgid "Port name"
+msgstr "Port name"
+
+#: src/amidi-plug/i_configure-alsa.c:371
+msgid "ALSA output ports"
+msgstr "ALSA output ports"
+
+#: src/amidi-plug/i_configure-alsa.c:432
+msgid "Soundcard: "
+msgstr "Soundcard: "
+
+#: src/amidi-plug/i_configure-alsa.c:434
+msgid "Mixer control: "
+msgstr "Mixer control: "
+
+#: src/amidi-plug/i_configure-alsa.c:444
+msgid "Mixer settings"
+msgstr "Mixer settings"
+
+#: src/amidi-plug/i_configure-alsa.c:472
+msgid ""
+"ALSA\n"
+"backend"
+msgstr ""
+"ALSA\n"
+"backend"
+
+#: src/amidi-plug/i_configure-ap.c:63
+msgid "AMIDI-Plug - backend information"
+msgstr "AMIDI-Plug - backend information"
+
+#: src/amidi-plug/i_configure-ap.c:221
+msgid "Backend selection"
+msgstr "Backend selection"
+
+#: src/amidi-plug/i_configure-ap.c:261
+msgid "Playback settings"
+msgstr "Playback settings"
+
+#: src/amidi-plug/i_configure-ap.c:266
+msgid "Transpose: "
+msgstr "Transpose: "
+
+#: src/amidi-plug/i_configure-ap.c:275
+msgid "Drum shift: "
+msgstr "Drum shift: "
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "Advanced settings"
+msgstr "Advanced settings"
+
+#: src/amidi-plug/i_configure-ap.c:297
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "pre-calculate length of MIDI files in playlist"
+
+#: src/amidi-plug/i_configure-ap.c:304
+msgid "extract comments from MIDI file (if available)"
+msgstr "extract comments from MIDI file (if available)"
+
+#: src/amidi-plug/i_configure-ap.c:311
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "extract lyrics from MIDI file (if available)"
+
+#: src/amidi-plug/i_configure-ap.c:344
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr ""
+"AMIDI\n"
+"Plug"
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug Settings"
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:63
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Plug - select SoundFont file"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:321
+msgid "SoundFont settings"
+msgstr "SoundFont settings"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:359
+msgid "Filename"
+msgstr "Filename"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:363
+msgid "Size (bytes)"
+msgstr "Size (bytes)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:412
+msgid "Load SF on player start"
+msgstr "Load SF on player start"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:416
+msgid "Load SF on first MIDI file play"
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:431
+msgid "Synthesizer settings"
+msgstr "Synthesiser settings"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:440
+msgid "gain"
+msgstr "gain"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
+msgid "use default"
+msgstr "use default"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
+msgid "value:"
+msgstr "value:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:470
+msgid "polyphony"
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:500
+msgid "reverb"
+msgstr "reverb"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
+msgid "yes"
+msgstr "yes"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
+msgid "no"
+msgstr "no"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:534
+msgid "chorus"
+msgstr "chorus"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "sample rate"
+msgstr "sample rate"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:574
+msgid "22050 Hz "
+msgstr "22050 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:577
+msgid "44100 Hz "
+msgstr "44100 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:580
+msgid "96000 Hz "
+msgstr "96000 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:583
+msgid "custom "
+msgstr "custom "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:592
+msgid "Hz "
+msgstr "Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:662
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr ""
+"FluidSynth\n"
+"backend"
+
+#: src/amidi-plug/i_fileinfo.c:175
+msgid "Name:"
+msgstr "Name:"
+
+#: src/amidi-plug/i_fileinfo.c:200
+msgid " MIDI Info "
+msgstr " MIDI Info "
+
+#: src/amidi-plug/i_fileinfo.c:214
+msgid "Format:"
+msgstr "Format:"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "Length (msec):"
+msgstr "Length (msec):"
+
+#: src/amidi-plug/i_fileinfo.c:220
+msgid "No. of Tracks:"
+msgstr ""
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "variable"
+msgstr "variable"
+
+#: src/amidi-plug/i_fileinfo.c:228
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidi-plug/i_fileinfo.c:236
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidi-plug/i_fileinfo.c:239
+msgid "Time Div:"
+msgstr "Time Div:"
+
+#: src/amidi-plug/i_fileinfo.c:250
+msgid " MIDI Comments and Lyrics "
+msgstr " MIDI Comments and Lyrics "
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no comments available in this MIDI file *"
+msgstr "* no comments available in this MIDI file *"
+
+#: src/amidi-plug/i_fileinfo.c:314
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* no lyrics available in this MIDI file *"
+
+#: src/amidi-plug/i_fileinfo.c:367
+msgid " (invalid UTF-8)"
+msgstr " (invalid UTF-8)"
+
+#: src/amidi-plug/i_utils.c:39
+msgid "About AMIDI-Plug"
+msgstr ""
+
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr ""
+
+#: src/amidi-plug/i_utils.c:54
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing"
+msgstr ""
+
+#: src/aosd/aosd.c:29
+msgid "Audacious OSD "
+msgstr ""
+
+#: src/aosd/aosd.c:37
+msgid "AOSD (On-Screen Display)"
+msgstr ""
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "Rectangle"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "Rounded Rectangle"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "Concave Rectangle"
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "None"
+
+#: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "Playback Start"
+
+#: src/aosd/aosd_trigger.c:75
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Triggers OSD when a playlist entry is played."
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Title Change"
+msgstr "Title Change"
+
+#: src/aosd/aosd_trigger.c:80
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in Internet "
+"streams."
+
+#: src/aosd/aosd_trigger.c:86
+msgid "Pause On"
+msgstr "Pause On"
+
+#: src/aosd/aosd_trigger.c:87
+msgid "Triggers OSD when playback is paused."
+msgstr "Triggers OSD when playback is paused."
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Pause Off"
+msgstr "Pause Off"
+
+#: src/aosd/aosd_trigger.c:92
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Triggers OSD when playback is unpaused."
+
+#: src/aosd/aosd_ui.c:168
+msgid "Placement"
+msgstr "Placement"
+
+#: src/aosd/aosd_ui.c:200
+msgid "Relative X offset:"
+msgstr "Relative X offset:"
+
+#: src/aosd/aosd_ui.c:207
+msgid "Relative Y offset:"
+msgstr "Relative Y offset:"
+
+#: src/aosd/aosd_ui.c:214
+msgid "Max OSD width:"
+msgstr "Max OSD width:"
+
+#: src/aosd/aosd_ui.c:225
+msgid "Multi-Monitor options"
+msgstr "Multi-Monitor options"
+
+#: src/aosd/aosd_ui.c:229
+msgid "Display OSD using:"
+msgstr "Display OSD using:"
+
+#: src/aosd/aosd_ui.c:231
+msgid "all monitors"
+msgstr "all monitors"
+
+#: src/aosd/aosd_ui.c:234
+#, c-format
+msgid "monitor %i"
+msgstr "monitor %i"
+
+#: src/aosd/aosd_ui.c:287
+msgid "Timing (ms)"
+msgstr "Timing (ms)"
+
+#: src/aosd/aosd_ui.c:292
+msgid "Display:"
+msgstr "Display:"
+
+#: src/aosd/aosd_ui.c:297
+msgid "Fade in:"
+msgstr "Fade in:"
+
+#: src/aosd/aosd_ui.c:302
+msgid "Fade out:"
+msgstr "Fade out:"
+
+#: src/aosd/aosd_ui.c:383
+msgid "Fonts"
+msgstr "Fonts"
+
+#: src/aosd/aosd_ui.c:391
+#, c-format
+msgid "Font %i:"
+msgstr "Font %i:"
+
+#: src/aosd/aosd_ui.c:409
+msgid "Shadow"
+msgstr "Shadow"
+
+#: src/aosd/aosd_ui.c:439
+msgid "Internationalization"
+msgstr "Internationalisation"
+
+#: src/aosd/aosd_ui.c:445
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "Disable UTF-8 conversion of text (in aosd)"
+
+#: src/aosd/aosd_ui.c:462
+msgid "Select Skin File"
+msgstr "Select Skin File"
+
+#: src/aosd/aosd_ui.c:573
+msgid "Render Style"
+msgstr "Render Style"
+
+#: src/aosd/aosd_ui.c:589
+msgid "Colors"
+msgstr "Colours"
+
+#: src/aosd/aosd_ui.c:602
+#, c-format
+msgid "Color %i:"
+msgstr "Colour %i:"
+
+#: src/aosd/aosd_ui.c:620
+msgid "Custom Skin"
+msgstr "Custom Skin"
+
+#: src/aosd/aosd_ui.c:626
+msgid "Skin file:"
+msgstr "Skin file:"
+
+#: src/aosd/aosd_ui.c:630
+msgid "Browse"
+msgstr "Browse"
+
+#: src/aosd/aosd_ui.c:729
+msgid "Enable trigger"
+msgstr "Enable trigger"
+
+#: src/aosd/aosd_ui.c:756
+msgid "Event"
+msgstr "Event"
+
+#: src/aosd/aosd_ui.c:784
+msgid "Composite manager detected"
+msgstr "Composite manager detected"
+
+#: src/aosd/aosd_ui.c:791
+msgid ""
+"Composite manager not detected;\n"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Composite manager not detected;\n"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD will not work properly"
+
+#: src/aosd/aosd_ui.c:799
+msgid "Composite manager not required for fake transparency"
+msgstr "Composite manager not required for fake transparency"
+
+#: src/aosd/aosd_ui.c:837
+msgid "Transparency"
+msgstr "Transparency"
+
+#: src/aosd/aosd_ui.c:843
+msgid "Fake transparency"
+msgstr "Fake transparency"
+
+#: src/aosd/aosd_ui.c:845
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Real transparency (requires X Composite Ext.)"
+
+#: src/aosd/aosd_ui.c:887
+msgid "Composite extension not loaded"
+msgstr "Composite extension not loaded"
+
+#: src/aosd/aosd_ui.c:895
+msgid "Composite extension not available"
+msgstr "Composite extension not available"
+
+#: src/aosd/aosd_ui.c:914
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd_ui.c:995
+msgid "Audacious OSD - configuration"
+msgstr "Audacious OSD - configuration"
+
+#: src/aosd/aosd_ui.c:1016
+msgid "Test"
+msgstr "Test"
+
+#: src/aosd/aosd_ui.c:1031
+msgid "Position"
+msgstr "Position"
+
+#: src/aosd/aosd_ui.c:1036
+msgid "Animation"
+msgstr "Animation"
+
+#: src/aosd/aosd_ui.c:1041
+msgid "Text"
+msgstr "Text"
+
+#: src/aosd/aosd_ui.c:1046
+msgid "Decoration"
+msgstr "Decoration"
+
+#: src/aosd/aosd_ui.c:1051
+msgid "Trigger"
+msgstr "Trigger"
+
+#: src/aosd/aosd_ui.c:1056
+msgid "Misc"
+msgstr "Misc"
+
+#: src/asx/asx.c:96
+msgid "ASXv1/ASXv2 Playlists"
+msgstr ""
+
+#: src/audpl/audpl.c:222
+msgid "Audacious Playlists (audpl)"
+msgstr ""
+
+#: src/blur_scope/blur_scope.c:47
+msgid "Color"
+msgstr ""
+
+#: src/blur_scope/blur_scope.c:56
+msgid "Blur Scope"
+msgstr ""
+
+#: src/bs2b/plugin.c:136
+msgid "Bauer Stereophonic-to-Binaural Preferences"
+msgstr ""
+
+#: src/bs2b/plugin.c:147
+msgid "Feed level:"
+msgstr ""
+
+#: src/bs2b/plugin.c:161
+msgid "Cut frequency:"
+msgstr ""
+
+#: src/bs2b/plugin.c:175
+msgid "Presets:"
+msgstr ""
+
+#: src/bs2b/plugin.c:197
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr ""
+
+#: src/cairo-spectrum/cairo-spectrum.c:297
+msgid "Spectrum Analyzer"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:103
+msgid ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"and to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you to Tony Vroon for mentoring and guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:121
+msgid "Device"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:122
+msgid "Read speed:"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:125
+msgid "Override device:"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:127
+msgid "Metadata"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:128
+msgid "Use CD-Text"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:130
+msgid "Use CDDB"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:132
+msgid "Use HTTP instead of CDDBP"
+msgstr "Use HTTP instead of CDDBP"
+
+#: src/cdaudio-ng/cdaudio-ng.c:134
+msgid "Server:"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:136
+msgid "Path:"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:138
+msgid "Port:"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:148
+msgid "Audio CD Plugin"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:249
+msgid "Failed to initialize cdio subsystem."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:306
+#, c-format
+msgid "Invalid URI %s."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:308
+#, c-format
+msgid "Track %d not found."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:310
+#, c-format
+msgid "Track %d is a data track."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:312
+msgid "Failed to open audio output."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:395
+msgid "Error reading audio CD."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:505
+msgid "Audio CD"
+msgstr "Audio CD"
+
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:547
+msgid "No audio capable CD drive found."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:574
+msgid "Failed to finish initializing opened CD drive."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:587
+msgid "Failed to retrieve first/last track number."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:612
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:702
+msgid "Failed to create the cddb connection."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:777
+msgid "Failed to query the CDDB server"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:779
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:803
+#, c-format
+msgid "Failed to read the cddb info: %s"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:876
+msgid "Drive is empty."
+msgstr "Drive is empty."
+
+#: src/cdaudio-ng/cdaudio-ng.c:878
+msgid "Unsupported disk type."
+msgstr "Unsupported disk type."
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Play CD"
+msgstr "Play CD"
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Add CD"
+msgstr "Add CD"
+
+#: src/cd-menu-items/cd-menu-items.c:57
+msgid "Audio CD Menu Items"
+msgstr ""
+
+#: src/compressor/plugin.c:35
+msgid "Compression"
+msgstr ""
+
+#: src/compressor/plugin.c:36
+msgid "Center volume:"
+msgstr "Centre volume:"
+
+#: src/compressor/plugin.c:39
+msgid "Dynamic range:"
+msgstr "Dynamic range:"
+
+#: src/compressor/plugin.c:53
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/compressor/plugin.c:58
+msgid "Dynamic Range Compressor"
+msgstr ""
+
+#: src/console/configure.c:134 src/console/plugin.c:42
+msgid "Game Console Music Decoder"
+msgstr "Game Console Music Decoder"
+
+#: src/console/configure.c:151
+msgid "General"
+msgstr "General"
+
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
+msgid "Playback"
+msgstr "Playback"
+
+#: src/console/configure.c:168
+msgid "Bass:"
+msgstr "Bass:"
+
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
+msgid "secs"
+msgstr "secs"
+
+#: src/console/configure.c:179
+msgid "Treble:"
+msgstr "Treble:"
+
+#: src/console/configure.c:200
+msgid "Default song length:"
+msgstr "Default song length:"
+
+#: src/console/configure.c:206
+msgid "Resampling"
+msgstr "Resampling"
+
+#: src/console/configure.c:212
+msgid "Enable audio resampling"
+msgstr "Enable audio resampling"
+
+#: src/console/configure.c:227
+msgid "Resampling rate:"
+msgstr "Resampling rate:"
+
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
+msgid "Hz"
+msgstr "Hz"
+
+#: src/console/configure.c:242
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/configure.c:243
+msgid "Ignore length from SPC tags"
+msgstr "Ignore length from SPC tags"
+
+#: src/console/configure.c:244
+msgid "Increase reverb"
+msgstr "Increase reverb"
+
+#: src/console/configure.c:269
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+
+#: src/console/plugin.c:27
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+msgstr ""
+
+#: src/crossfade/crossfade.c:81
+msgid ""
+"Crossfading failed because the songs had a different number of channels. "
+"You can use the Channel Mixer to convert the songs to the same number of "
+"channels."
+msgstr ""
+
+#: src/crossfade/crossfade.c:88
+msgid ""
+"Crossfading failed because the songs had different sample rates. You can "
+"use the Sample Rate Converter to convert the songs to the same sample rate."
+msgstr ""
+
+#: src/crossfade/crossfade.c:254
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/crossfade/crossfade.c:258
+msgid "Crossfade"
+msgstr ""
+
+#: src/crossfade/crossfade.c:259
+msgid "Overlap:"
+msgstr ""
+
+#: src/crossfade/crossfade.c:269
+msgid "Crossfade"
+msgstr ""
+
+#: src/crystalizer/crystalizer.c:40
+msgid "Crystalizer"
+msgstr ""
+
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
+msgid "Intensity:"
+msgstr ""
+
+#: src/crystalizer/crystalizer.c:51
+msgid "Crystalizer"
+msgstr ""
+
+#: src/cue/cue.c:158
+msgid "Cue Sheet Plugin"
+msgstr ""
+
+#: src/echo_plugin/echo.c:24
+msgid "Echo"
+msgstr ""
+
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
+msgid "Delay:"
+msgstr ""
+
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
+msgid "ms"
+msgstr ""
+
+#: src/echo_plugin/echo.c:28
+msgid "Feedback:"
+msgstr ""
+
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
+msgid "Volume:"
+msgstr ""
+
+#: src/echo_plugin/echo.c:114
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"\n"
+"Surround echo by Carl van Schaik, 1999"
+msgstr ""
+
+#: src/echo_plugin/echo.c:120
+msgid "Echo"
+msgstr ""
+
+#: src/ffaudio/ffaudio-core.c:648
+msgid ""
+"Multi-format audio decoding plugin for Audacious using\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+
+#: src/ffaudio/ffaudio-core.c:695
+msgid "FFmpeg Plugin"
+msgstr ""
+
+#: src/filewriter/filewriter.c:409
+msgid "FileWriter Configuration"
+msgstr ""
+
+#: src/filewriter/filewriter.c:421
+msgid "Output file format:"
+msgstr "Output file format:"
+
+#: src/filewriter/filewriter.c:439
+msgid "Configure"
+msgstr "Configure"
+
+#: src/filewriter/filewriter.c:449
+msgid "Save into original directory"
+msgstr "Save into original directory"
+
+#: src/filewriter/filewriter.c:454
+msgid "Save into custom directory"
+msgstr "Save into custom directory"
+
+#: src/filewriter/filewriter.c:464
+msgid "Output file folder:"
+msgstr "Output file folder:"
+
+#: src/filewriter/filewriter.c:468
+msgid "Pick a folder"
+msgstr "Pick a folder"
+
+#: src/filewriter/filewriter.c:481
+msgid "Get filename from:"
+msgstr "Get filename from:"
+
+#: src/filewriter/filewriter.c:484
+msgid "original file tags"
+msgstr "original file tags"
+
+#: src/filewriter/filewriter.c:490
+msgid "original filename"
+msgstr "original filename"
+
+#: src/filewriter/filewriter.c:497
+msgid "Don't strip file name extension"
+msgstr "Do not strip file name extension"
+
+#: src/filewriter/filewriter.c:506
+msgid "Prepend track number to filename"
+msgstr "Prepend track number to filename"
+
+#: src/filewriter/filewriter.c:515
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+
+#: src/filewriter/filewriter.c:532
+msgid "FileWriter Plugin"
+msgstr ""
+
+#: src/filewriter/mp3.c:37 src/filewriter/mp3.c:748
+msgid "Auto"
+msgstr "Auto"
+
+#: src/filewriter/mp3.c:37
+msgid "Joint Stereo"
+msgstr "Joint Stereo"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/mp3.c:688
+msgid "MP3 Configuration"
+msgstr "MP3 Configuration"
+
+#: src/filewriter/mp3.c:712
+msgid "Algorithm Quality:"
+msgstr "Algorithm Quality:"
+
+#: src/filewriter/mp3.c:737
+msgid "Output Samplerate:"
+msgstr "Output Sample rate:"
+
+#: src/filewriter/mp3.c:765
+msgid "(Hz)"
+msgstr "(Hz)"
+
+#: src/filewriter/mp3.c:772
+msgid "Bitrate / Compression ratio:"
+msgstr "Bitrate / Compression ratio:"
+
+#: src/filewriter/mp3.c:796
+msgid "Bitrate (kbps):"
+msgstr "Bitrate (kbps):"
+
+#: src/filewriter/mp3.c:829
+msgid "Compression ratio:"
+msgstr "Compression ratio:"
+
+#: src/filewriter/mp3.c:853
+msgid "Audio Mode:"
+msgstr "Audio Mode:"
+
+#: src/filewriter/mp3.c:878
+msgid "Misc:"
+msgstr "Misc:"
+
+#: src/filewriter/mp3.c:889
+msgid "Enforce strict ISO complience"
+msgstr "Enforce strict ISO compliance"
+
+#: src/filewriter/mp3.c:900
+msgid "Error protection"
+msgstr "Error protection"
+
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
+msgid "Quality"
+msgstr "Quality"
+
+#: src/filewriter/mp3.c:921
+msgid "Enable VBR/ABR"
+msgstr "Enable VBR/ABR"
+
+#: src/filewriter/mp3.c:931
+msgid "Type:"
+msgstr "Type:"
+
+#: src/filewriter/mp3.c:964
+msgid "VBR Options:"
+msgstr "VBR Options:"
+
+#: src/filewriter/mp3.c:980
+msgid "Minimum bitrate (kbps):"
+msgstr "Minimum bitrate (kbps):"
+
+#: src/filewriter/mp3.c:1007
+msgid "Maximum bitrate (kbps):"
+msgstr "Maximum bitrate (kbps):"
+
+#: src/filewriter/mp3.c:1030
+msgid "Strictly enforce minimum bitrate"
+msgstr "Strictly enforce minimum bitrate"
+
+#: src/filewriter/mp3.c:1042
+msgid "ABR Options:"
+msgstr "ABR Options:"
+
+#: src/filewriter/mp3.c:1052
+msgid "Average bitrate (kbps):"
+msgstr "Average bitrate (kbps):"
+
+#: src/filewriter/mp3.c:1080
+msgid "VBR quality level:"
+msgstr "VBR quality level:"
+
+#: src/filewriter/mp3.c:1099
+msgid "Don't write Xing VBR header"
+msgstr "Don't write Xing VBR header"
+
+#: src/filewriter/mp3.c:1112
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1121
+msgid "Frame parameters:"
+msgstr ""
+
+#: src/filewriter/mp3.c:1133
+msgid "Mark as copyright"
+msgstr "Mark as copyright"
+
+#: src/filewriter/mp3.c:1144
+msgid "Mark as original"
+msgstr "Mark as original"
+
+#: src/filewriter/mp3.c:1156
+msgid "ID3 params:"
+msgstr "ID3 params:"
+
+#: src/filewriter/mp3.c:1167
+msgid "Force addition of version 2 tag"
+msgstr "Force addition of version 2 tag"
+
+#: src/filewriter/mp3.c:1177
+msgid "Only add v1 tag"
+msgstr "Only add v1 tag"
+
+#: src/filewriter/mp3.c:1184
+msgid "Only add v2 tag"
+msgstr "Only add v2 tag"
+
+#: src/filewriter/mp3.c:1205
+msgid "Tags"
+msgstr "Tags"
+
+#: src/filewriter/vorbis.c:209
+msgid "Vorbis Encoder Configuration"
+msgstr "Vorbis Encoder Configuration"
+
+#: src/filewriter/vorbis.c:232
+msgid "Quality level (0 - 10):"
+msgstr "Quality level (0 - 10):"
+
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
+msgid "lossless"
+msgstr ""
+
+#: src/flacng/plugin.c:269
+msgid ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+
+#: src/flacng/plugin.c:277
+msgid "FLAC Decoder"
+msgstr ""
+
+#: src/gio/gio.c:300
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+
+#: src/gio/gio.c:322
+msgid "GIO Plugin"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Lets you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
+msgid "Gnome Shortcuts"
+msgstr ""
+
+#: src/gtkui/columns.c:32
+msgid "Entry number"
+msgstr "Entry number"
+
+#: src/gtkui/columns.c:32
+msgid "Title"
+msgstr "Title"
+
+#: src/gtkui/columns.c:33
+msgid "Artist"
+msgstr "Artist"
+
+#: src/gtkui/columns.c:33
+msgid "Year"
+msgstr "Year"
+
+#: src/gtkui/columns.c:33
+msgid "Album"
+msgstr "Album"
+
+#: src/gtkui/columns.c:33
+msgid "Track"
+msgstr "Track"
+
+#: src/gtkui/columns.c:33
+msgid "Genre"
+msgstr ""
+
+#: src/gtkui/columns.c:34
+msgid "Queue position"
+msgstr "Queue position"
+
+#: src/gtkui/columns.c:34
+msgid "Length"
+msgstr "Length"
+
+#: src/gtkui/columns.c:34
+msgid "File path"
+msgstr "File path"
+
+#: src/gtkui/columns.c:34
+msgid "File name"
+msgstr "File name"
+
+#: src/gtkui/columns.c:35
+msgid "Custom title"
+msgstr "Custom title"
+
+#: src/gtkui/columns.c:35
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: src/gtkui/columns.c:277
+msgid "Choose Columns"
+msgstr "Choose Columns"
+
+#: src/gtkui/columns.c:293
+msgid "Available:"
+msgstr "Available:"
+
+#: src/gtkui/columns.c:327
+msgid "Chosen:"
+msgstr "Chosen:"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Left"
+msgstr "Dock at Left"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Right"
+msgstr "Dock at Right"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Top"
+msgstr "Dock at Top"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Bottom"
+msgstr "Dock at Bottom"
+
+#: src/gtkui/layout.c:120
+msgid "Undock"
+msgstr "Undock"
+
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
+msgid "Disable"
+msgstr "Disable"
+
+#: src/gtkui/menus.c:170
+msgid "_Open Files ..."
+msgstr "_Open Files ..."
+
+#: src/gtkui/menus.c:171
+msgid "Open _URL ..."
+msgstr "Open _URL ..."
+
+#: src/gtkui/menus.c:172
+msgid "_Add Files ..."
+msgstr ""
+
+#: src/gtkui/menus.c:173
+msgid "Add U_RL ..."
+msgstr "Add U_RL ..."
+
+#: src/gtkui/menus.c:175
+msgid "_Search Library"
+msgstr ""
+
+#: src/gtkui/menus.c:177
+msgid "A_bout ..."
+msgstr "A_bout ..."
+
+#: src/gtkui/menus.c:178
+msgid "_Preferences ..."
+msgstr "_Preferences ..."
+
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
+msgid "_Quit"
+msgstr "_Quit"
+
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
+msgid "_Play"
+msgstr "_Play"
+
+#: src/gtkui/menus.c:183
+msgid "Paus_e"
+msgstr "Paus_e"
+
+#: src/gtkui/menus.c:184
+msgid "_Stop"
+msgstr "_Stop"
+
+#: src/gtkui/menus.c:185
+msgid "Pre_vious"
+msgstr "Pre_vious"
+
+#: src/gtkui/menus.c:186
+msgid "_Next"
+msgstr "_Next"
+
+#: src/gtkui/menus.c:188
+msgid "_Repeat"
+msgstr "_Repeat"
+
+#: src/gtkui/menus.c:189
+msgid "S_huffle"
+msgstr "S_huffle"
+
+#: src/gtkui/menus.c:190
+msgid "N_o Playlist Advance"
+msgstr "N_o Playlist Advance"
+
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr ""
+
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
+msgid "Song _Info ..."
+msgstr "Song _Info ..."
+
+#: src/gtkui/menus.c:194
+msgid "Jump to _Time ..."
+msgstr "Jump to _Time ..."
+
+#: src/gtkui/menus.c:195
+msgid "_Jump to Song ..."
+msgstr "_Jump to Song ..."
+
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
+msgid "By _Title"
+msgstr "By _Title"
+
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "By Track _Number"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
+msgid "By _Artist"
+msgstr "By _Artist"
+
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
+
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
+msgid "By Release _Date"
+msgstr "By Release _Date"
+
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
+msgid "By _File Path"
+msgstr "By _File Path"
+
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
+msgid "By _Custom Title"
+msgstr "By _Custom Title"
+
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
+msgid "R_everse Order"
+msgstr "R_everse Order"
+
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
+msgid "_Random Order"
+msgstr "_Random Order"
+
+#: src/gtkui/menus.c:233
+msgid "_Play This Playlist"
+msgstr ""
+
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
+msgid "_Refresh"
+msgstr "_Refresh"
+
+#: src/gtkui/menus.c:236
+msgid "_Sort"
+msgstr "_Sort"
+
+#: src/gtkui/menus.c:237
+msgid "Sort Se_lected"
+msgstr ""
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr ""
+
+#: src/gtkui/menus.c:241
+msgid "_New"
+msgstr "_New"
+
+#: src/gtkui/menus.c:242
+msgid "Ren_ame ..."
+msgstr ""
+
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
+msgid "_Close"
+msgstr "_Close"
+
+#: src/gtkui/menus.c:245
+msgid "_Import ..."
+msgstr "_Import ..."
+
+#: src/gtkui/menus.c:246
+msgid "_Export ..."
+msgstr "_Export ..."
+
+#: src/gtkui/menus.c:248
+msgid "Playlist _Manager ..."
+msgstr ""
+
+#: src/gtkui/menus.c:249
+msgid "_Queue Manager ..."
+msgstr "_Queue Manager ..."
+
+#: src/gtkui/menus.c:252
+msgid "Volume _Up"
+msgstr "Volume _Up"
+
+#: src/gtkui/menus.c:253
+msgid "Volume _Down"
+msgstr "Volume _Down"
+
+#: src/gtkui/menus.c:255
+msgid "_Equalizer"
+msgstr "_Equaliser"
+
+#: src/gtkui/menus.c:257
+msgid "E_ffects"
+msgstr "E_ffects"
+
+#: src/gtkui/menus.c:260
+msgid "_Interface"
+msgstr "_Interface"
+
+#: src/gtkui/menus.c:261
+msgid "_Visualizations"
+msgstr ""
+
+#: src/gtkui/menus.c:263
+msgid "Show _Menu Bar"
+msgstr "Show _Menu Bar"
+
+#: src/gtkui/menus.c:264
+msgid "Show I_nfo Bar"
+msgstr "Show I_nfo Bar"
+
+#: src/gtkui/menus.c:265
+msgid "Show Info Bar Vis_ualization"
+msgstr ""
+
+#: src/gtkui/menus.c:266
+msgid "Show _Status Bar"
+msgstr "Show _Status Bar"
+
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
+msgid "Show Close _Buttons"
+msgstr ""
+
+#: src/gtkui/menus.c:271
+msgid "Show Column _Headers"
+msgstr "Show Column _Headers"
+
+#: src/gtkui/menus.c:272
+msgid "Choose _Columns ..."
+msgstr "Choose _Columns ..."
+
+#: src/gtkui/menus.c:273
+msgid "Scrol_l on Song Change"
+msgstr "Scrol_l on Song Change"
+
+#: src/gtkui/menus.c:276
+msgid "_File"
+msgstr "_File"
+
+#: src/gtkui/menus.c:277
+msgid "_Playback"
+msgstr "_Playback"
+
+#: src/gtkui/menus.c:278
+msgid "P_laylist"
+msgstr "P_laylist"
+
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
+msgid "_Services"
+msgstr "_Services"
+
+#: src/gtkui/menus.c:280
+msgid "_Output"
+msgstr "_Output"
+
+#: src/gtkui/menus.c:281
+msgid "_View"
+msgstr "_View"
+
+#: src/gtkui/menus.c:285
+msgid "_Queue/Unqueue"
+msgstr "_Queue/Unqueue"
+
+#: src/gtkui/menus.c:288
+msgid "Cu_t"
+msgstr "Cu_t"
+
+#: src/gtkui/menus.c:289
+msgid "_Copy"
+msgstr "_Copy"
+
+#: src/gtkui/menus.c:290
+msgid "_Paste"
+msgstr "_Paste"
+
+#: src/gtkui/menus.c:291
+msgid "Select _All"
+msgstr "Select _All"
+
+#: src/gtkui/menus.c:297
+msgid "_Rename ..."
+msgstr ""
+
+#: src/gtkui/ui_gtk.c:96
+msgid "GTK Interface"
+msgstr "GTK Interface"
+
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.c:204
+msgid "Buffering ..."
+msgstr ""
+
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
+msgid "Error"
+msgstr "Error"
+
+#: src/gtkui/ui_statusbar.c:108
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtkui/ui_statusbar.c:123
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
+
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
+msgid "Play"
+msgstr "Play"
+
+#: src/hotkey/gui.c:72
+msgid "Pause/Resume"
+msgstr "Pause/Resume"
+
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
+msgid "Stop"
+msgstr "Stop"
+
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
+msgstr ""
+
+#: src/hotkey/gui.c:77
+msgid "Mute"
+msgstr "Mute"
+
+#: src/hotkey/gui.c:78
+msgid "Volume up"
+msgstr ""
+
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr ""
+
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
+msgstr ""
+
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr ""
+
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Show On-Screen-Display"
+
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
+msgstr ""
+
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
+msgstr ""
+
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr ""
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
+msgstr ""
+
+#: src/hotkey/gui.c:96
+msgid "(none)"
+msgstr "(none)"
+
+#: src/hotkey/gui.c:233
+msgid ""
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
+"\n"
+"Do you want to continue?"
+
+#: src/hotkey/gui.c:235
+msgid "Binding mouse buttons"
+msgstr "Binding mouse buttons"
+
+#: src/hotkey/gui.c:385
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Global Hotkey Plugin Configuration"
+
+#: src/hotkey/gui.c:401
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+
+#: src/hotkey/gui.c:406
+msgid "Hotkeys:"
+msgstr "Hotkeys:"
+
+#: src/hotkey/gui.c:423
+msgid "Action:"
+msgstr "Action:"
+
+#: src/hotkey/gui.c:430
+msgid "Key Binding:"
+msgstr "Key Binding:"
+
+#: src/hotkey/plugin.c:66
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+
+#: src/hotkey/plugin.c:78
+msgid "Global Hotkeys"
+msgstr ""
+
+#: src/jack/jack.c:410
+msgid ""
+"Based on xmms-jack, by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Ported to Audacious by Giacomo Lozito"
+msgstr ""
+
+#: src/jack/jack.c:416
+msgid "JACK Output"
+msgstr ""
+
+#: src/ladspa/plugin.c:493
+#, c-format
+msgid "%s Settings"
+msgstr "%s Settings"
+
+#: src/ladspa/plugin.c:561
+msgid "LADSPA Host Settings"
+msgstr "LADSPA Host Settings"
+
+#: src/ladspa/plugin.c:570
+msgid "Module paths:"
+msgstr "Module paths:"
+
+#: src/ladspa/plugin.c:575
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+
+#: src/ladspa/plugin.c:591
+msgid "Available plugins:"
+msgstr "Available plugins:"
+
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
+msgid "Enable"
+msgstr "Enable"
+
+#: src/ladspa/plugin.c:610
+msgid "Enabled plugins:"
+msgstr "Enabled plugins:"
+
+#: src/ladspa/plugin.c:626
+msgid "Settings"
+msgstr "Settings"
+
+#: src/ladspa/plugin.c:645
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+
+#: src/ladspa/plugin.c:650
+msgid "LADSPA Host"
+msgstr ""
+
+#: src/lirc/lirc.c:76
+#, c-format
+msgid "%s: could not init LIRC support\n"
+msgstr ""
+
+#: src/lirc/lirc.c:83
+#, c-format
+msgid ""
+"%s: could not read LIRC config file\n"
+"%s: please read the documentation of LIRC\n"
+"%s: how to create a proper config file\n"
+msgstr ""
+
+#: src/lirc/lirc.c:114
+#, c-format
+msgid "%s: trying to reconnect...\n"
+msgstr ""
+
+#: src/lirc/lirc.c:354
+#, c-format
+msgid "%s: unknown command \"%s\"\n"
+msgstr ""
+
+#: src/lirc/lirc.c:365
+#, c-format
+msgid "%s: disconnected from LIRC\n"
+msgstr ""
+
+#: src/lirc/lirc.c:371
+#, c-format
+msgid "%s: will try reconnect every %d seconds...\n"
+msgstr ""
+
+#: src/lirc/lirc.c:381
+msgid ""
+"A simple plugin to control Audacious using the LIRC remote control daemon\n"
+"\n"
+"Adapted for Audacious by:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Based on the XMMS LIRC plugin by:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"For more information about LIRC, see http://lirc.org."
+msgstr ""
+
+#: src/lirc/lirc.c:392
+msgid "Connection"
+msgstr ""
+
+#: src/lirc/lirc.c:393
+msgid "Reconnect to LIRC server"
+msgstr ""
+
+#: src/lirc/lirc.c:395
+msgid "Wait before reconnecting:"
+msgstr ""
+
+#: src/lirc/lirc.c:405
+msgid "LIRC Plugin"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:117
+msgid "No lyrics available"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
+#, c-format
+msgid "Unable to fetch %s"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
+#, c-format
+msgid "Unable to parse %s"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:260
+msgid "Looking for lyrics ..."
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:271
+msgid "Missing song metadata"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:284
+msgid "Connecting to lyrics.wikia.com ..."
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:411
+msgid "LyricWiki Plugin"
+msgstr ""
+
+#: src/m3u/m3u.c:121
+msgid "M3U Playlists"
+msgstr ""
+
+#: src/metronom/metronom.c:127
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Tact generator: %d bpm"
+
+#: src/metronom/metronom.c:129
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Tact generator: %d bpm %d/%d"
+
+#: src/metronom/metronom.c:246
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr ""
+
+#: src/metronom/metronom.c:255
+msgid "Tact Generator"
+msgstr ""
+
+#: src/mixer/mixer.c:169
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+
+#: src/mixer/mixer.c:173
+msgid "Channel Mixer"
+msgstr ""
+
+#: src/mixer/mixer.c:174
+msgid "Output channels:"
+msgstr "Output channels:"
+
+#: src/mixer/mixer.c:184
+msgid "Channel Mixer"
+msgstr ""
+
+#: src/mms/mms.c:224
+msgid "MMS Plugin"
+msgstr ""
+
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
+msgid "ModPlug (Module Player)"
+msgstr ""
+
+#: src/mpg123/mpg123.c:213
+msgid "Surround"
+msgstr "Surround"
+
+#: src/mpg123/mpg123.c:569
+msgid "MPG123 Plugin"
+msgstr ""
+
+#: src/mpris2/plugin.c:403
+msgid "MPRIS 2 Server"
+msgstr ""
+
+#: src/neon/neon.c:1228
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr ""
+
+#: src/notify/event.c:64
+msgid "Stopped"
+msgstr "Stopped"
+
+#: src/notify/event.c:64
+msgid "Audacious is not playing."
+msgstr "Audacious is not playing."
+
+#: src/notify/notify.c:33
+msgid ""
+"Desktop Notifications Plugin for Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
+msgid "Desktop Notifications"
+msgstr ""
+
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr ""
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr ""
+
+#: src/oss4/plugin.c:36
+msgid "1. Default device"
+msgstr "1. Default device"
+
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
+msgid "Audio device:"
+msgstr "Audio device:"
+
+#: src/oss4/plugin.c:77
+msgid "Use alternate device:"
+msgstr "Use alternate device:"
+
+#: src/oss4/plugin.c:81
+msgid "Save volume between sessions."
+msgstr ""
+
+#: src/oss4/plugin.c:83
+msgid "Enable format conversions made by the OSS software."
+msgstr "Enable format conversions made by the OSS software."
+
+#: src/oss4/plugin.c:85
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr ""
+
+#: src/oss4/plugin.c:108
+msgid ""
+"OSS4 Output Plugin for Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+
+#: src/oss4/plugin.c:115
+msgid "OSS4 Output"
+msgstr ""
+
+#: src/pls/pls.c:113
+msgid "PLS Playlists"
+msgstr ""
+
+#: src/psf/plugin.c:264
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr ""
+
+#: src/pulse_audio/pulse_audio.c:644
+msgid ""
+"Audacious PulseAudio Output Plugin\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+
+#: src/pulse_audio/pulse_audio.c:662
+msgid "PulseAudio Output"
+msgstr ""
+
+#: src/resample/resample.c:161
+msgid ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/resample/resample.c:165
+msgid "Skip/repeat samples"
+msgstr ""
+
+#: src/resample/resample.c:166
+msgid "Linear interpolation"
+msgstr ""
+
+#: src/resample/resample.c:167
+msgid "Fast sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.c:168
+msgid "Medium sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.c:169
+msgid "Best sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.c:172
+msgid "Conversion"
+msgstr ""
+
+#: src/resample/resample.c:173
+msgid "Method:"
+msgstr "Method:"
+
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
+msgid "Rate:"
+msgstr ""
+
+#: src/resample/resample.c:179
+msgid "Rate Mappings"
+msgstr ""
+
+#: src/resample/resample.c:180
+msgid "Use rate mappings"
+msgstr ""
+
+#: src/resample/resample.c:182
+msgid "8 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:185
+msgid "16 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:188
+msgid "22.05 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:191
+msgid "44.1 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:194
+msgid "48 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:197
+msgid "96 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:200
+msgid "192 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:210
+msgid "Sample Rate Converter"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr ""
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+
+#: src/sdlout/plugin.c:26
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+
+#: src/sdlout/plugin.c:31
+msgid "SDL Output"
+msgstr ""
+
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
+msgid "Library"
+msgstr ""
+
+#: src/search-tool/search-tool.c:219
+msgid "Unknown Artist"
+msgstr ""
+
+#: src/search-tool/search-tool.c:221
+msgid "Unknown Album"
+msgstr ""
+
+#: src/search-tool/search-tool.c:632
+#, c-format
+msgid ""
+"%s\n"
+" on %s by %s"
+msgstr ""
+
+#: src/search-tool/search-tool.c:638
+#, c-format
+msgid "%d album"
+msgid_plural "%d albums"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/search-tool/search-tool.c:640
+#, c-format
+msgid ""
+"%s\n"
+" %s, %d song"
+msgid_plural ""
+"%s\n"
+" %s, %d songs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/search-tool/search-tool.c:646
+#, c-format
+msgid ""
+"%s\n"
+" %d song by %s"
+msgid_plural ""
+"%s\n"
+" %d songs by %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/search-tool/search-tool.c:687
+msgid "_Create Playlist"
+msgstr ""
+
+#: src/search-tool/search-tool.c:694
+msgid "_Add to Playlist"
+msgstr ""
+
+#: src/search-tool/search-tool.c:734
+msgid "Search library"
+msgstr ""
+
+#: src/search-tool/search-tool.c:739
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+
+#: src/search-tool/search-tool.c:747
+msgid "Please wait ..."
+msgstr ""
+
+#: src/search-tool/search-tool.c:769
+msgid "Choose Folder"
+msgstr ""
+
+#: src/search-tool/search-tool.c:808
+msgid "Search Tool"
+msgstr ""
+
+#: src/skins/plugin.c:49
+msgid "Winamp Classic Interface"
+msgstr ""
+
+#: src/skins/skins_cfg.c:204
+msgid "_Player:"
+msgstr "_Player:"
+
+#: src/skins/skins_cfg.c:205
+msgid "Select main player window font:"
+msgstr "Select main player window font:"
+
+#: src/skins/skins_cfg.c:207
+msgid "_Playlist:"
+msgstr "_Playlist:"
+
+#: src/skins/skins_cfg.c:208
+msgid "Select playlist font:"
+msgstr "Select playlist font:"
+
+#: src/skins/skins_cfg.c:212
+msgid "_Fonts"
+msgstr "_Fonts"
+
+#: src/skins/skins_cfg.c:215
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Use bitmap fonts (supports ASCII only)"
+
+#: src/skins/skins_cfg.c:217
+msgid "Scroll song title in both directions"
+msgstr "Scroll song title in both directions"
+
+#: src/skins/skins_cfg.c:295
+msgid "_Skin"
+msgstr "_Skin"
+
+#: src/skins/skins_cfg.c:342
+msgid "Interface Preferences"
+msgstr "Interface Preferences"
+
+#: src/skins/ui_equalizer.c:328
+msgid "Preamp"
+msgstr "Preamp"
+
+#: src/skins/ui_equalizer.c:332
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/ui_equalizer.c:375
+msgid "Audacious Equalizer"
+msgstr "Audacious Equaliser"
+
+#: src/skins/ui_equalizer.c:890
+msgid "Presets"
+msgstr "Presets"
+
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
+msgid "Load preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:988
+msgid "Load auto-preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1018 src/skins/ui_equalizer.c:1036
+#: src/skins/ui_equalizer.c:1052
+msgid "Load equalizer preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
+msgid "Save preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1087
+msgid "Save auto-preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1118 src/skins/ui_equalizer.c:1154
+msgid "Save equalizer preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
+msgid "Delete preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1190
+msgid "Delete auto-preset"
+msgstr ""
+
+#: src/skins/ui_main.c:414
+msgid "kbps"
+msgstr "kbps"
+
+#: src/skins/ui_main.c:422
+msgid "kHz"
+msgstr "kHz"
+
+#: src/skins/ui_main.c:770
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Seek to %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/ui_main.c:791
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volume: %d%%"
+
+#: src/skins/ui_main.c:814
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balance: %d%% left"
+
+#: src/skins/ui_main.c:816
+msgid "Balance: center"
+msgstr "Balance: centre"
+
+#: src/skins/ui_main.c:818
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balance: %d%% right"
+
+#: src/skins/ui_main.c:942
+msgid "Options Menu"
+msgstr "Options Menu"
+
+#: src/skins/ui_main.c:946
+msgid "Disable 'Always On Top'"
+msgstr "Disable 'Always On Top'"
+
+#: src/skins/ui_main.c:948
+msgid "Enable 'Always On Top'"
+msgstr "Enable 'Always On Top'"
+
+#: src/skins/ui_main.c:951
+msgid "File Info Box"
+msgstr "File Info Box"
+
+#: src/skins/ui_main.c:956
+msgid "Visualization Menu"
+msgstr "Visualisation Menu"
+
+#: src/skins/ui_main.c:1591
+msgid "Single mode."
+msgstr "Single mode."
+
+#: src/skins/ui_main.c:1593
+msgid "Playlist mode."
+msgstr "Playlist mode."
+
+#: src/skins/ui_main.c:1615
+msgid "Stopping after song."
+msgstr "Stopping after song."
+
+#: src/skins/ui_main.c:1617
+msgid "Not stopping after song."
+msgstr "Not stopping after song."
+
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
+msgid "Autoscroll Song Name"
+msgstr ""
+
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
+msgid "Stop after Current Song"
+msgstr "Stop after Current Song"
+
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
+msgid "Peaks"
+msgstr "Peaks"
+
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
+msgid "Repeat"
+msgstr "Repeat"
+
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
+msgid "Shuffle"
+msgstr "Shuffle"
+
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
+msgid "No Playlist Advance"
+msgstr "No Playlist Advance"
+
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
+msgid "Show Player"
+msgstr "Show Player"
+
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
+msgid "Show Playlist Editor"
+msgstr "Show Playlist Editor"
+
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
+msgid "Show Equalizer"
+msgstr "Show Equaliser"
+
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
+msgid "Always on Top"
+msgstr ""
+
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
+msgid "Put on All Workspaces"
+msgstr ""
+
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
+msgid "Roll up Player"
+msgstr ""
+
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
+msgid "Roll up Playlist Editor"
+msgstr ""
+
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
+msgid "Roll up Equalizer"
+msgstr ""
+
+#: src/skins/ui_manager.c:114
+msgid "Analyzer"
+msgstr ""
+
+#: src/skins/ui_manager.c:115
+msgid "Scope"
+msgstr ""
+
+#: src/skins/ui_manager.c:116
+msgid "Voiceprint"
+msgstr ""
+
+#: src/skins/ui_manager.c:117
+msgid "Off"
+msgstr ""
+
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
+msgid "Normal"
+msgstr ""
+
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+msgid "Fire"
+msgstr ""
+
+#: src/skins/ui_manager.c:123
+msgid "Vertical Lines"
+msgstr ""
+
+#: src/skins/ui_manager.c:127
+msgid "Lines"
+msgstr ""
+
+#: src/skins/ui_manager.c:128
+msgid "Bars"
+msgstr ""
+
+#: src/skins/ui_manager.c:132
+msgid "Dot Scope"
+msgstr ""
+
+#: src/skins/ui_manager.c:133
+msgid "Line Scope"
+msgstr ""
+
+#: src/skins/ui_manager.c:134
+msgid "Solid Scope"
+msgstr ""
+
+#: src/skins/ui_manager.c:140
+msgid "Ice"
+msgstr ""
+
+#: src/skins/ui_manager.c:145
+msgid "Smooth"
+msgstr ""
+
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
+msgid "Slowest"
+msgstr ""
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slow"
+msgstr ""
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
+msgid "Medium"
+msgstr ""
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Fast"
+msgstr ""
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fastest"
+msgstr ""
+
+#: src/skins/ui_manager.c:165
+msgid "Time Elapsed"
+msgstr ""
+
+#: src/skins/ui_manager.c:166
+msgid "Time Remaining"
+msgstr ""
+
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
+msgid "Previous"
+msgstr ""
+
+#: src/skins/ui_manager.c:195
+msgid "Visualization"
+msgstr ""
+
+#: src/skins/ui_manager.c:196
+msgid "Visualization Mode"
+msgstr ""
+
+#: src/skins/ui_manager.c:197
+msgid "Analyzer Mode"
+msgstr ""
+
+#: src/skins/ui_manager.c:198
+msgid "Scope Mode"
+msgstr ""
+
+#: src/skins/ui_manager.c:199
+msgid "Voiceprint Mode"
+msgstr ""
+
+#: src/skins/ui_manager.c:200
+msgid "WindowShade VU Mode"
+msgstr ""
+
+#: src/skins/ui_manager.c:201
+msgid "Analyzer Falloff"
+msgstr ""
+
+#: src/skins/ui_manager.c:202
+msgid "Peaks Falloff"
+msgstr ""
+
+#: src/skins/ui_manager.c:207
+msgid "Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
+msgid "Play Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
+msgid "New Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
+msgid "Select Next Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
+msgid "Select Previous Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
+msgid "Delete Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:224
+msgid "Import Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:225
+msgid "Loads a playlist file into the selected playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:228
+msgid "Export Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:229
+msgid "Saves the selected playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:231
+msgid "Refresh List"
+msgstr ""
+
+#: src/skins/ui_manager.c:232
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr ""
+
+#: src/skins/ui_manager.c:235
+msgid "Playlist Manager"
+msgstr ""
+
+#: src/skins/ui_manager.c:238
+msgid "Queue Manager"
+msgstr ""
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr ""
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr ""
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr ""
+
+#: src/skins/ui_manager.c:250
+msgid "Add Internet Address..."
+msgstr ""
+
+#: src/skins/ui_manager.c:251
+msgid "Adds a remote track to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:254
+msgid "Add Files..."
+msgstr ""
+
+#: src/skins/ui_manager.c:255
+msgid "Adds files to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:260
+msgid "Search and Select"
+msgstr ""
+
+#: src/skins/ui_manager.c:261
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr ""
+
+#: src/skins/ui_manager.c:264
+msgid "Invert Selection"
+msgstr ""
+
+#: src/skins/ui_manager.c:265
+msgid "Inverts the selected and unselected entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:268
+msgid "Select All"
+msgstr ""
+
+#: src/skins/ui_manager.c:269
+msgid "Selects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:272
+msgid "Select None"
+msgstr ""
+
+#: src/skins/ui_manager.c:273
+msgid "Deselects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:278
+msgid "Remove All"
+msgstr ""
+
+#: src/skins/ui_manager.c:279
+msgid "Removes all entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:282
+msgid "Clear Queue"
+msgstr ""
+
+#: src/skins/ui_manager.c:283
+msgid "Clears the queue associated with this playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:286
+msgid "Remove Unavailable Files"
+msgstr ""
+
+#: src/skins/ui_manager.c:287
+msgid "Removes unavailable files from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:290
+msgid "Remove Duplicates"
+msgstr ""
+
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
+msgid "By Title"
+msgstr ""
+
+#: src/skins/ui_manager.c:293
+msgid "Removes duplicate entries from the playlist by title."
+msgstr ""
+
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
+msgid "By Filename"
+msgstr ""
+
+#: src/skins/ui_manager.c:297
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr ""
+
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
+msgid "By Path + Filename"
+msgstr ""
+
+#: src/skins/ui_manager.c:301
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr ""
+
+#: src/skins/ui_manager.c:304
+msgid "Remove Unselected"
+msgstr ""
+
+#: src/skins/ui_manager.c:305
+msgid "Remove unselected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:308
+msgid "Remove Selected"
+msgstr ""
+
+#: src/skins/ui_manager.c:309
+msgid "Remove selected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:314
+msgid "Randomize List"
+msgstr ""
+
+#: src/skins/ui_manager.c:315
+msgid "Randomizes the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:318
+msgid "Reverse List"
+msgstr ""
+
+#: src/skins/ui_manager.c:319
+msgid "Reverses the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:322
+msgid "Sort List"
+msgstr ""
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "Sorts the list by title."
+msgstr ""
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+msgid "By Album"
+msgstr ""
+
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+msgid "Sorts the list by album."
+msgstr ""
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+msgid "By Artist"
+msgstr ""
+
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+msgid "Sorts the list by artist."
+msgstr ""
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "Sorts the list by filename."
+msgstr ""
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "Sorts the list by full pathname."
+msgstr ""
+
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+msgid "By Date"
+msgstr ""
+
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+msgid "Sorts the list by modification time."
+msgstr ""
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+msgid "By Track Number"
+msgstr ""
+
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+msgid "Sorts the list by track number."
+msgstr ""
+
+#: src/skins/ui_manager.c:352
+msgid "Sort Selected"
+msgstr ""
+
+#: src/skins/ui_manager.c:388
+msgid "File"
+msgstr ""
+
+#: src/skins/ui_manager.c:391
+msgid "Plugin Services"
+msgstr ""
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View Track Details"
+msgstr ""
+
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+msgid "View track details"
+msgstr ""
+
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
+msgid "About Audacious"
+msgstr ""
+
+#: src/skins/ui_manager.c:402
+msgid "Play File"
+msgstr ""
+
+#: src/skins/ui_manager.c:403
+msgid "Load and play a file"
+msgstr ""
+
+#: src/skins/ui_manager.c:405
+msgid "Play Location"
+msgstr ""
+
+#: src/skins/ui_manager.c:406
+msgid "Play media from the selected location"
+msgstr ""
+
+#: src/skins/ui_manager.c:408
+msgid "Plugin services"
+msgstr ""
+
+#: src/skins/ui_manager.c:410
+msgid "Preferences"
+msgstr ""
+
+#: src/skins/ui_manager.c:411
+msgid "Open preferences window"
+msgstr ""
+
+#: src/skins/ui_manager.c:414
+msgid "Quit Audacious"
+msgstr ""
+
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
+msgid "Set A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
+msgid "Clear A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Jump to File"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
+msgid "Jump to Time"
+msgstr ""
+
+#: src/skins/ui_manager.c:428
+msgid "Queue Toggle"
+msgstr ""
+
+#: src/skins/ui_manager.c:429
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr ""
+
+#: src/skins/ui_manager.c:432
+msgid "Copy"
+msgstr ""
+
+#: src/skins/ui_manager.c:435
+msgid "Cut"
+msgstr ""
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr ""
+
+#: src/skins/ui_manager.c:445
+msgid "Load"
+msgstr ""
+
+#: src/skins/ui_manager.c:446
+msgid "Import"
+msgstr ""
+
+#: src/skins/ui_manager.c:447
+msgid "Save"
+msgstr ""
+
+#: src/skins/ui_manager.c:448
+msgid "Delete"
+msgstr ""
+
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
+msgid "Preset"
+msgstr ""
+
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
+msgid "Auto-load preset"
+msgstr ""
+
+#: src/skins/ui_manager.c:454
+msgid "Load auto-load preset"
+msgstr ""
+
+#: src/skins/ui_manager.c:457
+msgid "Load default preset into equalizer"
+msgstr ""
+
+#: src/skins/ui_manager.c:459
+msgid "Zero"
+msgstr ""
+
+#: src/skins/ui_manager.c:460
+msgid "Set equalizer preset levels to zero"
+msgstr ""
+
+#: src/skins/ui_manager.c:462
+msgid "From file"
+msgstr ""
+
+#: src/skins/ui_manager.c:463
+msgid "Load preset from file"
+msgstr ""
+
+#: src/skins/ui_manager.c:465
+msgid "From WinAMP EQF file"
+msgstr ""
+
+#: src/skins/ui_manager.c:466
+msgid "Load preset from WinAMP EQF file"
+msgstr ""
+
+#: src/skins/ui_manager.c:468
+msgid "WinAMP Presets"
+msgstr ""
+
+#: src/skins/ui_manager.c:469
+msgid "Import WinAMP presets"
+msgstr ""
+
+#: src/skins/ui_manager.c:475
+msgid "Save auto-load preset"
+msgstr ""
+
+#: src/skins/ui_manager.c:478
+msgid "Save default preset"
+msgstr ""
+
+#: src/skins/ui_manager.c:480
+msgid "To file"
+msgstr ""
+
+#: src/skins/ui_manager.c:481
+msgid "Save preset to file"
+msgstr ""
+
+#: src/skins/ui_manager.c:483
+msgid "To WinAMP EQF file"
+msgstr ""
+
+#: src/skins/ui_manager.c:484
+msgid "Save preset to WinAMP EQF file"
+msgstr ""
+
+#: src/skins/ui_manager.c:490
+msgid "Delete auto-load preset"
+msgstr ""
+
+#: src/skins/ui_playlist.c:244
+msgid "Search entries in active playlist"
+msgstr ""
+
+#: src/skins/ui_playlist.c:251
+msgid ""
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr ""
+
+#: src/skins/ui_playlist.c:259
+msgid "Title: "
+msgstr ""
+
+#: src/skins/ui_playlist.c:267
+msgid "Album: "
+msgstr ""
+
+#: src/skins/ui_playlist.c:275
+msgid "Artist: "
+msgstr ""
+
+#: src/skins/ui_playlist.c:283
+msgid "Filename: "
+msgstr ""
+
+#: src/skins/ui_playlist.c:292
+msgid "Clear previous selection before searching"
+msgstr ""
+
+#: src/skins/ui_playlist.c:295
+msgid "Automatically toggle queue for matching entries"
+msgstr ""
+
+#: src/skins/ui_playlist.c:298
+msgid "Create a new playlist with matching entries"
+msgstr ""
+
+#: src/skins/ui_playlist.c:738
+msgid "Audacious Playlist Editor"
+msgstr ""
+
+#: src/skins/ui_playlist.c:772
+#, c-format
+msgid "%s (%d of %d)"
+msgstr ""
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr ""
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr ""
+
+#: src/skins/util.c:773
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr ""
+
+#: src/sndfile/plugin.c:416
+msgid ""
+"Based on the xmms_sndfile plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+
+#: src/sndfile/plugin.c:435
+msgid "Sndfile Plugin"
+msgstr ""
+
+#: src/sndio/sndio.c:172
+msgid "About Sndio Output Plugin"
+msgstr ""
+
+#: src/sndio/sndio.c:173
+msgid ""
+"Sndio Output Plugin\n"
+"\n"
+"Written by Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+
+#: src/sndio/sndio.c:248
+msgid "Unsupported format"
+msgstr ""
+
+#: src/sndio/sndio.c:249
+msgid ""
+"A format not supported by the audio device was requested.\n"
+"\n"
+"Please try again with the sndiod(1) server running."
+msgstr ""
+
+#: src/sndio/sndio.c:384
+msgid "sndio device"
+msgstr ""
+
+#: src/sndio/sndio.c:400
+msgid "(empty means default)"
+msgstr ""
+
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Cancel"
+
+#: src/song_change/song_change.c:54
+msgid "Song Change"
+msgstr ""
+
+#: src/song_change/song_change.c:436
+msgid "Command to run when Audacious starts a new song."
+msgstr ""
+
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
+msgid "Command:"
+msgstr ""
+
+#: src/song_change/song_change.c:442
+msgid "Command to run toward the end of a song."
+msgstr ""
+
+#: src/song_change/song_change.c:448
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr ""
+
+#: src/song_change/song_change.c:454
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr ""
+
+#: src/song_change/song_change.c:460
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command):\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%l: Length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr ""
+
+#: src/song_change/song_change.c:487
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr ""
+
+#: src/song_change/song_change.c:498
+msgid "Commands"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
+msgid "Speed and Pitch"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:226
+msgid "Speed:"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:229
+msgid "Pitch:"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:264
+msgid "Speed and Pitch"
+msgstr ""
+
+#: src/statusicon/statusicon.c:390
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+
+#: src/statusicon/statusicon.c:397
+msgid "Mouse Scroll Action"
+msgstr ""
+
+#: src/statusicon/statusicon.c:398
+msgid "Change volume"
+msgstr ""
+
+#: src/statusicon/statusicon.c:401
+msgid "Change playing song"
+msgstr ""
+
+#: src/statusicon/statusicon.c:404
+msgid "Other Settings"
+msgstr ""
+
+#: src/statusicon/statusicon.c:405
+msgid "Disable the popup window"
+msgstr ""
+
+#: src/statusicon/statusicon.c:407
+msgid "Close to the system tray"
+msgstr ""
+
+#: src/statusicon/statusicon.c:409
+msgid "Advance in playlist when scrolling upward"
+msgstr ""
+
+#: src/statusicon/statusicon.c:418
+msgid "Status Icon"
+msgstr ""
+
+#: src/stereo_plugin/stereo.c:17
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+
+#: src/stereo_plugin/stereo.c:25
+msgid "Extra Stereo"
+msgstr ""
+
+#: src/stereo_plugin/stereo.c:36
+msgid "Extra Stereo"
+msgstr ""
+
+#: src/tonegen/tonegen.c:84
+#, c-format
+msgid "%s %.1f Hz"
+msgstr ""
+
+#: src/tonegen/tonegen.c:84
+msgid "Tone Generator: "
+msgstr ""
+
+#: src/tonegen/tonegen.c:197
+msgid ""
+"Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
+msgstr ""
+
+#: src/tonegen/tonegen.c:206
+msgid "Tone Generator"
+msgstr ""
+
+#: src/unix-io/unix-io.c:243
+msgid ""
+"File I/O Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
+msgstr ""
+
+#: src/unix-io/unix-io.c:266
+msgid "File I/O Plugin"
+msgstr ""
+
+#: src/voice_removal/voice_removal.c:58
+msgid "Voice Removal"
+msgstr ""
+
+#: src/vorbis/vorbis.c:562
+msgid ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Based on the Xiph.org Foundation's Ogg Vorbis Plugin:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Original code by:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contributions from:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+
+#: src/vorbis/vorbis.c:582
+msgid "Ogg Vorbis Decoder"
+msgstr ""
+
+#: src/vtx/vtx.c:242
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+
+#: src/vtx/vtx.c:248
+msgid "VTX Decoder"
+msgstr ""
+
+#: src/wavpack/wavpack.c:282
+msgid "lossy (hybrid)"
+msgstr ""
+
+#: src/wavpack/wavpack.c:284
+msgid "lossy"
+msgstr ""
+
+#: src/wavpack/wavpack.c:334
+msgid ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
+msgstr ""
+
+#: src/wavpack/wavpack.c:341
+msgid "WavPack Decoder"
+msgstr ""
+
+#: src/xsf/plugin.c:274
+msgid "2SF Decoder"
+msgstr ""
+
+#: src/xspf/xspf.c:440
+msgid "XML Shareable Playlists (XSPF)"
+msgstr ""
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - select file"

audacious-plugins-3.3.4.tar.bz2/po/es.po -> audacious-plugins-3.4.2.tar.bz2/po/es.po Changed

@@ -1,598 +1,615 @@
 # Spanish translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012.
-# Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010.
-# Jorge Andrés <winninglero@gmail.com>, 2011.
-# Lucía Balsa <lucia.balsa.prados@gmail.com>, 2012.
-# Marco Antonio Frias Butrón <marcoantoniofrias@gmail.com>, 2012.
-# Matias Menich <und34d@gmail.com>, 2012.
-# <xukosky@yahoo.es>, 2011, 2012.
-# <yo@miguelrevilla.com>, 2012.
+# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2013
+# Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012
+# Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010
+# frangor <frangor@frangor.info>, 2013
+# Excelente <dny1020@aol.com>, 2013
+# Jorge Andrés <winninglero@gmail.com>, 2011
+# Lucía Balsa <lucia.balsa.prados@gmail.com>, 2012
+# Marco Antonio Frias Butrón <marcoantoniofrias@gmail.com>, 2012
+# Matias Menich <und34d@gmail.com>, 2012
+# xukosky <xukosky@yahoo.es>, 2011, 2012
+# enjolras <yo@miguelrevilla.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-28 12:09+0000\n"
-"Last-Translator: enjolras <yo@miguelrevilla.com>\n"
-"Language-Team: Spanish\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-08-20 12:11+0000\n"
+"Last-Translator: Excelente <dny1020@aol.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/projects/p/audacious/"
+"language/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "envolvente"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Decodificador AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
-msgstr ""
+msgstr "secuenciado"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
-msgstr ""
+msgstr "AdPlug (Reproductor AdLib)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Esta es su llamada para despertar."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "Aceptar"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Ajustes de alarma"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Tiempo"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minutos"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Silencio tras:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Alarma a (predeterminado):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Esta es su llamada para despertar."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Seleccione los días para que salte la alarma"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Predeterminado"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Recordatorio"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Día"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Lunes"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Lunes"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Ajustes de Alarma"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Tiempo"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Alarma a (predeterminado):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Silencio tras:"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "horas"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minutos"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Seleccione los días para que salte la alarma"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Día"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Predeterminado"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Días"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Desvanecimiento"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "segundos"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Volumen"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Actual"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Iniciar a"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Final"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Actual"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Comando adicional"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "activar"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Lista de reproducción (opcional)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Seleccione una lista de reproducción"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Utilizar recordatorio"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Opciones"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "¿Qué significan estas opciones?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Su recordatorio para hoy es..."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Gracias"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Carátula del Álbum"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Dispositivo PCM predeterminado"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Dispositivo mezclador predeterminado"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Preferencias de complemento de salida ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Dispositivo PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Dispositivo mezclador:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Elemento mezclador:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Evitar los cuelgues por falta de recursos"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "Salida ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "No tiene seleccionado ningún puerto secuenciador para la reproducción MIDI. Puede hacerlo en la preferencias del complemento MIDI."
+msgstr ""
+"No tiene seleccionado ningún puerto secuenciador para la reproducción MIDI. "
+"Puede hacerlo en la preferencias del complemento MIDI."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr ""
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Motor ALSA "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Este motor envía eventos MIDI a un grupo de puertos secuenciadores ALSA definidos. El interfaz secuenciador ALSA es muy versátil, puede proporcionar puertos para sintetizadores hardware (p. ej. emu10k1) pero también sintetizadores software, dispositivos externos, etc.\nEste motor no produce sonido, los eventos MIDI son manejados directamente por los dispositivos/programas tras los puertos ALSA; por ejemplo, los eventos MIDI enviados a un sintetizador hardware serán reproducidos directamente.\nMotor escrito por Giacomo Lozito."
-
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+msgstr ""
+"Este motor envía eventos MIDI a un grupo de puertos secuenciadores ALSA "
+"definidos. El interfaz secuenciador ALSA es muy versátil, puede proporcionar "
+"puertos para sintetizadores hardware (p. ej. emu10k1) pero también "
+"sintetizadores software, dispositivos externos, etc.\n"
+"Este motor no produce sonido, los eventos MIDI son manejados directamente "
+"por los dispositivos/programas tras los puertos ALSA; por ejemplo, los "
+"eventos MIDI enviados a un sintetizador hardware serán reproducidos "
+"directamente.\n"
+"Motor escrito por Giacomo Lozito."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Motor FluidSynth "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Este motor produce sonido al enviar eventos MIDI a FluidSynth, un sintetizador software en tiempo real basado en la especificación SoundFont2 (www.fluidsynth.org).\nEl sonido producido se puede manipular mediante los módulos de efectos y es procesado por el módulo de salida seleccionado.\nMotor escrito por Giacomo Lozito."
+msgstr ""
+"Este motor produce sonido al enviar eventos MIDI a FluidSynth, un "
+"sintetizador software en tiempo real basado en la especificación SoundFont2 "
+"(www.fluidsynth.org).\n"
+"El sonido producido se puede manipular mediante los módulos de efectos y es "
+"procesado por el módulo de salida seleccionado.\n"
+"Motor escrito por Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Puerto"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Nombre del cliente"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Nombre del puerto"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Puertos de salida ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Tarjeta de sonido: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Control mezclador: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Ajustes del mezclador"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "motor\nALSA"
+msgstr ""
+"motor\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "Complemento AMIDI - información del motor"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Selección de motor"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Ajustes de reproducción"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transponer: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Cambio de batería: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Ajustes avanzados"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "calcular la longitud de los archivos MIDI en lista de reproducción"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "extraer comentarios desde el archivo MIDI (si está disponible)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "extraer letras desde el archivo MIDI (si está disponible)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
 msgstr "Complemento AMIDI"
 
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "Complemento AMIDI - seleccione un archivo"
-
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Ajustes de AMIDI-Plug"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "Complemento AMIDI - seleccione un archivo SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Ajustes de SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Nombre del archivo"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Cargar SF cuando se inicie el reproductor"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
-msgstr ""
+msgstr "Cargar SF en la primera reproducción de archivos MIDI"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Preferencias del sintetizador"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "ganancia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "usar predeterminado"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "valor:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "polifonía"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "reverberación"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "si"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "no"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "coro"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "frecuencia de muestro"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "personalizado "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Motor\nFluidSynth"
+msgstr ""
+"Motor\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " Información MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Longitud (mseg):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Num. de Pistas:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Div tiempo:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " Comentarios y letras MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* no hay comentarios disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* no hay letras disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 no válido)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Acerca del AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -656,7 +673,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Avisa cuando, durante la reproducción, el título de la canción cambia pero el nombre de archivo es el mismo. Esto es principalmente útil para mostrar cambios de título en los flujos de Internet."
+msgstr ""
+"Avisa cuando, durante la reproducción, el título de la canción cambia pero "
+"el nombre de archivo es el mismo. Esto es principalmente útil para mostrar "
+"cambios de título en los flujos de Internet."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -788,8 +808,13 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Administrador de composición no detectado;\na menos que sepa que tiene uno ejecutándose, por favor active un administrador de composición o las notificaciones no funcionarán correctamente"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Administrador de composición no detectado;\n"
+"a menos que sepa que tiene uno ejecutándose, por favor active un "
+"administrador de composición o las notificaciones no funcionarán "
+"correctamente"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -852,47 +877,47 @@
 msgid "Misc"
 msgstr "Varios"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
-msgstr ""
+msgstr "Listas de reproducción ASXv1/ASXv2"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de reproducción de Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Color"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
-msgstr ""
+msgstr "Borroso"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
-msgstr ""
+msgstr "Preferencias de Bauer Stereophonic-to-Binaural"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Nivel de alimentación:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Cortar frecuencia:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Predefinidos:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Analizador de espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -904,231 +929,234 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Velocidad de lectura:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
-msgstr ""
+msgstr "Reemplazar dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Utilizar CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Usar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Usar HTTP en lugar de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Servidor"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Dirección:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Plugin de Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
-msgstr ""
+msgstr "Pista %d no encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "No se puede abrir la salida de audio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Error al leer el CD de audio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "CD de música"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "La unidad está vacía."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Tipo de disco no soportado."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Reproducir CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Añadir CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Elementos del Menú de audio CD"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Compresión"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Centrar volumen:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Rango dinámico:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Compresor de rango dinámico"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Decodificador musical de videoconsola"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "General"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Reproducción"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Graves:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "segs"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Agudos:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Longitud de canción predeterminada:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Remuestreo"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Activar el remuestreo de sonido"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Tasa de remuestreo:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignorar longitud de etiquetas SPC"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Aumentar la reverberación"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "La longitud de canción predeterminada, expresada en segundos, es usada para canciones que no preveén información de longitud (es decir pistas cíclicas)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"La longitud de canción predeterminada, expresada en segundos, es usada para "
+"canciones que no preveén información de longitud (es decir pistas cíclicas)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1138,86 +1166,92 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
-msgstr ""
+msgstr "Cristalizador"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intensidad:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Retraso:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Retorno:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
+"Complemento de Eco⏎\n"
+"Por Johan Levin, 1999⏎\n"
+"⏎\n"
+"Eco envolvente por Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1227,9 +1261,9 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
-msgstr ""
+msgstr "Complemento de FFmpeg"
 
 #: src/filewriter/filewriter.c:409
 msgid "FileWriter Configuration"
@@ -1296,6 +1330,20 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 msgstr ""
+"Este programa es software gratis, puede redistribuirlo y/o modificarlo ⏎\n"
+"bajo los términos de la Licencia Pública General GNU publicada por ⏎\n"
+"the Free Software Foundation; sea versión 2 de la Licencia, o ⏎\n"
+"(a su elección) cualquier versión posterior. ⏎\n"
+"⏎\n"
+"Este programa se distribuye con la esperanza de que sea útil, ⏎\n"
+"pero SIN NINGUNA GARANTÍA; incluso sin la garantía implícita de ⏎\n"
+"COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la ⏎\n"
+"GNU General Public License para más detalles. ⏎\n"
+"⏎\n"
+"Debería haber recibido una copia de GNU General Public License ⏎\n"
+"junto con este programa, y si no, escriba a Free Software ⏎\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,⏎\n"
+"USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1309,11 +1357,13 @@
 msgid "Joint Stereo"
 msgstr "Estéreo conjunto"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Estereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1361,7 +1411,7 @@
 msgid "Error protection"
 msgstr "Error de protección"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Calidad"
 
@@ -1411,7 +1461,7 @@
 
 #: src/filewriter/mp3.c:1121
 msgid "Frame parameters:"
-msgstr ""
+msgstr "Parametros de Marco:"
 
 #: src/filewriter/mp3.c:1133
 msgid "Mark as copyright"
@@ -1441,19 +1491,19 @@
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Configuración de codificador Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Nivel de calidad (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "sin pérdida"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1461,21 +1511,37 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Decodificador FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Plugin GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
@@ -1483,500 +1549,549 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Atajos de Gnome"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Año"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Pista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Género"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Posición de la cola"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Longitud"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Nombre del archivo"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Título personalizado"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Tasa de bits"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Seleccionar columnas"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Disponible:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Seleccionado:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Acoplar a la izquierda"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Acoplar a la derecha"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Acoplar arriba"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Acoplar abajo"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Desacoplar"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Abrir archivos ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Abrir _URL ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Añadir archivos ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Añadir U_RL ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
-msgstr ""
+msgstr "_Buscar Librería"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "A_cerca de ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Preferencias"
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Salir"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Pa_usar"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Detener"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "Si_guiente"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "R_epetir"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "_Orden aleatorio"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "No avan_zar la lista de reproducción"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "_Detener tras esta canción"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "_Información de la canción ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "_Saltar en el tiempo ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "Saltar a la _canción ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Por _número de pista"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Establecer Punto de Repetición _A"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Establecer Punto de Repetición _B"
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "_Borrar Punto de Repetición"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Por _título"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Por _número de pista"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Por _artista"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Por a_lbum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Por _fecha de estreno"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "Por_Longitud"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Por _ruta de archivo"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Por título _personalizado"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "Orden _inverso"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "Orden alea_torio"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
-msgstr ""
+msgstr "_Reproducir esta lista"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "A_ctualizar"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Eliminar archivos _no disponibles"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Ordenar los seleccionados"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Eliminar_Duplicados"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Eliminar archivos _no disponibles"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Nuevo"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
-msgstr ""
+msgstr "Reno_mbrar…"
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importar ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Exportar ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
-msgstr ""
+msgstr "_Gestor de listas de reproducción…"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Gestor de _colas ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "_Subir volumen"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "_Bajar volumen"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Ecualizador"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_fectos"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Interfaz"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Visualizaciones"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "_Mostrar barra de menú"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Mostrar barra de _información"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
-msgstr ""
+msgstr "Mostrar Barra de Información de Vis_ualización"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _estado"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Mostrar_Tiempo Restante"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
-msgstr ""
+msgstr "Mostrar "
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Mostrar _cabeceras de columna"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "_Seleccionar columnas ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "A_vanzar al cambiar de canción"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Lista de reproducción"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "Sali_da"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Encolar/desencolar"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Renombrar ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Interfaz GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Gestión de memoria intermedia ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Error"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canales"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Pista anterior"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pausa/continuar"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Detener"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Siguiente pista"
+msgid "Rewind 5 seconds"
+msgstr ""
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Avanzar 5 segundos"
+msgid "Mute"
+msgstr "Silenciar"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Retroceder 5 segundos"
+msgid "Volume up"
+msgstr "Subir volumen"
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Silenciar"
+msgid "Volume down"
+msgstr "Bajar volumen"
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Subir volumen"
+msgid "Jump to file"
+msgstr "Ir al archivo"
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Bajar volumen"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Ir al archivo"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Mostrar notificaciones"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+msgid "Toggle repeat"
 msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Mostrar notificaciones"
+msgid "Toggle shuffle"
+msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Conmutar el modo repetir"
+msgid "Toggle stop after current"
+msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Conmutar orden aleatorio"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "No se recomienda asociar los botones principales del ratón sin modificadores.\n\n¿Quiere continuar?"
+msgstr ""
+"No se recomienda asociar los botones principales del ratón sin "
+"modificadores.\n"
+"\n"
+"¿Quiere continuar?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Asociar botones del ratón"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Configuración de atajos de teclado"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Pulse una combinación de teclas dentro del campo de texto.\nTambién puede asociar botones del ratón."
+msgstr ""
+"Pulse una combinación de teclas dentro del campo de texto.\n"
+"También puede asociar botones del ratón."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Atajos de teclado:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Acción:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Teclas asociadas:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1991,11 +2106,11 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Hotkeys Globales"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
@@ -2003,90 +2118,99 @@
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "Salida JACK"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Ajustes %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Ajustes del servidor LADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Rutas de complementos:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Separe múltiples rutas por dos puntos.\nEstas rutas se utilizan además de LADSPA_PATH.\nTras añadir nuevas rutas, pulse Intro para buscar complementos nuevos."
+msgstr ""
+"Separe múltiples rutas por dos puntos.\n"
+"Estas rutas se utilizan además de LADSPA_PATH.\n"
+"Tras añadir nuevas rutas, pulse Intro para buscar complementos nuevos.</"
+"small>"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Complementos disponibles:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Activar"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Complementos activos:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr ""
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
-msgstr ""
+msgstr "%s: No se puede iniciar soporte LIRC\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
 msgstr ""
+"%s: no se pudo leer archivo de configuración LIRC\n"
+"%s: Por favor, lee la documentación de LIRC %s: cómo crear un archivo de "
+"configuración LIRC\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: intentando conectar de nuevo... \n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: comando desconocido \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
-msgstr ""
+msgstr "%s: desconectado de LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
-msgstr ""
+msgstr "%s: se intentará reconectar cada %d segundos…\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2102,67 +2226,67 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Conexión"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Volver a conectar con el servidor LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Espera antes de reconectar:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "No hay letras disponibles."
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
-msgstr ""
+msgstr "No es posible obtener %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
-msgstr ""
+msgstr "Buscando letras ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
-msgstr ""
+msgstr "Conectando con lyrics.wikia.com…"
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
-msgstr ""
+msgstr "Complemento de LyricWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "Listas M3U"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de tacto: %d ppm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generador de tacto: %d ppm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2171,84 +2295,218 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Generador Tact"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Mezclador de canales"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Canales de salida:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Mezclador de canales"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Plugin para MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Canales"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Más cercano (más rápido)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Lineal (rápido)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Reducción de ruido"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Cuenta de repetición:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Para repetir siempre, establezca el número de repeticiones en -1."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Envolvente"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr ""
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr ""
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr ""
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Detenido"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious no está reproduciendo."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr ""
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Mostrar"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pausar"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Siguiente"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Dispositivo predeterminado"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Dispositivo de sonido:"
 
@@ -2273,22 +2531,23 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr ""
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2308,160 +2567,211 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Saltar/repetir muestras"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Interpolación lineal"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
-msgstr ""
+msgstr "Conversión"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Taza:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr ""
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr ""
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
+msgstr "Muestra de convertidor de frecuencia"
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "Aprovado. Scrobbling para usario: %s"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Permiso Denegado"
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr "Acceda a esta página para permitir scrobbling en Audacious:"
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
 msgstr ""
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Cambiar la contraseña"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Servicios"
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Problema de la red"
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+"Hubo un problema al contactar con Last.fm. Por favor inténtelo de nuevo más "
+"tarde."
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Comprobando..."
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "C_omprobar el permiso"
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Nombre de usuario:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "Revocar el Permiso"
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Contraseña:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Usted necesidad permitir scrobbling a Audacious a su cuenta de Last.fm. ⏎\n"
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "URL del Scrobbler:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"El plugin Scrobbler no se pudo iniciar. ⏎\n"
+"Puede haber un problema con la instalación."
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Complemento Audacious Scrobbler 2.0 por Pitxyoki, ⏎\n"
+"⏎\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com> ⏎\n"
+"⏎\n"
+"Gracias a John Lindgren por darme una mano en el inicio de este proyecto. ⏎\n"
+"⏎\n"
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "Salida SDL"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Artista Desconocido"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Álbum Desconocido"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr ""
+msgstr " %s⏎ en %s de %s "
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d álbum"
+msgstr[1] "%d álbumes"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2470,9 +2780,13 @@
 "%s\n"
 " %s, %d songs"
 msgstr[0] ""
+"%s⏎\n"
+"%s, %d cancion"
 msgstr[1] ""
+"%s⏎\n"
+"%s, %d canciones"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2481,75 +2795,81 @@
 "%s\n"
 " %d songs by %s"
 msgstr[0] ""
+"%s⏎\n"
+"%d cancion de %s"
 msgstr[1] ""
+"%s⏎\n"
+"%d canciones de %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Crear lista de reproducción"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Añadir a la lista de reproducción"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Buscar biblioteca"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Para importar su biblioteca musical en Audacious, seleccione una carpeta y pulse el botón «actualizar»."
+msgstr ""
+"Para importar su biblioteca musical en Audacious, seleccione una carpeta y "
+"pulse el botón «actualizar»."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Espere por favor..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Seleccione un directorio"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Herramienta de búsqueda"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Interfaz Clásica de Winamp"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Reproductor:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Seleccione la tipografía para la ventana principal:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "Lista de reproducción:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Seleccione la tipografía de la lista de reproducción:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Tipografías"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Usar tipografías de mapa de bits (solo soporta ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Desplazar el título de la canción en ambas direcciones"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Tema"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Preferencias del interfaz"
 
@@ -2605,7 +2925,7 @@
 msgid "Presets"
 msgstr "Predefinidos"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Cargar predefinido"
 
@@ -2618,7 +2938,7 @@
 msgid "Load equalizer preset"
 msgstr "Cargar ecualizador predefinido"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Guardar predefinido"
 
@@ -2630,7 +2950,7 @@
 msgid "Save equalizer preset"
 msgstr "Guardar ecualizador predefinido"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Borrar predefinido"
 
@@ -2638,739 +2958,760 @@
 msgid "Delete auto-preset"
 msgstr "Borrar auto-predefinido"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Ir a la posición %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volumen: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% izquierda"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Balance: centrado"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% derecha"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Menú de opciones"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Desactivar 'Siempre encima'"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Activar 'Siempre encima'"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Caja de información de archivo"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Menú de visualización"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Modo único."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Modo de lista de reproducción."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Parar después de la canción."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "No parar después de la canción."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Repetir punto de establecimiento A."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Repetir punto de establecimiento B."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Repetir punto de establecimiento borrados."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr ""
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Parar tras la canción actual"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Picos"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Orden aleatorio"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "No avanzar la lista de reproducción"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Mostrar reproductor"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Mostrar el editor de listas de reproducción"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Mostrar el ecualizador"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Siempre encima"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Poner en todos los espacios de trabajo"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Enrollar el reproductor"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Enrollar el editor de listas de reproducción"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Enrollar el ecualizador"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analizador"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Campo"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Marca de voz"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Apagado"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Fuego"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Líneas verticales"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Líneas"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Barras"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Campo de puntos"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Campo de líneas"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Campo sólido"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Hielo"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Suave"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Muy lento"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Medio"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Muy rápido"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Tiempo transcurrido"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Tiempo restante"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pausar"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Siguiente"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Visualización"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Modo de visualización"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Modo analizador"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Modo de campo"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Modo marca de voz"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Modo WindowShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Caída del analizador"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Caída de los picos"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Lista de reproducción"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Reproducir lista"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Nueva lista de reproducción"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Lista de reproducción siguiente"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Lista de reproducción anterior"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Eliminar la lista de reproducción"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Importar lista de reproducción"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Carga un archivo de listas en la lista de reproducción seleccionada."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Exportar lista de reproducción"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Guarda la lista de reproducción seleccionada."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Actualizar lista"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Actualiza los metadatos asociados con una entrada de la lista de reproducción."
+msgstr ""
+"Actualiza los metadatos asociados con una entrada de la lista de "
+"reproducción."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Gestor de listas de reproducción"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Gestor de colas"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Preferencias del interfaz ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Añadir dirección de Internet..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Añade una pista remota a la lista de reproducción."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Añadir archivos..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Añadir archivos a la lista de reproducción."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Buscar y seleccionar"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Busca en la lista de reproducción y selecciona las entradas que cumplen un criterio específico."
+msgstr ""
+"Busca en la lista de reproducción y selecciona las entradas que cumplen un "
+"criterio específico."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Invertir la selección"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Invierte las entradas seleccionadas y no seleccionadas."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Selecciona todos los elementos de la lista de reproducción."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "No seleccionar nada"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Quita la selección de todos los elementos de la lista."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Eliminar todo"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Elimina todas las entradas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Limpiar la cola"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Limpia la cola asociada con esta lista de reproducción."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Eliminar los archivos no disponibles"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Elimina los archivos no disponibles de la lista de reproducción."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Eliminar duplicados"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Por título"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Elimina las entradas duplicadas de la lista por título."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Por nombre de archivo"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Elimina las entradas duplicadas de la lista de reproducción por nombre de archivo."
+msgstr ""
+"Elimina las entradas duplicadas de la lista de reproducción por nombre de "
+"archivo."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Por ruta y nombre de archivo"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Elimina las entradas duplicadas de la lista de reproducción por su ruta completa."
+msgstr ""
+"Elimina las entradas duplicadas de la lista de reproducción por su ruta "
+"completa."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Eliminar los no seleccionados"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Elimina las entradas no seleccionadas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Eliminar los seleccionados"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Elimina las entradas seleccionadas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Ordenar aleatoriamente"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Ordena la lista de reproducción de forma aleatoria."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Invertir la lista"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Invierte la lista de reproducción."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Ordenar lista"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Ordena la lista por título."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Por álbum"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Ordena la lista por álbum."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Por artista"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Ordena la lista por artista."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Ordena la lista por nombre de archivo."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Ordena la lista por ruta de archivo completa."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Por fecha"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Ordena la lista por fecha de modificación."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Por número de pista"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Ordena la lista por número de pista."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Ordenar los seleccionados"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Archivo"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Servicios de complementos"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Ver detalles de la pista"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Ver detalles de la pista"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Acerca de Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Reproducir archivo"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Carga y reproduce un archivo."
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Reproducir localización"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Reproduce los medios desde la localización seleccionada."
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Servicios de complementos"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Abrir la ventana de preferencias"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Salir de Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Poner A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Quitar A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Ir al archivo"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Saltar en el tiempo"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Conmutar cola"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Activa/desactiva las entradas en la lista de reproducción."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Cargar"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importar"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Guardar"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Predefinido"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Auto-cargar predefinido"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Cargar auto-cargar predefinido"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Cargar el predefinido predeterminado en el ecualizador"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Cero"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Pone los niveles predefinidos del ecualizador a cero"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Desde archivo"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Cargar el predefinido desde un archivo"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Desde archivo"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Carga el predefinido desde un archivo EQF de WinAMP"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Predefinidos de WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importar los predefindos de WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Guardar auto-cargar predefinido"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Guardar predefinido predeterminado"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "A un archivo"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Guarda el predefinido en un archivo"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "A un archivo EQF de WinAMP"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Guarda el predefinido en un archivo EQF de WinAMP"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Borrar auto-cargar predefinido"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Buscar entradas en la lista de reproducción activa"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Seleccione entradas en la lista de reproducción indicando uno o más campos. Los campos utilizan sintaxis de expresiones regulares, sin distinguir mayúsculas de minúsculas. Si no sabe como funcionan las expresiones regulares, tan solo escriba la parte del literal que quiere buscar."
+msgstr ""
+"Seleccione entradas en la lista de reproducción indicando uno o más campos. "
+"Los campos utilizan sintaxis de expresiones regulares, sin distinguir "
+"mayúsculas de minúsculas. Si no sabe como funcionan las expresiones "
+"regulares, tan solo escriba la parte del literal que quiere buscar."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Título: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Álbum: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Nombre del archivo: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Limpiar la selección previa antes de buscar"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Conmutar automáticamente la cola para las entradas coincidentes"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Editor de listas de reproducción de Audacious"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
@@ -3388,81 +3729,101 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "No se pudo crear el directorio (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
-msgstr ""
+msgstr "Acerca del complemento de salida Sndio"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 msgstr ""
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Formato no soportado"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
 msgstr ""
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
-msgstr ""
+msgstr "dispositivo sndio"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(Vacio significa por defecto)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Aceptar"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Cambio de canción"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Comando a ejecutar cuando Audacious reproduce una canción nueva."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Comando para ejecutar al final de una canción."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Comando para ejecutar cuando Audacious llega al final de una lista de reproducción."
+msgstr ""
+"Comando para ejecutar cuando Audacious llega al final de una lista de "
+"reproducción."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Comando para ejecutar cuando el título cambia para una canción (es decir, títulos de flujos en red)"
+msgstr ""
+"Comando para ejecutar cuando el título cambia para una canción (es decir, "
+"títulos de flujos en red)"
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3481,33 +3842,68 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Los parámetros enviados a la consola se deberían encapsular con comillas. De otra forma existe un riesgo de seguridad."
+msgstr ""
+"Los parámetros enviados a la consola se deberían "
+"encapsular con comillas. De otra forma existe un riesgo de seguridad."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/speed-pitch/speed-pitch.c:227
-msgid "Speed and Pitch"
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Rapido"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Bajo"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Alto"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Muy Alto"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Calidad"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
+msgid "Speed and Pitch"
+msgstr "Velocidad y Tono"
+
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Tono:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Velocidad y tono"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3518,63 +3914,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Cambiar el volumen"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Cambiar la canción en reproducción"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Otros parámetros"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Desactivar la ventana emergente"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Cerrar a la bandeja del sistema"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avanzar en la lista de reproducción al desplazar arriba"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Icono de estado"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
-msgstr ""
+msgstr "Extra Estéreo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Generador de tonos: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3583,11 +3979,11 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Generador de tonos"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -3595,15 +3991,15 @@
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr ""
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Eliminación de voz"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3624,44 +4020,47 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Decodificador Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Decodificador VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "con pérdida (híbrido)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "con pérdida"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Decodificador WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Decodificador 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "Complemento AMIDI - seleccione un archivo"

audacious-plugins-3.3.4.tar.bz2/po/es_AR.po -> audacious-plugins-3.4.2.tar.bz2/po/es_AR.po Changed

@@ -1,594 +1,619 @@
 # Spanish (Argentinian) translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012.
-# Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010.
-# Jorge Andrés <winninglero@gmail.com>, 2011.
-# <xukosky@yahoo.es>, 2011.
+# Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012-2013
+# Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010
+# Jorge Andrés <winninglero@gmail.com>, 2011
+# xukosky <xukosky@yahoo.es>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-16 23:46+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-04 12:38+0000\n"
 "Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: Spanish (Argentinian)\n"
+"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
+"audacious/language/es_AR/)\n"
+"Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "envolvente"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Decodificador AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr ""
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Reproductor AdLib)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
+"Un plugin que puede ser usado para comenzar la reproducción de una lista en "
+"un determinado momento.\n"
+"\n"
+"Escrito originalmente por Adam Feakin y Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Esta es su llamada despertador"
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "Aceptar"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Configuración de la alarma"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Tiempo"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minutos"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Silencio tras:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Alarma a (predeterminado):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Esta es su llamada despertador"
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Seleccione los días para que salte la alarma"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Predeterminado"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Recordatorio"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Día"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Lunes"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Lunes"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Configuración de la alarma"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Tiempo"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Alarma a (predeterminado):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Silencio tras:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "horas"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minutos"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Seleccione los días para que salte la alarma"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Día"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Predeterminado"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Días"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Desvanecimiento"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "segundos"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Volumen"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Actual"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Iniciar a"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Final"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Actual"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Comando adicional"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "activar"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Lista de reproducción (opcional)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
-msgstr ""
+msgstr "Elegir una lista de reproducción"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Utilizar recordatorio"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Opciones"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "¿Qué significan estas opciones?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Su recordatorio para hoy es..."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Gracias"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Arte de tapa"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Dispositivo PCM predeterminado"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Dispositivo mezclador predeterminado"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Preferencias de complemento de salida ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Dispositivo PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Dispositivo mezclador:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Elemento mezclador:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Evitar los cuelgues por falta de recursos"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
+"Plugin de salida ALSA para Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"Mis agradecimientos a William Pitcock, autor del plugin de salida ALSA NG, "
+"quien se ha asistido con el código y la referencia cuando el manual de ALSA "
+"no era suficiente."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "Salida ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "Plug-AMIDI (Reproductor MIDI)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "No tiene seleccionado ningún puerto secuenciador para la reproducción MIDI. Puede hacerlo en la preferencias del complemento MIDI."
+msgstr ""
+"No tiene seleccionado ningún puerto secuenciador para la reproducción MIDI. "
+"Puede hacerlo en la preferencias del complemento MIDI."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "Plug-AMIDI (Reproductor MIDI)"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Motor ALSA "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Este motor envía eventos MIDI a un grupo de puertos secuenciadores ALSA definidos. El interfaz secuenciador ALSA es muy versátil, puede proporcionar puertos para sintetizadores hardware (p. ej. emu10k1) pero también sintetizadores software, dispositivos externos, etc.\nEste motor no produce sonido, los eventos MIDI son manejados directamente por los dispositivos/programas tras los puertos ALSA; por ejemplo, los eventos MIDI enviados a un sintetizador hardware serán reproducidos directamente.\nMotor escrito por Giacomo Lozito."
-
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+msgstr ""
+"Este motor envía eventos MIDI a un grupo de puertos secuenciadores ALSA "
+"definidos. El interfaz secuenciador ALSA es muy versátil, puede proporcionar "
+"puertos para sintetizadores hardware (p. ej. emu10k1) pero también "
+"sintetizadores software, dispositivos externos, etc.\n"
+"Este motor no produce sonido, los eventos MIDI son manejados directamente "
+"por los dispositivos/programas tras los puertos ALSA; por ejemplo, los "
+"eventos MIDI enviados a un sintetizador hardware serán reproducidos "
+"directamente.\n"
+"Motor escrito por Giacomo Lozito."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Motor FluidSynth "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Este backend reproduce el audio enviando eventos MIDI a FluidSynth, un programa sintetizador en tiempo real, basado en la especificación SoundFont2.\n(www.fluidsynth.org)\nEl audio producido puede ser manejado por medio de plugins de efectos en el reproductor y es procesado por el plugin de salida elegido.\nBackend escrito por Giacomo Lozito."
+msgstr ""
+"Este backend reproduce el audio enviando eventos MIDI a FluidSynth, un "
+"programa sintetizador en tiempo real, basado en la especificación "
+"SoundFont2.\n"
+"(www.fluidsynth.org)\n"
+"El audio producido puede ser manejado por medio de plugins de efectos en el "
+"reproductor y es procesado por el plugin de salida elegido.\n"
+"Backend escrito por Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Puerto"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Nombre del cliente"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Nombre del puerto"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Puertos de salida ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Tarjeta de sonido: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Control mezclador: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Ajustes del mezclador"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "motor\nALSA"
+msgstr ""
+"motor\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "Complemento AMIDI - información del motor"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Selección de motor"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Ajustes de reproducción"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transponer: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Cambio de batería: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Ajustes avanzados"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "calcular la longitud de los archivos MIDI en lista de reproducción"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "extraer comentarios desde el archivo MIDI (si está disponible)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "extraer letras desde el archivo MIDI (si está disponible)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
 msgstr "Complemento AMIDI"
 
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "Complemento AMIDI - seleccione un archivo"
-
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Configuración del Plug-AMIDI"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "Complemento AMIDI - seleccione un archivo SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Ajustes de SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Nombre del archivo"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Cargar SF cuando se inicie el reproductor"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Cargar SF en el primer archivo MIDI reproducido"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Preferencias del sintetizador"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "ganancia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "usar predeterminado"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "valor:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "polifónico"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "reverberación"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "si"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "no"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "coro"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "frecuencia de muestro"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "personalizado "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Motor\nFluidSynth"
+msgstr ""
+"Motor\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " Información MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Longitud (mseg):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Nro. de Pistas:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Div tiempo:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " Comentarios y letras MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* no hay comentarios disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* no hay letras disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 no válido)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Acerca del Plug-MIDI"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -613,7 +638,7 @@
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
-msgstr ""
+msgstr "OSD de Audacius"
 
 #: src/aosd/aosd.c:37
 msgid "AOSD (On-Screen Display)"
@@ -652,7 +677,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Avisa cuando, durante la reproducción, el título de la canción cambia pero el nombre de archivo es el mismo. Esto es principalmente útil para mostrar cambios de título en los flujos de Internet."
+msgstr ""
+"Avisa cuando, durante la reproducción, el título de la canción cambia pero "
+"el nombre de archivo es el mismo. Esto es principalmente útil para mostrar "
+"cambios de título en los flujos de Internet."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -784,8 +812,13 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Administrador de composición no detectado;\na menos que sepa que tiene uno ejecutándose, por favor active un administrador de composición o las notificaciones no funcionarán correctamente"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Administrador de composición no detectado;\n"
+"a menos que sepa que tiene uno ejecutándose, por favor active un "
+"administrador de composición o las notificaciones no funcionarán "
+"correctamente"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -848,47 +881,47 @@
 msgid "Misc"
 msgstr "Varios"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "Listas de reproducciónASXv1/ASXv2"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de reproducción Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Color"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Niebla Borrosa"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Preferencias del Estereofónico-a-Binaural Bauer"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Nivel de alimentación:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Cortar frecuencia:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Predefinidos:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Estereofónico-a-Binaural Bauer (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Analizador de Espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -900,231 +933,236 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Leer velocidad:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Anular dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Usar CD-Texto"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Usar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Usar HTTP en lugar de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Ruta:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Plugin de CD de audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
-msgstr ""
+msgstr "Error en la inicialización del subsistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
-msgstr ""
+msgstr "URI inválido %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
-msgstr ""
+msgstr "Pista %d no encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
-msgstr ""
+msgstr "Error al abrir la salida de audio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "CD de audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr ""
+msgstr "Error al abrir la lectora de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
-msgstr ""
+msgstr "No hay audio que se pueda reproducir en la lectora de CD localizada."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "Error al finalizar la lectora de CD inicializada oportunamente."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "Error al obtener el primer/último número de pista."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "No se puede leer el LSN del comienzo/final de la pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
-msgstr ""
+msgstr "Error al crear la conexión a cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "Error al consultar el servidor CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "Error al consultar el servidor CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
-msgstr ""
+msgstr "Error al leer la información cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "La unidad está vacía."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Tipo de disco no soportado."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Reproducir CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Agregar CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Items de menú del CD de audio"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Compresión"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Centrar volumen:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Rango dinámico:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Plugin de Compresión de Rango Dinámico para Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Compresor de Rango Dinámico"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Decodificador musical de videoconsola"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "General"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Reproducción"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Graves:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "segs"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Agudos:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Longitud de canción predeterminada:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Remuestreo"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Activar el remuestreo de sonido"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Tasa de remuestreo:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignorar longitud de etiquetas SPC"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Aumentar la reverberación"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "La longitud de canción predeterminada, expresada en segundos, es usada para canciones que no preveén información de longitud (es decir pistas cíclicas)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"La longitud de canción predeterminada, expresada en segundos, es usada para "
+"canciones que no preveén información de longitud (es decir pistas cíclicas)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1134,74 +1172,81 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "El fundido de pistas falló porque las canciones tiene distintas cantidades de canales. Puede usar el Mezclador de Canales para igualarlos."
+msgstr ""
+"El fundido de pistas falló porque las canciones tiene distintas cantidades "
+"de canales. Puede usar el Mezclador de Canales para igualarlos."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "El fundido de pistas falló porque las canciones tiene distintas velocidades. Puede usar el Convertidor de Muestreo de Velocidad para igualarlos."
+msgstr ""
+"El fundido de pistas falló porque las canciones tiene distintas "
+"velocidades. Puede usar el Convertidor de Muestreo de Velocidad para "
+"igualarlos."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Fundido de pistas"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Superposición:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Fundido de pistas:"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intensidad:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Plugin para hoja cue"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Retardo:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Retroalimentación:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
@@ -1209,11 +1254,11 @@
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1223,7 +1268,7 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Plugin FFmpeg"
 
@@ -1305,11 +1350,13 @@
 msgid "Joint Stereo"
 msgstr "Estéreo conjunto"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Estereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1357,7 +1404,7 @@
 msgid "Error protection"
 msgstr "Error de protección"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Calidad"
 
@@ -1437,19 +1484,19 @@
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Configuración de codificador Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Nivel de calidad (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1457,21 +1504,37 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Decodificador FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Plugin GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
@@ -1479,500 +1542,548 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Accesos directos para GNOME"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Año"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Pista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Género"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Posición de la cola"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Longitud"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Nombre del archivo"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Título personalizado"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Tasa de bits"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Seleccionar columnas"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Disponible:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Seleccionado:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Acoplar a la izquierda"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Acoplar a la derecha"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Acoplar arriba"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Acoplar abajo"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Desacoplar"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Abrir archivos ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Abrir _URL ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Añadir archivos ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Añadir U_RL ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Buscar Biblioteca"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "A_cerca de ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Preferencias"
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Salir"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Pa_usar"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Detener"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "Si_guiente"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "R_epetir"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "_Orden aleatorio"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "No avan_zar la lista de reproducción"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "_Detener tras esta canción"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "_Información de la canción ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "_Saltar en el tiempo ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "Saltar a la _canción ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Por _número de pista"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Por _título"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Por _número de pista"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Por _artista"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Por a_lbum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Por _fecha de estreno"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Por _ruta de archivo"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Por título _personalizado"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "Orden _inverso"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "Orden alea_torio"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Reproducir esta lista de reproducción"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "A_ctualizar"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Eliminar archivos _no disponibles"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Ordenar los seleccionados"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Eliminar archivos _no disponibles"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Nuevo"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Ren_ombrar..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importar ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Exportar ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Administrador_de listas de reproducción ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Gestor de _colas ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "_Subir volumen"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "_Bajar volumen"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Ecualizador"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_fectos"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Interfaz"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Visualizaciones"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "_Mostrar barra de menú"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Mostrar barra de _información"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar la Barra Informativa de Vis_ualización"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _estado"
 
-#: src/gtkui/menus.c:232
-msgid "Show Close _Buttons"
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:270
+msgid "Show Close _Buttons"
+msgstr "Mostrar _botones Cerrar"
+
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Mostrar _cabeceras de columna"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "_Seleccionar columnas ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "A_vanzar al cambiar de canción"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Lista de reproducción"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "Sali_da"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Encolar/desencolar"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Renombrar ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Interfaz GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Gestión de memoria intermedia ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Error"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canales"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Pista anterior"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pausa/continuar"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Detener"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Siguiente pista"
+msgid "Rewind 5 seconds"
+msgstr ""
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Avanzar 5 segundos"
+msgid "Mute"
+msgstr "Silenciar"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Retroceder 5 segundos"
+msgid "Volume up"
+msgstr ""
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Silenciar"
+msgid "Volume down"
+msgstr ""
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Subir volumen"
+msgid "Jump to file"
+msgstr ""
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Bajar volumen"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Ir al archivo"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Mostrar notificaciones"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Activar la ventana(s) de reproducción"
+msgid "Toggle repeat"
+msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Mostrar notificaciones"
+msgid "Toggle shuffle"
+msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Conmutar el modo repetir"
+msgid "Toggle stop after current"
+msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Conmutar orden aleatorio"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr "Elevar la ventana(s) de reproducción"
+msgid "Raise player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "No se recomienda asociar los botones principales del mouse sin cambios.\n\n¿Quiere continuar?"
+msgstr ""
+"No se recomienda asociar los botones principales del mouse sin cambios.\n"
+"\n"
+"¿Quiere continuar?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Asociar botones del mouse"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Configuración de atajos de teclado"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Pulse una combinación de teclas dentro del campo de texto.\nTambién puede asociar botones del ratón."
+msgstr ""
+"Pulse una combinación de teclas dentro del campo de texto.\n"
+"También puede asociar botones del ratón."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Atajos de teclado:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Acción:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Teclas asociadas:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1987,11 +2098,11 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Teclas abreviadas globales"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
@@ -1999,90 +2110,99 @@
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "Salida JACK"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Ajustes %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Ajustes del servidor LADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Rutas de complementos:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Separe múltiples rutas por dos puntos.\nEstas rutas se utilizan además de LADSPA_PATH.\nTras añadir nuevas rutas, pulse Intro para buscar complementos nuevos."
+msgstr ""
+"Separe múltiples rutas por dos puntos.\n"
+"Estas rutas se utilizan además de LADSPA_PATH.\n"
+"Tras añadir nuevas rutas, pulse Intro para buscar complementos nuevos.</"
+"small>"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Complementos disponibles:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Activar"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Complementos activos:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "Servidor LADSPA"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: no se puede iniciar soporte LIRC\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: no se puede leer el archivo de configuración de LIRC\n%s: por favor lea la documentación de LIRC\n%s: en el tópico \"Cómo crear un archivo de configuración adecuado\"\n"
+msgstr ""
+"%s: no se puede leer el archivo de configuración de LIRC\n"
+"%s: por favor lea la documentación de LIRC\n"
+"%s: en el tópico \"Cómo crear un archivo de configuración adecuado\"\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: tratando de reconectar...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: comando desconocido \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: desconectando de LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: se intentará reconectar cada %d segundos...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2098,67 +2218,67 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Conexión"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Reconectar a servidor LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Espera antes de reconectar:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "Plugin LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
-msgstr ""
+msgstr "No se encontraron letras"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
-msgstr ""
+msgstr "No se puede obtener %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
-msgstr ""
+msgstr "No se puede analizar %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
-msgstr ""
+msgstr "Buscando letras de la canción...."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
-msgstr ""
+msgstr "No hay metadatos de la canción"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
-msgstr ""
+msgstr "Conectándose con lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "Plugin LyricWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "Listas de reproducción M3U"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de tacto: %d ppm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generador de tacto: %d ppm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2167,84 +2287,218 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Generador de tacto"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Mezclador de canales"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Canales de salida:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Mezclador de canales"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Plugin MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Módulo de reproducción)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Envolvente"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
-msgstr ""
+msgstr "MPG123 Plugin"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
-msgstr ""
+msgstr "MPRIS 2 Server"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
-msgstr ""
+msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Detenido"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious no está reproduciendo."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
+msgstr "Notificaciones de escritorio"
+
+#: src/notify/osd.c:57
+msgid "Show"
 msgstr ""
 
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pausar"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Siguiente"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Dispositivo predeterminado"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Dispositivo de sonido:"
 
@@ -2254,7 +2508,7 @@
 
 #: src/oss4/plugin.c:81
 msgid "Save volume between sessions."
-msgstr ""
+msgstr "Guardar volumen entre sesiones."
 
 #: src/oss4/plugin.c:83
 msgid "Enable format conversions made by the OSS software."
@@ -2269,22 +2523,23 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
-msgstr ""
+msgstr "Salida OSS4"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
-msgstr ""
+msgstr "Listas PLS"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr ""
+msgstr "Abrir el decodificador PSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2304,160 +2559,202 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
-msgstr ""
+msgstr "Salida de PulseAudio"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
-msgstr ""
+msgstr "Saltear/repetir muestras"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
-msgstr ""
+msgstr "Interpolación lineal"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
-msgstr ""
+msgstr "Interpolación de sincronización rápida "
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
-msgstr ""
+msgstr "Interpolación de sincronización media"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
-msgstr ""
+msgstr "Mejor interpolación de sincronización "
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
-msgstr ""
+msgstr "Conversión"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Velocidad:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Mapeos de velocidad"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Usar mapeos de velocidad"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Convertidor de Velocidad de Muestra"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Cambiar la contraseña"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Servicios"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
 msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Nombre de usuario:"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Contraseña:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "URL del Scrobbler:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:233
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr ""
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "Salida SDL"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Artista Desconocido"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Album Desconocido"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\n en %s por %s"
+msgstr ""
+"%s\n"
+" en %s por %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d álbum"
 msgstr[1] "%d álbumes"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2465,10 +2762,14 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d canción"
-msgstr[1] "%s\n %s, %d canciones"
+msgstr[0] ""
+"%s\n"
+" %s, %d canción"
+msgstr[1] ""
+"%s\n"
+" %s, %d canciones"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2476,76 +2777,82 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d canción por %s"
-msgstr[1] "%s\n %d canciones por %s"
+msgstr[0] ""
+"%s\n"
+" %d canción por %s"
+msgstr[1] ""
+"%s\n"
+" %d canciones por %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Crear lista de reproducción"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Añadir a la lista de reproducción"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Buscar biblioteca"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Para importar su colección musical en Audacious, elija una carpeta y pulse el botón «actualizar»."
+msgstr ""
+"Para importar su colección musical en Audacious, elija una carpeta y pulse "
+"el botón «actualizar»."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Espere por favor..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Elija una carpeta"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Herramienta de búsqueda"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Interface del Winamp Clásico"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Reproductor:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Seleccione la tipografía para la ventana principal:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "Lista de reproducción:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Seleccione la tipografía de la lista de reproducción:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Tipografías"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Usar tipografías de mapa de bits (solo soporta ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Desplazar el título de la canción en ambas direcciones"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Tema"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Preferencias del interfaz"
 
@@ -2601,7 +2908,7 @@
 msgid "Presets"
 msgstr "Predefinidos"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Cargar predefinido"
 
@@ -2614,7 +2921,7 @@
 msgid "Load equalizer preset"
 msgstr "Cargar ecualizador predefinido"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Guardar predefinido"
 
@@ -2626,7 +2933,7 @@
 msgid "Save equalizer preset"
 msgstr "Guardar ecualizador predefinido"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Borrar predefinido"
 
@@ -2634,739 +2941,760 @@
 msgid "Delete auto-preset"
 msgstr "Borrar auto-predefinido"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Ir a la posición %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volumen: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% izquierda"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Balance: centrado"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% derecha"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Menú de opciones"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Desactivar 'Siempre encima'"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Activar 'Siempre encima'"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Caja de información de archivo"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Menú de visualización"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Modo único."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Modo de lista de reproducción."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Parar después de la canción."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "No parar después de la canción."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Autodesplazar Nombre de la Canción"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Parar tras la canción actual"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Picos"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Orden aleatorio"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "No avanzar la lista de reproducción"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Mostrar reproductor"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Mostrar el editor de listas de reproducción"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Mostrar el ecualizador"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Siempre encima"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Poner en todos los espacios de trabajo"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Enrollar el reproductor"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Enrollar el editor de listas de reproducción"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Enrollar el ecualizador"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analizador"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Campo"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Marca de voz"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Apagado"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Fuego"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Líneas verticales"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Líneas"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Barras"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Campo de puntos"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Campo de líneas"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Campo sólido"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Hielo"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Suave"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Muy lento"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Medio"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Muy rápido"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Tiempo transcurrido"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Tiempo restante"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pausar"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Siguiente"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Visualización"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Modo de visualización"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Modo analizador"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Modo de campo"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Modo marca de voz"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Modo WindowShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Caída del analizador"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Caída de los picos"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Lista de reproducción"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
-msgstr ""
+msgstr "Reproducir lista"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Nueva lista de reproducción"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Lista de reproducción siguiente"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Lista de reproducción anterior"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Eliminar la lista de reproducción"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Importar lista de reproducción"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Carga un archivo de listas en la lista de reproducción seleccionada."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Exportar lista de reproducción"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Guarda la lista de reproducción seleccionada."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Actualizar lista"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Actualiza los metadatos asociados con una entrada de la lista de reproducción."
+msgstr ""
+"Actualiza los metadatos asociados con una entrada de la lista de "
+"reproducción."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Gestor de listas de reproducción"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Gestor de colas"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Preferencias del interfaz ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Añadir dirección de Internet..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Añade una pista remota a la lista de reproducción."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Añadir archivos..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Añadir archivos a la lista de reproducción."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Buscar y seleccionar"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Busca en la lista de reproducción y selecciona las entradas que cumplen un criterio específico."
+msgstr ""
+"Busca en la lista de reproducción y selecciona las entradas que cumplen un "
+"criterio específico."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Invertir la selección"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Invierte las entradas seleccionadas y no seleccionadas."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Selecciona todos los elementos de la lista de reproducción."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "No seleccionar nada"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Quita la selección de todos los elementos de la lista."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Eliminar todo"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Elimina todas las entradas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Limpiar la cola"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Limpia la cola asociada con esta lista de reproducción."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Eliminar los archivos no disponibles"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Elimina los archivos no disponibles de la lista de reproducción."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Eliminar duplicados"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Por título"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Elimina las entradas duplicadas de la lista por título."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Por nombre de archivo"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Elimina las entradas duplicadas de la lista de reproducción por nombre de archivo."
+msgstr ""
+"Elimina las entradas duplicadas de la lista de reproducción por nombre de "
+"archivo."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Por ruta y nombre de archivo"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Elimina las entradas duplicadas de la lista de reproducción por su ruta completa."
+msgstr ""
+"Elimina las entradas duplicadas de la lista de reproducción por su ruta "
+"completa."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Eliminar los no seleccionados"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Elimina las entradas no seleccionadas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Eliminar los seleccionados"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Elimina las entradas seleccionadas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Ordenar aleatoriamente"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Ordena la lista de reproducción de forma aleatoria."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Invertir la lista"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Invierte la lista de reproducción."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Ordenar lista"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Ordena la lista por título."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Por álbum"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Ordena la lista por álbum."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Por artista"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Ordena la lista por artista."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Ordena la lista por nombre de archivo."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Ordena la lista por ruta de archivo completa."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Por fecha"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Ordena la lista por fecha de modificación."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Por número de pista"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Ordena la lista por número de pista."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Ordenar los seleccionados"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Archivo"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Servicios de complementos"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Ver detalles de la pista"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Ver detalles de la pista"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Acerca de Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Reproducir archivo"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Carga y reproduce un archivo."
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Reproducir localización"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Reproduce los medios desde la localización seleccionada."
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Servicios de complementos"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Abrir la ventana de preferencias"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Salir de Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Poner A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Quitar A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Ir al archivo"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Saltar en el tiempo"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Conmutar cola"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Activa/desactiva las entradas en la lista de reproducción."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Cargar"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importar"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Guardar"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Predefinido"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Auto-cargar predefinido"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Cargar auto-cargar predefinido"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Cargar el predefinido predeterminado en el ecualizador"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Cero"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Pone los niveles predefinidos del ecualizador a cero"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Desde archivo"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Cargar el predefinido desde un archivo"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Desde archivo"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Carga el predefinido desde un archivo EQF de WinAMP"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Predefinidos de WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importar los predefindos de WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Guardar auto-cargar predefinido"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Guardar predefinido predeterminado"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "A un archivo"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Guarda el predefinido en un archivo"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "A un archivo EQF de WinAMP"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Guarda el predefinido en un archivo EQF de WinAMP"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Borrar auto-cargar predefinido"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Buscar entradas en la lista de reproducción activa"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Seleccione entradas en la lista de reproducción indicando uno o más campos. Los campos utilizan sintaxis de expresiones regulares, sin distinguir mayúsculas de minúsculas. Si no sabe como funcionan las expresiones regulares, tan solo escriba la parte del literal que quiere buscar."
+msgstr ""
+"Seleccione entradas en la lista de reproducción indicando uno o más campos. "
+"Los campos utilizan sintaxis de expresiones regulares, sin distinguir "
+"mayúsculas de minúsculas. Si no sabe como funcionan las expresiones "
+"regulares, tan solo escriba la parte del literal que quiere buscar."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Título: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Álbum: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Nombre del archivo: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Limpiar la selección previa antes de buscar"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Conmutar automáticamente la cola para las entradas coincidentes"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Editor de listas de reproducción de Audacious"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
@@ -3384,81 +3712,107 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "No se pudo crear el directorio (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Plugin Sndfile"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Acerca del Plugin de Salida Sndio"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Plugin de Salida Sndio\n\nEscrito por Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Plugin de Salida Sndio\n"
+"\n"
+"Escrito por Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "formato no soportado"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Un formato no soportado por el dispositivo de audio fue solicitado.\n\nPor favor,intente de nuevo con el servidor sndiod(1) ejecutándose."
+msgstr ""
+"Un formato no soportado por el dispositivo de audio fue solicitado.\n"
+"\n"
+"Por favor,intente de nuevo con el servidor sndiod(1) ejecutándose."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "dispositivo sndio"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(el vacío significa algo)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Aceptar"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Cambio de canción"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Comando a ejecutar cuando Audacious reproduce una canción nueva."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Comando para ejecutar al final de una canción."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Comando para ejecutar cuando Audacious llega al final de una lista de reproducción."
+msgstr ""
+"Comando para ejecutar cuando Audacious llega al final de una lista de "
+"reproducción."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Comando para ejecutar cuando el título cambia para una canción (es decir, títulos de flujos en red)"
+msgstr ""
+"Comando para ejecutar cuando el título cambia para una canción (es decir, "
+"títulos de flujos en red)"
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3475,35 +3829,85 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Puede usar los siguientes cadenas de formatos, las cuales\nserán reemplazadas antes de invocar al comando\n(no todos son útiles para el comando finalizar lista de reproducción):\n\n%F: Frecuencia (en hertz)\n%c: Número de canales\n%f: Nombre de archivo (ruta completa)\n%l: Duración (en milisegundos)\n%n o %s: Nombre de la canción\n%r: Velocidad (en bits por segundo)\n%t: Posición en la lista de reproducción (%02d)\n%p: Reproduciendo actualmente (1 or 0)\n%a: Artista\n%b: Album\n%T: Título de la pista"
+msgstr ""
+"Puede usar los siguientes cadenas de formatos, las cuales\n"
+"serán reemplazadas antes de invocar al comando\n"
+"(no todos son útiles para el comando finalizar lista de reproducción):\n"
+"\n"
+"%F: Frecuencia (en hertz)\n"
+"%c: Número de canales\n"
+"%f: Nombre de archivo (ruta completa)\n"
+"%l: Duración (en milisegundos)\n"
+"%n o %s: Nombre de la canción\n"
+"%r: Velocidad (en bits por segundo)\n"
+"%t: Posición en la lista de reproducción (%02d)\n"
+"%p: Reproduciendo actualmente (1 or 0)\n"
+"%a: Artista\n"
+"%b: Album\n"
+"%T: Título de la pista"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Los parámetros enviados a la consola se deberían encapsular con comillas. De otra forma existe un riesgo de seguridad."
+msgstr ""
+"Los parámetros enviados a la consola se deberían "
+"encapsular con comillas. De otra forma existe un riesgo de seguridad."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Velocidad y amplitud"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Amplitud:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Velocidad y amplitud"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3514,63 +3918,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Acción al desplazar rueda del mouse"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Cambiar el volumen"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Cambiar la canción en reproducción"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Otras Opciones"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Desactivar la ventana emergente"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Cerrar a la barra tray"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avanzar en la lista de reproducción al desplazar arriba"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Icono de estado"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Extra Estéreo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Extra Esteréo"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Generador de tonos: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3579,11 +3983,11 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Generador de Tono"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -3591,15 +3995,15 @@
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Plugin de Archivo E/S"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Quitar voz"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3620,44 +4024,47 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Decodificador Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Decodificador VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Decodificador WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Decodificador 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listas de reproducción compartidas XML (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "Complemento AMIDI - seleccione un archivo"

audacious-plugins-3.3.4.tar.bz2/po/es_MX.po -> audacious-plugins-3.4.2.tar.bz2/po/es_MX.po Changed

@@ -1,591 +1,664 @@
 # Spanish (Mexican) translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Jorge A. García Sosa <jagsmd@gmail.com>, 2012.
+# Jorge A. García Sosa <jagsmd@gmail.com>, 2012-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-17 20:18+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-07 05:02+0000\n"
 "Last-Translator: Jorge A. García Sosa <jagsmd@gmail.com>\n"
-"Language-Team: Spanish (Mexican)\n"
+"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/"
+"audacious/language/es_MX/)\n"
+"Language: es_MX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "monoaural"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "envolvente"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Descodificador AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "secuencializado"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Reproductor AdLib)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "Un plug-in que puede ser utilizado para iniciar la reproducción a una hora dada.\n\nOrignalmente escrito por Adam Feakin y Daniel Stodden."
+msgstr ""
+"Un plug-in que puede ser utilizado para iniciar la reproducción a una hora "
+"dada.\n"
+"\n"
+"Orignalmente escrito por Adam Feakin y Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Esta es tu llamada despertador."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Ajustes de Alarma"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Tiempo"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Hora\n"
+" Alarma a:\n"
+" La hora para que suene la alarma.\n"
+"\n"
+" Detener después de:\n"
+" Detiene la alarma después de ésta cantidad de tiempo.\n"
+" (si el diálogo despierta no está cerrado)\n"
+"\n"
+"\n"
+"Días\n"
+" Día:\n"
+" Selecciona los días que la alarma se activará.\n"
+"\n"
+" Hora:\n"
+" Elige la hora para la alarma de cada día,\n"
+" o selecciona el interruptor para usar la hora\n"
+" por defecto.\n"
+"\n"
+"\n"
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minutos"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Volumen\n"
+" Desvanecimiento:\n"
+" Disminuye el volumen hasta el volumen deseado\n"
+" por esta cantidad de tiempo.\n"
+"\n"
+" Iniciar a:\n"
+" Inicia el desvanecimiento desde este volumen.\n"
+"\n"
+" Final:\n"
+" El volumen que se dentendrá el desvanecimiento. Si el tiempo\n"
+" de desvanecimiento es 0 entonces el volumen asignado será este\n"
+" y comenzará la reproducción.\n"
+"\n"
+"\n"
+"Opciones:\n"
+" Comando Adicional:\n"
+" Ejecuta este comando a la hora de la alarma.\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Silenciar después de:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+" Lista de Reproducción:\n"
+" Carga esta lista de reproducción. Si no es elegida\n"
+" una lista, la actual será utilizada.\n"
+" El URL de un stream mp3/ogg\n"
+" también puede incluirse aquí.\n"
+"\n"
+" Recordatorio:\n"
+" Muestra un recordatorio cuando la alarma se apague.\n"
+" Escribe el recordatorio en la caja y enciende el\n"
+" botón interruptor si quieres que se muestre."
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Alarma a las (predeterminado):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Esta es tu llamada despertador."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Escoge los días para que suene la alarma"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Tu recordatorio para hoy es..."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Predeterminado"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Recordatorio"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Día"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Lunes"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Martes"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Miércoles"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Jueves"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Viernes"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Lunes"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Ajustes de Alarma"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Tiempo"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Alarma a las (predeterminado):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Silenciar después de:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "horas"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minutos"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Escoge los días para que suene la alarma"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Día"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Predeterminado"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Días"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
-msgstr "Disminución"
+msgstr "Desvanecimiento"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "segundos"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Volumen"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Actual"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Comenzar a"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Finalizar a"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Actual"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Comando Adicional"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "habilitar"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Lista de Reproducción (opcional)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Selecciona una lista de reproducción"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Recodatorio"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Usar recordatorio"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Opciones"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "¿Qué significan estás opciones?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nHora\n Alarma a las: \n La hora a la que la alarma encenderá.\n\n Silencio después: \n Detiene la alarma después de esta cantidad de tiempo.\n (si el dialogo para despertar no está cerrado)\n\n\nDías\n Día:\n Selecciona los días que la alarma se activará.\n\n Hora:\n Escoge la hora para la alarma de cada día,\n o selecciona el botón para usar la hora predeterminada.\n\n\nVolumen\n Desvanecimiento: \n Disminuye el volumen hasta el volumen escogido \n para esta cantidad de tiempo.\n\n Comenzar a : \n Comienza la disminución desde este volumen.\n\n Final: \n El volumen para detener el desvanecimiento. Si el tiempo de desvanecimiento es 0 entonces coloca el volumen a este valor e inicia la\n reproducción.\n\n\nOpciones:\n Comando Adicional:\n Ejecuta este comando al activar la alarma.\n\n Lista de Reproducción: \n Carga esta lista de reproducción para reproducir.\n Si no es dada una lista, las pistas que están actualmente\n en la lista serán usadas.\n El URL de un stream mp3/ogg también puede ser\n ingresado aquí.\n\n Recordatorio:\n Muestra un recordatorio cuando la alarma se apague,\n escribe el recordatorio en la caja y enciende\n el botón si quieres que se muestre.\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Ayuda"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Tu recordatorio para hoy es.."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Gracias"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Portada de Álbum"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Dispositivo PCM predeterminado"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Dispositivo mezclador predeterminado"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Preferencias del plugin de salida ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Dispositivo PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Dispositivo mezclador:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Elemento mezclador:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Evitar colapsos por falta de recursos"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "Plugin de salida ALSA\nCopyright 2009-2012 John Lindgren\n\nMis agradecimientos a William Pitcock, autor del plugin NG de salida ALSA, cuyo código sirvió como referencia cuando el manual ALSA no era suficiente."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"Plugin de salida ALSA\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"Mis agradecimientos a William Pitcock, autor del plugin NG de salida ALSA, "
+"cuyo código sirvió como referencia cuando el manual ALSA no era suficiente."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "Salida ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (Reproductor MIDI)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "No has seleccionado ningún puerto secuenciador para reproducción MIDI. Puedes hacerlo en las preferencias del plugin MIDI."
+msgstr ""
+"No has seleccionado ningún puerto secuenciador para reproducción MIDI. "
+"Puedes hacerlo en las preferencias del plugin MIDI."
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (Reproductor MIDI)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Motor ALSA"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Este motor envía eventos MIDI a un grupo de puertos secuenciadores ALSA escogidos por el usuario. La interfaz del secuenciador ALSA es muy versátil, puede proveer puertos para sintetizadores por hardware de tarjetas de audio (por ejemplo, emu10k1) pero tambien para sintetizadores por software, dispositivos externos, etc.\nEste motor no produce audio, los eventos MIDI son manejados durectamente desde los dispositivos o programas detrás de los puertos ALSA; por ejemplo, los eventos MIDI enviados al sintetizador por hardware serán reproducidos directamente.\nMotor escrito por Giacomo Lozito."
+msgstr ""
+"Este motor envía eventos MIDI a un grupo de puertos secuenciadores ALSA "
+"escogidos por el usuario. La interfaz del secuenciador ALSA es muy versátil, "
+"puede proveer puertos para sintetizadores por hardware de tarjetas de audio "
+"(por ejemplo, emu10k1) pero tambien para sintetizadores por software, "
+"dispositivos externos, etc.\n"
+"Este motor no produce audio, los eventos MIDI son manejados directamente "
+"desde los dispositivos o programas detrás de los puertos ALSA; por ejemplo, "
+"los eventos MIDI enviados al sintetizador por hardware serán reproducidos "
+"directamente.\n"
+"Backend escrito por Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Motor FluidSynth "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Este motor produce audio enviando eventos MIDI a FluidSynth, un sintetizador de software en tiempo real basado en la especificación SoundFont2 (www.fluidsynth.org).\nEl audio producido puede ser manipulado a trevés de los plugins de efecto y es procesado por el plugin de salida elegido.\nMotor escrito por Giacomo Lozito."
+msgstr ""
+"Este backend produce audio enviando eventos MIDI a FluidSynth, un "
+"sintetizador de software en tiempo real basado en la especificación "
+"SoundFont2 (www.fluidsynth.org).\n"
+"El audio producido puede ser manipulado a través de los plugins de efecto y "
+"es procesado por el plugin de salida elegido.\n"
+"Backend escrito por Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Puerto"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Nombre del Cliente"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Nombre del Puerto"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Puertos de salida ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Tarjeta de sonido:"
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Control del mezclador:"
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Ajustes del mezclador"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "Motor\nALSA"
+msgstr ""
+"Motor\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - información del motor"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
-msgstr "Selección del backend"
+msgstr "Selección del motor"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Ajustes de reproducción"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transponer: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
-msgstr "Cambio de bateria: "
+msgstr "Cambio de batería:"
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Ajustes avanzados"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "pre-calcular duración de archivos MIDI en la lista de reproducción"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "extraer comentarios del archivo MIDI (si están disponibles)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "extraer letras de canciones del archivo MIDI (si están disponibles)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - seleccionar archivo"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Configuración AMIDI-Plug"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - seleccionar archivo SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Ajustes de SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Nombre del archivo"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Cargar SF al iniciar el reproductor"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Cargar SF en la primera reproducción de archivos MIDI"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Ajustes del sintetizador"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "ganancia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "Utilizar predeterminado"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "valor:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "polifonía"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "reverberación"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "sí"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "no"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "coro"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "frecuencia de muestreo"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "personalizada"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Backend\nFluidSynth"
+msgstr ""
+"Backend\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " Información MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Duración (ms):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Núm. de Pistas:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Div. tiempo:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " Comentarios y Letras de canción MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* no hay comentarios disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* no hay letras de canción disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 inválido)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Acerca de AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -606,7 +679,26 @@
 "\n"
 "Tony Vroon\n"
 "for the good help with alpha testing"
-msgstr "\nreproductor de música MIDI modular\nhttp://www.develia.org/projects.php?p=amidiplug\n\nescrito por Giacomo Lozito\n<james@develia.org>\n\nagradecimientos especiales a\n\nClemens Ladish y Jaroslav Kysela\npor sus chidos programas aplaymidi y amixer; fueron\nrealmente útiles, junto con los documentos alsa-lib,\npara aprender más de la API ALSA\n\nAlfredo Spadafina\npor el bonito logo de teclado midi\n\nTony Vroon\npor la buena ayuda con las pruebas alfa."
+msgstr ""
+"\n"
+"reproductor de música MIDI modular\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"escrito por Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"agradecimientos especiales a...\n"
+"\n"
+"Clemens Ladish y Jaroslav Kysela\n"
+"por sus chidos programas aplaymidi y amixer; fueron\n"
+"realmente útiles, junto con los documentos alsa-lib,\n"
+"para aprender más de la API ALSA\n"
+"\n"
+"Alfredo Spadafina\n"
+"por el bonito logo de teclado midi\n"
+"\n"
+"Tony Vroon\n"
+"por la buena ayuda con las pruebas alfa."
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
@@ -638,7 +730,9 @@
 
 #: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "Muestra Notificación en Pantalla cuando se reproduce un elemento de la lista de reproducción"
+msgstr ""
+"Muestra Notificación en Pantalla cuando se reproduce un elemento de la lista "
+"de reproducción"
 
 #: src/aosd/aosd_trigger.c:79
 msgid "Title Change"
@@ -649,7 +743,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Muestra el Notificación en Pantalla cuando, en la reproducción, el título de la pista cambia pero el nombre del archivo es el mismo. Esto es muy útil para mostrar cambios de título en streams de internet."
+msgstr ""
+"Muestra el Notificación en Pantalla cuando, en la reproducción, el título de "
+"la pista cambia pero el nombre del archivo es el mismo. Esto es muy útil "
+"para mostrar cambios de título en streams de internet."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -781,8 +878,13 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Administrador de composición no detectado;\na menos que sepas que tienes uno ejecutándose, por favor activa un administrador de composición, de otra forma las Notificaciones en Pantalla no funcionarán apropiadamente"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Administrador de composición no detectado;\n"
+"a menos que sepas que tienes uno ejecutándose, por favor activa un "
+"administrador de composición, de otra forma las Notificaciones en Pantalla "
+"no funcionarán apropiadamente"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -845,47 +947,47 @@
 msgid "Misc"
 msgstr "Misc."
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "Listas de reproducción ASXv1/ASXv2"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Lista de reproducción Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Color"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Preferencias de Bauer Stereophonic-to-Binaural"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Nivel de alimentación:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Frecuencia de corte:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Predefinidos:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Analizador de Espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -895,233 +997,248 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> y otros.\n\nMuchas gracias a los desarrolladores de libcdio <http://www.gnu.org/software/libcdio/> y a los desarrolladores de libcddb <http://libcddb.sourceforge.net/>.\n\nTambién agradezco a Tony Vroon por ser mi mentor y guía.\n\nEste fue un proyecto del Google Summer of Code 2007"
+msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> y otros.\n"
+"\n"
+"Muchas gracias a los desarrolladores de libcdio <http://www.gnu.org/software/"
+"libcdio/> y a los desarrolladores de libcddb <http://libcddb.sourceforge.net/"
+">.\n"
+"\n"
+"También agradezco a Tony Vroon por ser mi mentor y guía.\n"
+"\n"
+"Este fue un proyecto del Google Summer of Code 2007"
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Velocidad de lectura:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Reemplazar dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Usar CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Usar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Utilizar HTTP en vez de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Ruta de Acceso:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Plugin CD de Audio "
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Falla al iniciar el susbsistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s no válido."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Pista %d no encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Pista %d es una pista de datos."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Falló al abrir la salida de audio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Error al leer CD de audio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "CD de Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Fallo al abrir el dispositivo de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "No se encontró drive de CD capaz de reproducir audio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Fallo al terminar de preparar drive de CD abierto."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Fallo al recuperar el primer/último número de pista."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "No se puede leer LSN inicio/final para la pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Fallo al crear la conexión cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Fallo al consultar el servidor CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Fallo al consultar el servidor CDDB: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Fallo al leer la nformación cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "La unidad de disco está vacía."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Tipo de disco no soportado."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Reproducir CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Agregar CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Entradas del Menú del CD de Audio"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Compresión"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Centrar volumen:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Rango dinámico:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Plugin de Compresión Dinámica de Rango para Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Plugin de Compresión de Rango Dinámico para Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Compresor de Rango Dinámico"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Descodificador de Música de Consolas de Juego"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "General"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Reproducción"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Bajos: "
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "segundos"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Agudos"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Duración de pista predeterminada:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Resampling"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Habilitar resampling de audio"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Frecuencia de resampling:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignorar duración proveniente de las etiquetas SPC"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Aumentar reverberación"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "La duración predeterminada de la pista, expresada en segundos, es usada para pistas que no proveen información de su duración (por ejemplo: pistas de repetición)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"La duración predeterminada de la pista, expresada en segundos, es usada para "
+"pistas que no proveen información de su duración (por ejemplo: pistas de "
+"repetición)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1129,88 +1246,108 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "Motor de descodificador de música de consola basado en Game_Music_Emu 0.5.2\nFormatos soportados: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM,VGZ\n\nPlugin para Audacious por:\nWilliam Pitcock <nenolod@dereferenced.org>\nShay Green <gblargg@gmail.com>"
+msgstr ""
+"Motor de descodificador de música de consola basado en Game_Music_Emu 0.5.2\n"
+"Formatos soportados: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM,VGZ\n"
+"\n"
+"Plugin para Audacious por:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "Los fundidos fallaron porque las pistas tienen un número diferente de canales. Puedes usar el Mezclador de Canales para convertir las pistas al mismo número de canales."
+msgstr ""
+"Los fundidos fallaron porque las pistas tienen un número diferente de "
+"canales. Puedes usar el Mezclador de Canales para convertir las pistas al "
+"mismo número de canales."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Los fundidos fallaron porque las pistas tienen diferentes tasas de bitis. Puedes usar el Convertidos de Tasas de Bits para convertir las pistas a la misma tasa."
+msgstr ""
+"Los fundidos fallaron porque las pistas tienen diferentes tasas de bitis. "
+"Puedes usar el Convertidos de Tasas de Bits para convertir las pistas a la "
+"misma tasa."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Crossfade Plugin para Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Crossfade Plugin para Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Fundido"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Encimar:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Fundir"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intensidad:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Plugin Cue Sheet"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Retraso:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Retroalimentación:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Volumen:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Plugin Echo \nPor Johan Levin, 1999\n\nEco envolvente by Carl van Schaik, 1999"
+msgstr ""
+"Plugin Echo \n"
+"Por Johan Levin, 1999\n"
+"\n"
+"Eco envolvente by Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1218,9 +1355,15 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Plugin descodificador de audio multi-formato para Audacious usando\nel marco multimedia FFmpeg (http://www.ffmpeg.org/)\n\nPlugin para Audacious por:\nWilliam Pitcock <nenolod@nenolod.net>\nMatti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Plugin descodificador de audio multi-formato para Audacious usando\n"
+"el marco multimedia FFmpeg (http://www.ffmpeg.org/)\n"
+"\n"
+"Plugin para Audacious por:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Plugin FFmpeg"
 
@@ -1288,7 +1431,21 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Este programa es software libre; lo puedes redistribuir y/o modificar\nbajo los términos de la GNU General Public License como es publicada \npor The Free Software Foundation; ya sea de la versión 2 de la Licencia,\no (dependiendo de tu opinión) cualquier otra versión posterior.\n\nEste programa es distribuido con la esperanza de que será util, \npero SIN ALGUNA GARANTÍA; aún sin la garantía implícita de COMERCIABILIDAD o IDONEIDAD PARA UN PROPÓSITO PARTICULAR.\nMira la GNU General Public License para más detalles.\n\nDeberás haber recibido una copia de la GNU General Public License\njunto con este programa; si no, escribe a la Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \n02110-1301, USA."
+msgstr ""
+"Este programa es software libre; lo puedes redistribuir y/o modificar\n"
+"bajo los términos de la GNU General Public License como es publicada \n"
+"por The Free Software Foundation; ya sea de la versión 2 de la Licencia,\n"
+"o (dependiendo de tu opinión) cualquier otra versión posterior.\n"
+"\n"
+"Este programa es distribuido con la esperanza de que será util, \n"
+"pero SIN ALGUNA GARANTÍA; aún sin la garantía implícita de COMERCIABILIDAD o "
+"IDONEIDAD PARA UN PROPÓSITO PARTICULAR.\n"
+"Mira la GNU General Public License para más detalles.\n"
+"\n"
+"Deberás haber recibido una copia de la GNU General Public License\n"
+"junto con este programa; si no, escribe a la Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \n"
+"02110-1301, USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1302,11 +1459,13 @@
 msgid "Joint Stereo"
 msgstr "Estéreo Unido"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Monoaural"
 
@@ -1354,7 +1513,7 @@
 msgid "Error protection"
 msgstr "Error de protección"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Calidad"
 
@@ -1434,542 +1593,624 @@
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Configuración del codificador Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Nivel de calidad (0-10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "sin pérdida"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Código original por\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Código original por\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Descodificador FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "Plugin GIO para Audacious\nCopyright 2009-2012 John Lindgren"
+msgstr ""
+"Plugin GIO para Audacious\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Plugin GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analizador de Espectro OpenGL para Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Basado en el plugin XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson y "
+"4Front Technologies\n"
+"\n"
+"Licencia: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Analizador de Espectro OpenGL"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Plugin de Atajos Gnome\nTe permite controlar el reproductor con los atajos de Gnome.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"Plugin de Atajos Gnome\n"
+"Te permite controlar el reproductor con los atajos de Gnome.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Atajos Gnome"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Año"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Álbum"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Pista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Género"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Posición en cola"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Duración"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Ruta del archivo"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Nombre del archivo"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Título personalizado"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Tasa de bits"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Seleccionar Columnas"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Disponibles:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Seleccionadas:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Acoplar a la izquierda"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Acoplar a la derecha"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Acoplar arriba"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Acoplar abajo"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Desacoplar"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Dehabilitar"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Abrir archivos..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Abrir _URL..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "A_gregar archivos..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Agregar U_RL..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Buscar Librería"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "A_cerca..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Preferencias"
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Salir"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Pa_usa"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Detener"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "_Anterior"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "Siguie_nte"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "Repe_tir"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "A_leatorio"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "_No avanzar Lista de Reprod."
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Detener de_spués de esta pista"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Detener D_espués de Esta Pista"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "_Información de pista..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Saltar al _tiempo"
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "Saltar a la _pista"
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Por _Núm de pista"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Configura Punto _A de Repetición"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Configura Punto _B de Repetición"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "_Borrar Puntos de Repetición"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Por _Título"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "Por _Nombre de Archivo"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "Por _Ruta de Archivo"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Por _Núm de pista"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Por_Artista"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Por Á_lbum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "Por Al_bum"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Por _Fecha de Lanzamiento"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "Por _Duración"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Por _Ruta del Archivo"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Por Título _Personalizado"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "_Invertir Orden"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "O_rden Aleatorio"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Reproducir esta Lista de Reproducción"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "A_ctualizar"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Remover Archivos No _Disponibles"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Ordenar Seleccionado"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Remover _Duplicados"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Remover Archivos No _Disponibles"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Nuevo"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Ren_ombrar ..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importar..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Exportar..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Ad_ministrador de Listas de Reproducción ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Administrador de _Colas ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "_Aumentar Volumen"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "_Disminuir Volumen"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Ecualizador"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_fectos"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Interfaz"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Visualizaciones"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Mostrar Barra de _Menú"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Mostrar Barra de I_nformación"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar Barra de Información de Vis_ualización"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Mostrar Barra de E_stado"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Mostrar Tiempo _Restante"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Mostrar Cerrar _Botones"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Mostrar Encabezados de _Columna"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Seleccionar _Columnas ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Avanzar a_l Cambiar Pista"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Lista de Reproducción"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Salida"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Formar/Desformar"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Seleccion_ar todo"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Renombrar ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Interfaz GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Almacenando en buffer..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Error"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canales"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Pista Anterior"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr "Pista previa"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pausa/Continuar"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Detener"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr "Pista siguiente"
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "Avanza 5 segundos"
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Siguiente Pista"
+msgid "Rewind 5 seconds"
+msgstr "Retrocede 5 segundos"
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Avanzar 5 Segundos"
+msgid "Mute"
+msgstr "Silenciar"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Regresar 5 Segundos"
+msgid "Volume up"
+msgstr "Aumentar volumen"
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Silenciar"
+msgid "Volume down"
+msgstr "Disminuir volumen"
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Aumentar Volumen"
+msgid "Jump to file"
+msgstr "Saltar al archivo"
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Disminuir Volumen"
+msgid "Toggle player window(s)"
+msgstr "Cambiar ventana(s) del reproductor"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Saltar al Archivo"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Mostrar Notificaciones en Pantalla"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Cambiar Ventana(s) del Reproductor"
+msgid "Toggle repeat"
+msgstr "Repetir"
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Mostrar Notificaciones en Pantalla"
+msgid "Toggle shuffle"
+msgstr "Aleatorio"
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Cambiar Repetir"
+msgid "Toggle stop after current"
+msgstr "Detener después de actual"
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Cambiar Aleatorio"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr "Extender Ventana(s) del Reproductor"
+msgid "Raise player window(s)"
+msgstr "Aumentar ventanas(s) del reproductor"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "No se recomienda asociar los botones primarios del ratón sin modificadores.\n\n¿Quieres continuar?"
+msgstr ""
+"No se recomienda asociar los botones primarios del ratón sin modificadores.\n"
+"\n"
+"¿Quieres continuar?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Asociar botones del ratón"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Configuración del Plugin Global Hotkey"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Presiona una combinación de teclas dentro de un campo de texto.\nTambién puedes asociar butones del ratón."
+msgstr ""
+"Presiona una combinación de teclas dentro de un campo de texto.\n"
+"También puedes asociar botones del ratón."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Atajos del teclado:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Acción:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Asociación de Teclas:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1982,104 +2223,131 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "Plugin Global Hotkey \nControla el reproductor con las combinaciones de teclas globales o teclas multimedia.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nQuines contribuyeron incluyen:\nCopyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n Bryn Davies <curious@ihug.com.au>,\n Jonathan A. Davis <davis@jdhouse.org>,\n Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"Plugin Global Hotkey \n"
+"Controla el reproductor con las combinaciones de teclas globales o teclas "
+"multimedia.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Quines contribuyeron incluyen:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Hotkeys Globales"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Basedo en xmms-jack, por Chris Morgan:\nhttp://xmms-jack.sourceforge.net/\n\nLlevado a Audacious por Giacomo Lozito"
+msgstr ""
+"Basado en xmms-jack, por Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Llevado a Audacious por Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "Salida JACK"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Ajustes %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Ajustes del Host LADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Rutas de Módulos:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Separar rutas múltiples con dos puntos (:).\nEsas rutas se utilizan además del LADSPA_PATH.\nDespués de agregar nuevas rutas, presiona Intro para buscar plugins nuevos."
+msgstr ""
+"Separar rutas múltiples con dos puntos (:).\n"
+"Esas rutas se utilizan además del LADSPA_PATH.\n"
+"Después de agregar nuevas rutas, presiona Intro para buscar plugins nuevos.</"
+"small>"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Plugins disponibles:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Habilitar"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Habilitar plugins:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "LADSPA Host para Audacious\nCopyright 2011 John Lindgren"
+msgstr ""
+"LADSPA Host para Audacious\n"
+"Copyright 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "Huesped LADSPA"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: No se puede iniciar soporte LIRC\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: no se pudo leer archivo de configuración LIRC\n%s: Por favor, lee la documentación de LIRC\n%s: cómo crear un archivo de configuración LIRC adecuado\n"
+msgstr ""
+"%s: no se pudo leer archivo de configuración LIRC\n"
+"%s: Por favor, lee la documentación de LIRC\n"
+"%s: cómo crear un archivo de configuración LIRC adecuado\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: intentando reconectar...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: comando desconocido \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: desconectado de LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: se intentará reconectar cada %d segundos...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2093,155 +2361,325 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "Un plugin simple para controlar Audacious usando el demonio de control remoto LIRC\n\nAdaptado para Audacious por:\nTony Vroon <chainsaw@gentoo.org>\nJoonas Harjumäki <jharjuma@gmail.com>\n\nBaseda en el plugin XMMS LIRC por:\nCarl van Schaik <carl@leg.uct.ac.za>\nChristoph Bartelmus <xmms@bartelmus.de>\nAndrew O. Shadoura <bugzilla@tut.by>\n\nPara más información acerca de LIRC, ve a http://lirc.org."
+msgstr ""
+"Un plugin simple para controlar Audacious usando el demonio de control "
+"remoto LIRC\n"
+"\n"
+"Adaptado para Audacious por:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Baseda en el plugin XMMS LIRC por:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Para más información acerca de LIRC, ve a http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Conexión"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Reconectar a servidor LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Espera entes de reconectar:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "Plugin LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Letras de canción no disponibles"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Incapaz de traer %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Incapaz de analizar %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Buscando letras de canción ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Sin metadatos de pista"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Conectando a lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "Plugin LyricWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "Listas de Reproducción M3U"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de tact: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generador de tact: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "Un Generador Tact por Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nPara usarlo, agrega un URL: tact://golpes*num/den\npor ejemplo, tact://77 to reproducir 77 golpes por minuto\no tact://60*3/4 para reproducir 60 bpm en ritmo 3/4"
+msgstr ""
+"Un Generador Tact por Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Para usarlo, agrega un URL: tact://golpes*num/den\n"
+"por ejemplo, tact://77 to reproducir 77 golpes por minuto\n"
+"o tact://60*3/4 para reproducir 60 bpm en ritmo 3/4"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Generador Tact"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Plugin Mezclador de Canales para Audacious.\nCopyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+"Plugin Mezclador de Canales para Audacious.\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Mezclador de Canales"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Canales de salida:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Mezclador de Canales"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Plugin MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Resolución"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bit"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bit"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Canales"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Resampling"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Más cercano (más rápido)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Linear (rápido)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Ranura (bueno)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Polifase (mejor)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Frecuencia de muestreo"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Nivel:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Corte:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Reverberación"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Bass Boost"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Envolvente"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Preamplificador"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Misceláneo"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Sobremuestra"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Reducción de ruido"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Reproducir MODs Amiga"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Cuenta de repetición:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Para repetir por siempre, coloca la cuenta de repetición en -1."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (reproducor Module)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Envolvente"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "Plugin MPG123"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "Servidor MPRIS 2"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Plugin Neon HTTP/HTTPS"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Detenido"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious no está reproduciendo."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Plugin de Notificaciones de Escritorio para Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren y Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Basedo en libnotify-aosd por Maximilian Bogner:\nhttp://www.mbogner.de/projects/libnotify-aosd/\n\nCopyright (C) 2010 Maximilian Bogner\nCopyright (C) 2011 John Lindgren\n\nEste programa es software libre; lo puedes redistribuir y/o modificar\nbajo los términos de la GNU General Public License como es publicada \npor The Free Software Foundation; ya sea de la versión 3 de la Licencia,\no (dependiendo de tu opinión) cualquier otra versión posterior.\n\nEste programa es distribuido con la esperanza de que será util, \npero SIN ALGUNA GARANTÍA; aún sin la garantía implícita de COMERCIABILIDAD o IDONEIDAD PARA UN PROPÓSITO PARTICULAR.\nMira la GNU General Public License para más detalles.\n\nDeberás haber recibido una copia de la GNU General Public License\njunto con este programa; si no, mira <http://www.gnu.org/licenses/>."
+"Este plugin es sotware libre: puedes redistribuirlo y/o modificarlo bajo los "
+"términos de la GNU General Public License como es publicada por la Free "
+"Software Foundation, ya sea la versión 3 de la Licencia , o (a tu elección) "
+"cualquier versión posterior.\n"
+"\n"
+"Este plugin es distribuido con la esperanza de que será útil, pero SIN "
+"NINGUNA GARANTIA; incluso sin la garantía incluida de COMERCIALIZACIÓN o "
+"ADAPTADA PARA UN PROPÓSITO PARTICULAE. Lee la GNU General Public License "
+"para más detalles.\n"
+"\n"
+"Deberías haber recibido una copia de la GNU General Public License junto con "
+"este programa. Si no, mira en <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Mostrar los controles de reproducción"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Siempre mostrar la notificación"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Notificaciones en Escritorio"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Mostrar"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Siguiente"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Dispositivo predeterminado"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Dispositivo de audio:"
 
@@ -2266,22 +2704,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "Plugin de salida OSS4 para Audacious\nCopyright 2010-2012 Michał Lipski\n\nMe gustaría agradecer a la ente de #audacious, especialmente a Tony Vroon y John Lindgren y por supuesto a los autores del plugin OSS anterior."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"Plugin de salida OSS4 para Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"Me gustaría agradecer a la ente de #audacious, especialmente a Tony Vroon y "
+"John Lindgren y por supuesto a los autores del plugin OSS anterior."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "Salida OSS4"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "Listas de reproducción PLS"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Descodificador OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2299,162 +2743,241 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Plugin de Salida Audacious PulseAudio\n\nEste programa es software libre; lo puedes redistribuir y/o modificar\nbajo los términos de la GNU General Public License como es publicada \npor The Free Software Foundation; ya sea de la versión 2 de la Licencia,\no (dependiendo de tu opinión) cualquier otra versión posterior.\n\nEste programa es distribuido con la esperanza de que será util, \npero SIN ALGUNA GARANTÍA; aún sin la garantía implícita de COMERCIABILIDAD o IDONEIDAD PARA UN PROPÓSITO PARTICULAR.\nMira la GNU General Public License para más detalles.\n\nDeberás haber recibido una copia de la GNU General Public License\njunto con este programa; si no, escribe a la Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \n02110-1301, USA."
+msgstr ""
+"Plugin de Salida Audacious PulseAudio\n"
+"\n"
+"Este programa es software libre; lo puedes redistribuir y/o modificar\n"
+"bajo los términos de la GNU General Public License como es publicada \n"
+"por The Free Software Foundation; ya sea de la versión 2 de la Licencia,\n"
+"o (dependiendo de tu opinión) cualquier otra versión posterior.\n"
+"\n"
+"Este programa es distribuido con la esperanza de que será util, \n"
+"pero SIN ALGUNA GARANTÍA; aún sin la garantía implícita de COMERCIABILIDAD o "
+"IDONEIDAD PARA UN PROPÓSITO PARTICULAR.\n"
+"Mira la GNU General Public License para más detalles.\n"
+"\n"
+"Deberás haber recibido una copia de la GNU General Public License\n"
+"junto con este programa; si no, escribe a la Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \n"
+"02110-1301, USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "Salida PulseAudio"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Plugin Sample Rate Converter para Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Plugin Sample Rate Converter para Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Saltar/repetir muestras"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Interpolación linear"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Interpolación de sincronización rápida"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Interpolación de sincronización media"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Mejor Interpolación de sincronización"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Conversión"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Tasa:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Mapeos de Tasas"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Usar mapeos de tasas"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Convertidor de tasa de muestra"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Cambiar contraseña"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "OK. Agregando datos -scrobbling- para usuario: %s"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Permiso Denegado"
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Accede al siguiente vínculo para permitir que Audacious agregue datos -"
+"scrobble- a tus reproducciones:"
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Mantiene esta ventana abierta y da clic en 'Verificar Permiso' otra vez.\n"
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"No te preocupes. Tus datos agregados han sido guardados en tu computadora.\n"
+"Ellos serán enviados tan pronto como a Audacious le sea permitido hacerlo."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Problema de Red."
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Services"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "Hay un problema contactando Last.fm. Por favor, intenta después."
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Verificando..."
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Nombre de usuario:"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "V_erificar Permiso"
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Contraseña:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_Revocar Permiso"
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "URL de Scrobbler:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Necesitas permitir que Audacious transfiera los metadatos de las pistas "
+"\"scrobblee\" a tu cuenta Last.fm\n"
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:233
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"El plugin Scrobbler no pudo ser iniciado.\n"
+"Puede haber un problema con tu instalación."
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Plugin Audacious Scrobbler 2.0 por Pitxyoki,\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Plugin Audacious AudioScrobbler \n\nOriginalmente creado por Audun Hove <audun@nlc.no> y Pipian <pipian@pipian.com>"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Gracias a John Lindgren por echárme una mano al comienzo de este proyecto.\n"
+"\n"
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious está usando ahora una versión mejorada de Last.fm Scrobbler.\n"
+"Por favor revisa las Preferencias para el plugin Scrobbler."
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "Plugin de salida SDL para Audacious\nCopyright 2010 John Lindgren"
+msgstr ""
+"Plugin de salida SDL para Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "Salida SDL"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Librería"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Artista Desconocido"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Álbum Desconocido"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\nen %s de %s"
+msgstr ""
+"%s\n"
+"en %s de %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d álbum"
 msgstr[1] "%d álbumes"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2462,10 +2985,14 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n%s, %d pista"
-msgstr[1] "%s\n%s, %d pistas"
+msgstr[0] ""
+"%s\n"
+"%s, %d pista"
+msgstr[1] ""
+"%s\n"
+"%s, %d pistas"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2473,76 +3000,82 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n%d canción de %s"
-msgstr[1] "%s\n%d canciones de %s"
+msgstr[0] ""
+"%s\n"
+"%d canción de %s"
+msgstr[1] ""
+"%s\n"
+"%d canciones de %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Crear Lista de Reproducción"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Agregar a la Lista de Reproducción"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Buscar librería"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Para importar tu librería de música en Audacious, selecciona una carpeta y luego haz clic en el ícono \"actualizar\"."
+msgstr ""
+"Para importar tu librería de música en Audacious, selecciona una carpeta y "
+"luego haz clic en el ícono \"actualizar\"."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Por favor espere..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Seleccione Carpeta"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Herramienta de Búsqueda"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Interface Clásica de Winamp"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "Re_productor"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Selecciona la fuente de la ventana principal del reproductor:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Lista de Reproducción:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Selecciona la fuenta de la lista de reproducción:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Fuentes"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Usar fuentes de mapa de bits (únicamente soporta ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Desplaza el título de la pista en ambas direcciones"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Skin"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Preferencias de Interfaz"
 
@@ -2598,7 +3131,7 @@
 msgid "Presets"
 msgstr "Presets"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Cargar preset"
 
@@ -2611,7 +3144,7 @@
 msgid "Load equalizer preset"
 msgstr "Cargar preset del ecualizador"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Guardar preset"
 
@@ -2623,7 +3156,7 @@
 msgid "Save equalizer preset"
 msgstr "Guardar preset del ecualizador"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Borrar preset"
 
@@ -2631,739 +3164,762 @@
 msgid "Delete auto-preset"
 msgstr "Borrar auto-preset"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Saltar a %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volumen: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% izquierda"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Balance: central"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% derecha"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Menú de Opciones"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Deshabilitar 'Siempre Encima'"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Habilitar 'Siempre Encima'"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Caja de Información del Archivo"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Menú de Visualización"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Modo sencillo."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Modo Lista de Reproducción."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Detener después de la pista."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "No detener después de la pista"
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Repite punto A configurado."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Repite punto B configurado."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Repite puntos borrados."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Auto-desplazar Nombre de Pista"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Detener después de la pista actual"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Picos"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Aleatorio"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "No avanzar Lista de Reproducción"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Mostrar Reproductor"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Mostrar Editor de Listas de Reproducción"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Mostrar Ecualizador"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Siempre Encima"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Colocar en TODOS los Espacios de Trabajo"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Enrollar Reproductor"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Enrollar Editor de Listas de Resproducción"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Enrollar Ecualizador"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analizador de Espectro"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Osciloscopio"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Espectrograma"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Apagado"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Fuego"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Líneas verticales"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Líneas"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Barras"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Osciloscopio de Puntos"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Osciloscopio de Líneas"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Osciloscopio Sólido"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Hielo"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Suave"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Muy lento"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Medio"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Muy rápido"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Tiempo Transcurrido"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Tiempo Faltante"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Siguiente"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Visualización"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Modo de Visualización"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Analizador de Espectro"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Osciloscopio "
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Espectrograma"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "VU WindowShade"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Caída del analizador"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Caida del pico"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Lista de Reproducción"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Reproducir Lista de Reproducción"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Nueva Lista de Reproducción"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Siguiente Lista de Reproducción"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Anterior Lista de Reproducción"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Borrar Lista de Reproducción"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Importar Lista de Reproducción"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
-msgstr "Carga una lista de reproducción dentro de la lista de reproducción seleccionada"
+msgstr ""
+"Carga una lista de reproducción dentro de la lista de reproducción "
+"seleccionada"
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Exportar Lista de Reproducción"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Guardar la Lista de Reproducción seleccionada"
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Actualizar Lista"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Actualiza metadatos asociados con una entrada de Lista de Reproducción"
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Administrador de Listas de Reproducción"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Aministrador de Colas"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Preferencias de Interfaz..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Agregar Dirección de Internet..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Agrega una pista remota a la Lista de Reproducción"
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Agregar Archivos..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Agregar archivos a la Lista de Reproducción."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Buscar y Seleccionar"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Busca la lista de reproducción y selecciona las entradas basado en criterios específicos."
+msgstr ""
+"Busca la lista de reproducción y selecciona las entradas basado en criterios "
+"específicos."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Invertir Selección"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Invierte las entradas seleccionadas y no seleccionadas."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Selecciona Todo"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Selecciona todas las entradas de la Lista de Reproducción."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Selecciona ninguno"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Quita la selección de todas las entradas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Quitar Todo"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Quita todas las entradas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Limpiar Cola de reproducción"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Limpia la cola asociada con esta lista de reproducción."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Remueve los Archivos No Disponibles"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Remueve los archivos no disponibles de la lista de reproducción."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Remover Duplicados"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Por Título"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
-msgstr "Remueve las entradas duplicadas de la lista de reproducción por título."
+msgstr ""
+"Remueve las entradas duplicadas de la lista de reproducción por título."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Por Nombre de Archivo"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Remueve las entradas duplicadas de la lista de reproducción por nombre de archivo."
+msgstr ""
+"Remueve las entradas duplicadas de la lista de reproducción por nombre de "
+"archivo."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Por Ruta + Nombre de archivo"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Remueve las entradas duplicadas de la lista de reproducción por su ruta completa."
+msgstr ""
+"Remueve las entradas duplicadas de la lista de reproducción por su ruta "
+"completa."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Remover No Seleccionados"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Remueve las entradas no seleccionadas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Remover Seleccionados"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Remueve las entradas seleccionadas de la lista de reproducción."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Aleatorizar Lista"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Aleatoriza la lista de reproducción."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Invertir Lista"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Invierte el orden de la lista de reproducción."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Ordenar Lista"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Ordena la lista de reproducción por título."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Por Álbum"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Ordena la lista de reproducción por álbum."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Por Artista"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Ordena la lista de reproducción por Artista."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Ordena la lista de reproducción por nombre de archivo."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Ordena la lista de reproducción por ruta completa."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Por Fecha"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Ordena la lista de reproducción por hora de modificación."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Por Número de Pista"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Ordena la lista de reproducción por número de pista."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Ordenar Seleccionado"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Archivo"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Servicios de Plugin"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Ver Detaller de la Pista"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Ver detalles de la pista"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Acerca de Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Reproducir Archivo"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Cargar y reproducir un archivo"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Reproducir Dirección"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Reproducir medios desde la dirección seleccionada"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Servicios de plugin"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Abrir ventana de preferencias"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Salir de Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Ajusta A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Limpiar A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Saltar al Archivo"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Saltar al tiempo"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Cambiar Cola"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Habilita/deshabilita la entrada en la cola de la lista de reproducción."
+msgstr ""
+"Habilita/deshabilita la entrada en la cola de la lista de reproducción."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Cargar"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importar"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Guardar"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Preset"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Auto cargar preset"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Cargar preset auto-load"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Cargar preset determinado en el ecualizador"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Cero"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Ajustar niveles preset del ecualizador a cero"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Desde archivo"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Cargar preset desde un archivo"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Desde archivo WinAMP EQF"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Cargar preset desde archivo WinAMP EQF"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Presets WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importar presets WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Guardar preset auto-load"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Guardar preset predeterminado"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "En archivo"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Guardar preset en archivo"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "En archivo WinAMP EQF"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Guardar present en archivo WinAMP EQF"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Borrar preset auto-load"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Buscar entradas en la lista de reproducción activa"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Selecciona entradas en la lista de reproducción llenando uno o más campos. Los campos usan la sintaxis de expresiones regulares, mayúsculas o minísculas indiscriminadas. Si no sabes como trabajan las expresiones regulares, simplemente inserta una porción literal de lo que buscas."
+msgstr ""
+"Selecciona entradas en la lista de reproducción llenando uno o más campos. "
+"Los campos usan la sintaxis de expresiones regulares, mayúsculas o "
+"minísculas indiscriminadas. Si no sabes como trabajan las expresiones "
+"regulares, simplemente inserta una porción literal de lo que buscas."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Título: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Álbum: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Nombre de Archivo: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Limpiar selección previa antes de buscar"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Cambiar automáticamente la cola para las entradas coincidentes"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Editor de Listas de Reproducción de Audacious"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
@@ -3381,81 +3937,126 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "No se puede crear el directorio (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Basado en el plugin xmms_sndfile:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Adaptado para Audacious por Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Basedo en el plugin xmms_sndfile:\nCopyright (C) 2000, 2002 Erik de Castro Lopo\n\nAdaptado para Audacious por Tony Vroon <chainsaw@gentoo.org>\n\nEste programa es software libre; lo puedes redistribuir y/o modificar\nbajo los términos de la GNU General Public License como es publicada \npor The Free Software Foundation; ya sea de la versión 2 de la Licencia,\no (dependiendo de tu opinión) cualquier otra versión posterior.\n\nEste programa es distribuido con la esperanza de que será util, \npero SIN ALGUNA GARANTÍA; aún sin la garantía implícita de COMERCIABILIDAD o IDONEIDAD PARA UN PROPÓSITO PARTICULAR.\nMira la GNU General Public License para más detalles.\n\nDeberás haber recibido una copia de la GNU General Public License\njunto con este programa; si no, escribe a la Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \n02110-1301, USA."
+"Este programa es software libre; lo puedes redistribuir y/o modificar\n"
+"bajo los términos de la GNU General Public License como es publicada \n"
+"por The Free Software Foundation; ya sea de la versión 2 de la Licencia,\n"
+"o (dependiendo de tu opinión) cualquier otra versión posterior.\n"
+"\n"
+"Este programa es distribuido con la esperanza de que será util, \n"
+"pero SIN ALGUNA GARANTÍA; aún sin la garantía implícita de COMERCIABILIDAD o "
+"IDONEIDAD PARA UN PROPÓSITO PARTICULAR.\n"
+"Mira la GNU General Public License para más detalles.\n"
+"\n"
+"Deberás haber recibido una copia de la GNU General Public License\n"
+"junto con este programa; si no, escribe a la Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \n"
+"02110-1301, USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Plugin Sndfile"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Acerca del Plugin de Salida Sndio"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Plugin de Salida Sndio\n\nEscrito por Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Plugin de Salida Sndio\n"
+"\n"
+"Escrito por Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Formato no soportado"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Fue solicitado un formato no soportado por el dispositivo de audio.\n\nPor favor, intenta nuevamente con el servidor sndio(1) ejecutándose."
+msgstr ""
+"Fue solicitado un formato no soportado por el dispositivo de audio.\n"
+"\n"
+"Por favor, intenta nuevamente con el servidor sndio(1) ejecutándose."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "dispositivo sndio"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(vacío significa predeterminado)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Cambiar Pista"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Comando para ejecutar cuando Audacious comience una nueva pista."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Comando para ejecutar al final de una pista."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Comando para ejecutar cuando Audacious alcance el final de una lista de reproducción."
+msgstr ""
+"Comando para ejecutar cuando Audacious alcance el final de una lista de "
+"reproducción."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Comando para ejecutar cuando el título de una pista cambie (por ejemplo, títulos de flujos de red)."
+msgstr ""
+"Comando para ejecutar cuando el título de una pista cambie (por ejemplo, "
+"títulos de flujos de red)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3472,35 +4073,89 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Puedes usar las siguiente cadenas de formato las\ncuales serán sustituidas antes de llamar al comando\n(no todas son útiles para el comando end-of-playlist):\n%F: Frecuancia (en hertz)\n%c: Número de canales\n%f: Nombre de archivo (ruta completa)\n%l: Duración (en milisegundos)\n%n o %s: Nombre de pista\n%r: Tasa (en bits por segundo)\n%t Posición en la lista de reproducción (%02d)\n%p Actualmente reproduciendo (1 ó 0)\n%a Artista\n%b Álbum\n%T: Título de pista"
+msgstr ""
+"Puedes usar las siguiente cadenas de formato las\n"
+"cuales serán sustituidas antes de llamar al comando\n"
+"(no todas son útiles para el comando end-of-playlist):\n"
+"%F: Frecuencia (en hertz)\n"
+"%c: Número de canales\n"
+"%f: Nombre de archivo (ruta completa)\n"
+"%l: Duración (en milisegundos)\n"
+"%n: o %s: Nombre de pista\n"
+"%r: Tasa (en bits por segundo)\n"
+"%t: Posición en la lista de reproducción (%02d)\n"
+"%p: Actualmente reproduciendo (1 ó 0)\n"
+"%a: Artista\n"
+"%b: Álbum\n"
+"%T: Título de pista"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Parámetros enviados al shell deberán ser encapsulados en apóstrofes. Hacer otra cosa es un riesgo de seguridad."
+msgstr ""
+"Parámetros enviados al shell deberán ser encapsulados en "
+"apóstrofes. Hacer otra cosa es un riesgo de seguridad."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Plugin SoX Resampler para Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Basado en el Plugin Sample Rate Coverter\n"
+"Copyright 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Rápido"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Bajo"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Alto"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Muy Alto"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Calidad:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "SoX Resampler"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Velocidad y Tono"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Velocidad:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Tono:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Velocidad y Tono"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3509,94 +4164,114 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "Plugin Status Icon \n\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nEste plugin provee un ícono de estado, colocado en el área \nde la bandeja del sistema del administrador de la ventana."
+msgstr ""
+"Plugin Status Icon \n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Este plugin provee un ícono de estado, colocado en el área \n"
+"de la bandeja del sistema del administrador de la ventana."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Acción de rueda central del mouse"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Cambiar volumen"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Cambiar pista en reproducción"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Otras Configuraciones"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Deshabilitar la ventana emergente"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Cerrar a la bandeja del sistema"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
-msgstr "Avanzar en la lista de reproducción cuando se desplace hacía arriba"
+msgstr "Avanzar en la lista de reproducción cuando se desplace hacia arriba"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Ícono de Estado"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Plugin Extra Stereo \n\nPor Johan Levin, 1999"
+msgstr ""
+"Plugin Extra Stereo \n"
+"\n"
+"Por Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Extra Estéreo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Extra Estéreo"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Generador de tonos: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "Generador de tonos sinusoidal por Håvard Kvålen <havardk@xmms.org>\nModificado por Daniel J. Peng <danielpeng@bigfoot.com>\n\nPara usarlo, agrega un URL: tone://frequencia1;frequencia2;frequencia3;...\npor ejemplo, tone://2000;2005 to reproducir un tono de2000 Hz tone y un tono de 2005 Hz"
+msgstr ""
+"Generador de tonos sinusoidal por Håvard Kvålen <havardk@xmms.org>\n"
+"Modificado por Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Para usarlo, agrega un URL: tone://frequencia1;frequencia2;frequencia3;...\n"
+"por ejemplo, tone://2000;2005 to reproducir un tono de2000 Hz tone y un tono "
+"de 2005 Hz"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Generador de Tonos"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "Plugin File I/O para Audacious\nCopyright 2009-2012 John Lindgren\n\nESTE PLUGIN IS REQUERIDO. NO DESHABILITARLO."
+msgstr ""
+"Plugin File I/O para Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"ESTE PLUGIN IS REQUERIDO. NO DESHABILITARLO."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Plugin de E/S de Archivos"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Removedor de Voz"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3615,46 +4290,76 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Descodificador Audacious Ogg Vorbis\n\nBasado en el Plugin Ogg Vorbis de Xiph.org Foundation:\nhttp://www.xiph.org/\n\nCodigo original por:\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nContribuciones de:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Descodificador Audacious Ogg Vorbis\n"
+"\n"
+"Basado en el Plugin Ogg Vorbis de Xiph.org Foundation:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Codigo original por:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contribuciones de:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Descodificador Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr "Reproductor de archivos de formato Vortexpor Sashnov Alexander <sashnov@ngs.ru>\nBasado en in_vtx.dll por Roman Sherbakov <v_soft@microfor.ru>\nPlugin para Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Reproductor de archivos de formato Vortex por Sashnov Alexander <sashnov@ngs."
+"ru>\n"
+"Basado en in_vtx.dll por Roman Sherbakov <v_soft@microfor.ru>\n"
+"Plugin para Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Descodificador VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "con pérdida (híbrido)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "con pérdida"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n\nAlgo del código del plugin era de Miles Egan."
+msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Algo del código del plugin era de Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Descodificador WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Descodificador 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listas de Reprod. XML Compartibles (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - seleccionar archivo"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Ordena S_elección"

audacious-plugins-3.3.4.tar.bz2/po/et.po -> audacious-plugins-3.4.2.tar.bz2/po/et.po Changed

@@ -1,592 +1,597 @@
 # Estonian translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Ivar Smolin <okul at linux ee>, 2007.
-# Ivar Smolin <okul@linux.ee>, 2012.
+# Ivar Smolin <okul at linux ee>, 2007
+# Ivar Smolin <okul@linux.ee>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-16 23:46+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-04 12:38+0000\n"
 "Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: Estonian\n"
+"Language-Team: Estonian (http://www.transifex.com/projects/p/audacious/"
+"language/et/)\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "stereo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr ""
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr ""
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Äratus"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "See on sinu äratus."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "Olgu"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Äratuste sätted"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Aeg"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "tundi"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr " "
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minutit"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Vaigistamine pärast:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Vaikimisi äratuskell:"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "See on sinu äratus."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Vali päevad, mil äratus tööle hakkab"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Vaikimisi"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Meeldetuletaja"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Päev"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Esmaspäev"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Reede"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Esmaspäev"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Äratuste sätted"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Aeg"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Vaikimisi äratuskell:"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr " "
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Vaigistamine pärast:"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "tundi"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minutit"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Vali päevad, mil äratus tööle hakkab"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Päev"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Vaikimisi"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Päevad"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Sumbumine"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "sekundit"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Valjus"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Praegune"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Alguses"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Lõpuks"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Praegune"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Täiendav käsk"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "lubatud"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Esitusnimekiri (valikuline)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr ""
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Meeldetuletaja"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Kasutan meeldetuletajat"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Valikud"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Mida need valikud tähendavad?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Abi"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Loobu"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Sinu tänane meeldetuletaja on ..."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Aitäh"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Albumi graafika"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Vaikimisi PCM-seade"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Vaikimisi mikserseade"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA väljundplugina eelistused"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "PCM-seade:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Miksimisseade:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Miksimiselement:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Sa pole MIDI esitamiseks valinud ühtegi sekventseriporti. Seda saab teha MIDI-plugina eelistustest."
+msgstr ""
+"Sa pole MIDI esitamiseks valinud ühtegi sekventseriporti. Seda saab teha "
+"MIDI-plugina eelistustest."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr ""
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "ALSA taustaprogramm "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "FluidSynth taustaprogramm "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "See taustaprogramm saadab MIDI-sündmused SoundFont2 spetsifikatsioonil põhinevale tarkvaralisele süntesaatorprogrammile FluidSynth (www.fluidsynth.org).\nSünteesitud heli esitatakse valitud väljundplugina abil ning seda on võimalik efektipluginate abil järeltöödelda.\nTaustaprogrammi autor on Giacomo Lozito."
+msgstr ""
+"See taustaprogramm saadab MIDI-sündmused SoundFont2 spetsifikatsioonil "
+"põhinevale tarkvaralisele süntesaatorprogrammile FluidSynth (www.fluidsynth."
+"org).\n"
+"Sünteesitud heli esitatakse valitud väljundplugina abil ning seda on "
+"võimalik efektipluginate abil järeltöödelda.\n"
+"Taustaprogrammi autor on Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Port"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Kliendi nimi"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Pordi nimi"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "ALSA väljundi pordid"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Helikaart: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Mikseri juhtimine: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Mikseri sätted"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
 msgstr "ALSA taustaprogramm"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - taustaprogrammi andmed"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Taustaprogrammi valimine"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Esituse sätted"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Laiendatud sätted"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "esitusnimekirjas olevate MIDI-failide kestuse eelarvutamine"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "MIDI-failidest eraldatakse kommentaarid (kui need on saadaval)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "MIDI-failidest eraldatakse laulusõnad (kui need on saadaval)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - faili valimine"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - SoundFont faili valimine"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "SoundFont sätted"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Failinimi"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Suurus (baitides)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Süntesaatori sätted"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "vaikimisi väärtus"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "Diskreetimissagedus"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "kohandatud "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "FluidSynth \ntaustaprogramm"
+msgstr ""
+"FluidSynth \n"
+"taustaprogramm"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " MIDI-andmed "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Vorming:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Kestus (msek):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI kommentaarid ja laulusõnad "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* selles MIDI-failis pole kommentaare *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* selles MIDI-failis pole laulusõnu *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (vigane UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -650,7 +655,9 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "OSD käivitamine kui esitamise ajal loo pealkiri muutub, kuid esitatav fail või andmevoog jääb samaks. See on kasulik internetiraadiote puhul."
+msgstr ""
+"OSD käivitamine kui esitamise ajal loo pealkiri muutub, kuid esitatav fail "
+"või andmevoog jääb samaks. See on kasulik internetiraadiote puhul."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -782,7 +789,8 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
 msgstr ""
 
 #: src/aosd/aosd_ui.c:799
@@ -846,47 +854,47 @@
 msgid "Misc"
 msgstr "Muu"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "ASXv1/ASXv2-esitusnimekirjad"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Audaciouse esitusnimekirjad (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr ""
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr ""
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr ""
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr ""
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Valmisseadistused:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -898,231 +906,232 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP asemel kasutatakse HTTP-d"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Audio-CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Seade on tühi."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Plaadi liik pole toetatud."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Esita CD-lt"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Lisa CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Audioplaadi menüüvalikud"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr ""
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr ""
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr ""
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr ""
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Mängukonsooli muusikadekooder"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Üldine"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Esitamine"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Madalad:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "sek"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Kõrged:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Loo vaikimisi kestus:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr ""
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr ""
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr ""
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "SPC-siltidest pärit pikkust tuleb eirata"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
 msgstr ""
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1132,74 +1141,76 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Kaja"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Viivitus:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr ""
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr ""
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
@@ -1207,11 +1218,11 @@
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Kaja"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1221,7 +1232,7 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr ""
 
@@ -1303,11 +1314,13 @@
 msgid "Joint Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1355,7 +1368,7 @@
 msgid "Error protection"
 msgstr "Veakaitse"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Kvaliteet"
 
@@ -1435,19 +1448,19 @@
 msgid "Tags"
 msgstr "Sildid"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis-kodeerija sätted"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Kvaliteedi tase (0-10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1455,21 +1468,37 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr ""
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "GIO-plugin"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
@@ -1477,500 +1506,548 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr ""
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Kirje number"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Pealkiri"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Esitaja"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Aasta"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Lugu"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Žanr"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Asukoht järjekorras"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Kestus"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Faili rada"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Faili nimi"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Kohandatud pealkiri"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Bitikiirus"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Veergude valimine"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Saadaval:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Valitud:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Doki vasakule"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Doki paremale"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Doki üles"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Doki alla"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Keela"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Ava failid ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Ava _URL ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Lisa faile ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Lisa U_RL ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr ""
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "_Programmist lähemalt"
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Eelistused ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Välju"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Esita"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "_Peata"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Seiska"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "Ee_lmine"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Järgmine"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "Ko_rduv"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "Se_gatud"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "Esitusnimekirja ei _kasutata"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Seisk_a pärast praegust lugu"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "L_oo andmed ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "_Hüppa määratud ajale..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "_Vaheta lugu ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Loo _numbri järgi"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Peal_kirja järgi"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Loo _numbri järgi"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "_Esitaja järgi"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "_Albumi järgi"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "_Väljalaske kuupäeva järgi"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "_Faili raja järgi"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Ko_handatud pealkirja järgi"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "_Pööra järjestus tagurpidi"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "_Järjestus juhuslikuks"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "Esita selle _nimekirja lood"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Värskenda"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Ee_malda kättesaamatud failid"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Sordi"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Valiku sortimine"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Ee_malda kättesaamatud failid"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Uus"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Muu_da nime"
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "Sul_ge"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Impordi ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Ekspordi ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Esitusnimekirjade _haldur.."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Halda _järjekorda ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "_Valjemaks"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "Va_iksemaks"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Ekvalaiser"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_fektid"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Liides"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Visualiseerimine"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "_Menüüriba on nähtaval"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "_Teaberiba on nähtaval"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "_Olekuriba on nähtaval"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr ""
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Veergude _päised on nähtaval"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Vee_rgude valimine ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "_Kerimine loo vahetumisel"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Fail"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Esitamine"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "E_situsnimekiri"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Teenused"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "Väl_jund"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Vaade"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Järjekorda/järjekorrast maha"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "_Lõika"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Val_i kõik"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Muuda nime..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "GTK liides"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Puhverdamine ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Viga"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d kanal"
 msgstr[1] "%d kanalit"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Eelmine lugu"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Esita"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pausimine/pausi lõpetamine"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Seiska"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Järgmine lugu"
+msgid "Rewind 5 seconds"
+msgstr ""
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Edasikerimine 5 sekundit"
+msgid "Mute"
+msgstr "Heli tummaks"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Tagasikerimine 5 sekundit"
+msgid "Volume up"
+msgstr ""
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Heli tummaks"
+msgid "Volume down"
+msgstr ""
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Valjemaks"
+msgid "Jump to file"
+msgstr ""
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Vaiksemaks"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Hüppa failile"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "OSD sisse-/väljalülitamine"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+msgid "Toggle repeat"
 msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "OSD sisse-/väljalülitamine"
+msgid "Toggle shuffle"
+msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Korduse sisse-/väljalülitamine"
+msgid "Toggle stop after current"
+msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Järjekorra segamise sisse-/väljalülitamine"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr ""
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Peamisi hiirenuppe pole soovitatav ilma muuteklahvideta siduda.\n\nKas soovid jätkata?"
+msgstr ""
+"Peamisi hiirenuppe pole soovitatav ilma muuteklahvideta siduda.\n"
+"\n"
+"Kas soovid jätkata?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Hiirenuppude sidumine"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Globaalsete kiirklahvide plugina sätted"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Vajuta tekstiväljal soovitud klahvikombinatsiooni.\nSamamoodi saab siduda ka hiirenuppe."
+msgstr ""
+"Vajuta tekstiväljal soovitud klahvikombinatsiooni.\n"
+"Samamoodi saab siduda ka hiirenuppe."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Kiirklahvid:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Tegevus:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Kiirklahv:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1985,11 +2062,11 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
@@ -1997,90 +2074,99 @@
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr ""
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s sätted"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "LADSPA hosti sätted"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Moodulite rajad:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Eralda rajad kooloniga.\nMooduleid otsitakse LADSPA_PATH keskkonnamuutujas ning siin määratud radadelt.\nPärast uute radade lisamist vajuta uute pluginate otsimiseks Enterit."
+msgstr ""
+"Eralda rajad kooloniga.\n"
+"Mooduleid otsitakse LADSPA_PATH keskkonnamuutujas ning siin määratud "
+"radadelt.\n"
+"Pärast uute radade lisamist vajuta uute pluginate otsimiseks Enterit."
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Saadaolevad pluginad:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Luba"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Lubatud pluginad:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Sätted"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr ""
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: LIRC-tuge pole võimalik lähtestada\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: LIRC-seadistusfaili pole võimalik lugeda\n%s: korrektse seadistusfaili loomiseks\n%s: loe palun LIRC-dokumentatsiooni\n"
+msgstr ""
+"%s: LIRC-seadistusfaili pole võimalik lugeda\n"
+"%s: korrektse seadistusfaili loomiseks\n"
+"%s: loe palun LIRC-dokumentatsiooni\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr ""
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: tundmatu käsk \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr ""
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr ""
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2096,67 +2182,67 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Ühendus"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Taasühendumine LIRC-serveriga"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Enne taasühendumist oodatakse"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "LIRC-plugin"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Ühendumine saidiga lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr ""
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "M3U-esitusnimekirjad"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Taktigeneraator: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Taktigeneraator: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2165,84 +2251,218 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr ""
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Kanalimikser"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Väljundkanalite arv:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Kanalimikser"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "MMS-plugin"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Ruumiline heli"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr ""
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr ""
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS-plugin"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr ""
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr ""
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Töölauateavitused"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pausi"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Järgmine"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Vaikimisi seade"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Audioseade:"
 
@@ -2267,22 +2487,23 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "PLS-esitusnimekirjad"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2302,160 +2523,200 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "PulseAudio väljund"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr ""
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr ""
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Meetod:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr ""
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr ""
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr ""
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22,05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44,1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr ""
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Parooli muutmine"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Teenused"
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
 msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Kasutajanimi:"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Parool:"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr ""
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "SDL-väljund"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Teek"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Tundmatu esitaja"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Tundmatu album"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
 msgstr ""
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d album"
 msgstr[1] "%d albumit"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2466,7 +2727,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2477,73 +2738,75 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "Loo _esitusnimekiri"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Lisa esitusnimekirja"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Otsing audiokogust"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Oma audiokogu importimiseks Audaciousesse vali kataloog ja vajuta värskendamise ikoonile."
+msgstr ""
+"Oma audiokogu importimiseks Audaciousesse vali kataloog ja vajuta "
+"värskendamise ikoonile."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Palun oota..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Kataloogi valimine"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Otsinguvahend"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Esitaja:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr ""
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Esitusnimekiri:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Esitusnimekirja kirjatüübi valimine:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Kirjatüübid"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Kasutatakse rasterkirja (toetab ainult ASCII kooditabelit)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Loo nime keritakse mõlemas suunas"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Rüü"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Liidese eelistused"
 
@@ -2599,7 +2862,7 @@
 msgid "Presets"
 msgstr "Valmisseadistused"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Valmisseadistuste laadimine"
 
@@ -2612,7 +2875,7 @@
 msgid "Load equalizer preset"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Valmisseadistuste salvestamine"
 
@@ -2624,7 +2887,7 @@
 msgid "Save equalizer preset"
 msgstr "Ekvalaiseri valmisseadistuse salvestamine"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Valmisseadistuse kustutamine"
 
@@ -2632,739 +2895,752 @@
 msgid "Delete auto-preset"
 msgstr ""
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr ""
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Valjus: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr ""
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Valikute menüü"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr ""
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr ""
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Visualiseerimismenüü"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Ühe loo režiim."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Esitusnimekirja režiim."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Seiskamine pärast loo lõppu."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Jätkamine pärast loo lõppu."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Loo nime automaatkerimine"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Seiskamine pärast loo lõppu"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Tipud"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Korduv"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Segatud"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Esitusnimekirja ei kasutata"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Näita esitaja akent"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Näita esitusnimekirja redaktorit"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Näita ekvalaiserit"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Alati pealmine"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Näidatakse kõigil tööaladel"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Keri esitaja aken kokku"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Keri esitusnimekirja redaktor kokku"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Keri ekvalaiser kokku"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analüsaator"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Skoop"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Heligraafik"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Väljas"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Tavaline"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Tuli"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Püstjoontega"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Jooned"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Tulbad"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Punktidega"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Joonega"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Ühtlane"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Jää"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Pehme"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Väga aeglane"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Aeglane"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Keskmine"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Kiire"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Väga kiire"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Kulunud aeg"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Järelejäänud aeg"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pausi"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Eelmine"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Järgmine"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Visualiseerimine"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Visualiseerimisrežiim"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Analüsaatori režiim"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Skoobi režiim"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Heligraafiku režiim"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Analüsaatori tagasikukkumine"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Tippude tagasikukkumine"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Esitusnimekiri"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Uus esitusnimekiri"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Vali järgmine esitusnimekiri"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Vali eelmine esitusnimekiri"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Kustuta esitusnimekiri"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Impordi esitusnimekiri"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Esitusnimekirja faili laadimine valitud esitusnimekirja."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Ekspordi esitusnimekiri"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Valitud esitusnimekirja salvestamine."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Värskenda nimekirja"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Esitusnimekirjas valitud kirjega seotud metaandmete värskendamine."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Esitusnimekirjade haldus"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Järjekorra haldus"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Vaade"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Liides"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Liidese eelistused..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Lisa internetiaadress..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Võrgus asuva loo lisamine esitusnimekirja."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Lisa faile..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Failide lisamine esitusnimekirja"
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Otsi ja vali"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Vaheta valitud ja valimata"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Vali kõik"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Kõigi esitusnimekirja kirjete valimine."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Tühista valik"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Kõigi esitusnimekirja kirjete kustutamine."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Eemalda kõik"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Esitusnimekirjast kõikide kirjete eemaldamine"
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Puhasta järjekord"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Esitusnimekirjale määratud esitusjärjekorra puhastamine"
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Eemalda kättesaamatud failid"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Kättesaamatute failide eemaldamine esitusnimekirjast."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Eemalda korduvad kirjed"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Pealkirja järgi"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Esitusnimekirjast korduvate kirjete eemaldamine pealkirja järgi."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Failinime järgi"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Esitusnimekirjast korduvate kirjete eemaldamine failinime järgi."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Raja ja failinime järgi"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Esitusnimekirjast korduvate kirjete eemaldamine faili täisraja järgi."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Eemalda valimata kirjed"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Valimata kirjete eemaldamine esitusnimekirjast."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Eemalda valik"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Valitud kirjete eemaldamine esitusnimekirjast"
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Sega nimekiri"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Nimekirja segiajamine"
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Pööra järjestus ümber"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Esitusnimekirja järjekorra ümberpööramine"
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Nimekirja sortimine"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Nimekirja sortimine pealkirja järgi."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Albumi järgi"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Nimekirja sortimine albumi järgi."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Esitaja järgi"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Nimekirja sortimine esitaja järgi."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Nimekirja sortimine failinime järgi."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Nimekirja sortimine täisraja järgi."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Kuupäeva järgi"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Nimekirja sortimine muutmise aja järgi."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Loo numbri järgi"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Nimekirja sortimine loo numbri järgi."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Valiku sortimine"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Fail"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Pluginate teenused"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Vaata loo andmeid"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr ""
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Audaciousest lähemalt"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Esita faili"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Faili laadimine ja esitamine"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Esita asukohalt"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Meedia esitamine määratud asukohast"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Pluginate teenused"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Eelistused"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr ""
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Audaciouse töö lõpetamine"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Määra A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Puhasta A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Hüppa failile"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Hüppa ajahetkele"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Järjekorda / järjekorrast maha"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Esitusnimekirja kirje määramine esitusjärjekorda või sealt eemaldamine."
+msgstr ""
+"Esitusnimekirja kirje määramine esitusjärjekorda või sealt eemaldamine."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Lõika"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Aseta"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Laadi"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr ""
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Salvesta"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Nullsätted"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Failist"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Valmisseadistuste laadimine failist"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "WinAMPi EQF-failist"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Valmisseadistuste laadimine WinAMPi EQF-failist"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMPi valmisseadistused"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "WinAMPi valmisseadistuste importimine"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Vaikimisi valmisseadistuste salvestamine"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Faili"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Valmisseadistuste salvestamine faili"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "WinAMPi EQF-faili"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Valmisseadistuste salvestamine WinAMPi EQF-faili"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Otsimine aktiivsest esitusnimekirjast"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Esitusnimekirjast ühe või enama välja järgi otsimine. Otsinguväljadel kasutatakse tõstutundetut regulaaravaldise süntaksit. Kui sa pole regulaaravaldistega tuttav, siis sisesta lihtsalt otsitav sõnaosa."
+msgstr ""
+"Esitusnimekirjast ühe või enama välja järgi otsimine. Otsinguväljadel "
+"kasutatakse tõstutundetut regulaaravaldise süntaksit. Kui sa pole "
+"regulaaravaldistega tuttav, siis sisesta lihtsalt otsitav sõnaosa."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Pealkiri: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Esitaja: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Failinimi: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Enne otsimist nullitakse eelmine valik"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Otsingule vastavatest kirjetest luuakse uus esitusnimekiri"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Audaciouse esitusnimekirja redaktor"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d/%d-st)"
@@ -3382,81 +3658,99 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Kataloogi (%s) pole võimalik luua: %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 msgstr ""
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr ""
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
 msgstr ""
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr ""
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr ""
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Olgu"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Loobu"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Loovahetus"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Uue loo alustamisel käivitatav käsk:"
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Käsk:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Loo lõppemisel käivitatav käsk:"
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Esitusnimekirja lõppu jõudmisel käivitatav käsk:"
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Loo pealkirja muutumisel käivitatav käsk (näiteks võrguraadio pealkirja muutumisel)."
+msgstr ""
+"Loo pealkirja muutumisel käivitatav käsk (näiteks võrguraadio pealkirja "
+"muutumisel)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3475,33 +3769,69 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Käsureaprogrammile edastatavad parameetrid tuleks paigutada jutumärkide vahele. Selle tegematajätmine võib olla turvarisk."
+msgstr ""
+"Käsureaprogrammile edastatavad parameetrid tuleks "
+"paigutada jutumärkide vahele. Selle tegematajätmine võib olla turvarisk.</"
+"span>"
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Käsud"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3512,63 +3842,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Hiireratta kerimine"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Muudab valjust"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Vahetab esitatavat lugu"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Muud sätted"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Hüpikaken on keelatud"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Sulgemine süsteemisalve"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Olekuikoon"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Toonigeneraator: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3577,11 +3907,11 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Toonigeneraator"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -3589,15 +3919,15 @@
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Faili S/V-plugin"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Hääle eemaldamine"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3618,44 +3948,47 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis dekooder"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "VTX-dekooder"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "WavPack dekooder"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "2SF-dekooder"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Jagatavad XML-esitusnimekirjad (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - faili valimine"

audacious-plugins-3.3.4.tar.bz2/po/eu.po -> audacious-plugins-3.4.2.tar.bz2/po/eu.po Changed

@@ -1,592 +1,603 @@
 # Basque translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2009.
-# <oelkoro@gmail.com>, 2012.
+# asier <asier.fernandez.iribar@gmail.com>, 2013
+# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2009
+# Osoitz <oelkoro@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-16 23:46+0000\n"
-"Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: Basque\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-06-03 12:50+0000\n"
+"Last-Translator: asier <asier.fernandez.iribar@gmail.com>\n"
+"Language-Team: Basque (http://www.transifex.com/projects/p/audacious/"
+"language/eu/)\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "monoa"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "estereoa"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "surround"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "AAC Deskodetzailea"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr ""
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Hau da zure esnatzeko deia:"
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "Ados"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Alarmaren ezarpenak"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Denbora"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "orduak"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "o"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minutuak"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Isildu hau eta gero:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Alarma noiz (lehenetsia):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Hau da zure esnatzeko deia:"
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Aukeratu alarmak jotzeko egunak"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Lehenetsia"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Gogorarazlea"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Eguna"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Astelehena"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Asteartea"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Asteazkena"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Osteguna"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Ostirala"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Igandea"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Astelehena"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Alarmaren ezarpenak"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Denbora"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Alarma noiz (lehenetsia):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "o"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Isildu hau eta gero:"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "orduak"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minutuak"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Aukeratu alarmak jotzeko egunak"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Eguna"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Lehenetsia"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Egunak"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Progresioa"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "segundo"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Bolumena"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Oraingoa"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Hasi hemen "
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Bukaeran"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Oraingoa"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Komando gehigarria"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "gaitu"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Erreprodukzio-zerrenda (aukerazkoa)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr ""
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Gogorarazlea"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Erabili gogorarazlea"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Aukerak"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Zer esan nahi dute aukera hauek?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Laguntza"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Utzi"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Zure gaurko gogorarazlea..."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Eskerrik asko"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Diskoaren azala"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Lehenetsitako PCM gailua"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Lehenetsitako nahaslea"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA irteera pluginaren hobespenak"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "PCM gailua:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Nahastailearen gailua:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Nahaslea:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Ez duzu sekuenziadore porturik aukeratu MIDI erreproduzitzeko. MIDI pluginaren hobespenetak aukeratu dezakezu."
+msgstr ""
+"Ez duzu sekuenziadore porturik aukeratu MIDI erreproduzitzeko. MIDI "
+"pluginaren hobespenetak aukeratu dezakezu."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr ""
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "ALSAren motorra "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Motor honek MIDI gertaerak bidaltzen ditu erabiltzaileak aukeratutako ALSA sekuentziadorearen ataken taldeari. ALSA sekuentziadorearen interfazea oso moldakorra da, atakak eskaintzen ditu audio-txartelen hardware-sintetizadoreentzako (adib. emu10k1), software-sintetizadoreentzako, kanpoko gailuentzako, e.a.\nMotor honek ez du audiorik ekoizten, ALSA ataken atzean dauden gailuak/programak kudeatzen dituzte zuzenean MIDI gertaerak. Adibidez, hardware-sintetizadorera bidalitako MIDI gertaerak zuenean erreproduzi daitezke.\nMotorra Giacomo Lozito-k garatu zuen."
-
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+msgstr ""
+"Motor honek MIDI gertaerak bidaltzen ditu erabiltzaileak aukeratutako ALSA "
+"sekuentziadorearen ataken taldeari. ALSA sekuentziadorearen interfazea oso "
+"moldakorra da, atakak eskaintzen ditu audio-txartelen hardware-"
+"sintetizadoreentzako (adib. emu10k1), software-sintetizadoreentzako, kanpoko "
+"gailuentzako, e.a.\n"
+"Motor honek ez du audiorik ekoizten, ALSA ataken atzean dauden gailuak/"
+"programak kudeatzen dituzte zuzenean MIDI gertaerak. Adibidez, hardware-"
+"sintetizadorera bidalitako MIDI gertaerak zuenean erreproduzi daitezke.\n"
+"Motorra Giacomo Lozito-k garatu zuen."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "FluidSynth motorra "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Ataka"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Bezeroaren izena"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Atakaren izena"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "ALSAren irteeraren atakak"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Soinu-txartela: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Nahastaile-kontrola: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Nahastailearen ezarpenak"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "ALSA\nmotorra"
+msgstr ""
+"ALSA\n"
+"motorra"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - motorraren informazioa"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Motorraren hautapena"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Erreprodukzioaren ezarpenak"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Irauli: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Perkusio-desplazamendua:"
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Ezarpen aurreratuak"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "aurre-kalkulatu erreprodukzio-zerrendako MIDI fitxategien luzera"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "erauzi MIDI fitxategiko iruzkinak (egonez gero)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "erauzi MIDI fitxategiko letrak (egonez gero)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - hautatu fitxategia"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - hautatu SoundFont fitxategia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "SoundFont ezarpenak"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Fitxategi-Izena"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Tamaina (byte)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Kargatu SF erreproduzitzailea abiatzean"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Sintetizadorearen ezarpenak"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "irabazia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "erabili lehenetsia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "balioa:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "reverb"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "bai"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "ez"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "chorus"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "lagin-tasa"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "pertsonalizatua "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "FluidSynth\nmotorra"
+msgstr ""
+"FluidSynth\n"
+"motorra"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Izena:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " MIDI informazioa "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formatua:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Luzera (mseg.):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Pista kopurua:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "aldagaia"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Denbora zat:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI iruzkinak eta letrak "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* iruzkinik ez dago erabilgarri MIDI fitxategi honetan *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* letrarik ez dago erabilgarri MIDI fitxategi honetan *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 baliogabea)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -639,7 +650,8 @@
 
 #: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "OSDa abiarazten du erreprodukzio-zerrendako sarrera bat erreproduzitzean."
+msgstr ""
+"OSDa abiarazten du erreprodukzio-zerrendako sarrera bat erreproduzitzean."
 
 #: src/aosd/aosd_trigger.c:79
 msgid "Title Change"
@@ -650,7 +662,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "OSDa abiarazten du erreproduzitzean abestiaren titulua aldatzen bada, baina fitxategi-izena berdina bada. Interneteko korronteetan tituluen izenen aldaketak bistaratzeko da batizpat erabilgarria."
+msgstr ""
+"OSDa abiarazten du erreproduzitzean abestiaren titulua aldatzen bada, baina "
+"fitxategi-izena berdina bada. Interneteko korronteetan tituluen izenen "
+"aldaketak bistaratzeko da batizpat erabilgarria."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -782,8 +797,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Konposaketako kudeatzailea ez da detektatu.\nBat exekutatzen dagoela jakin ezean, aktibatu konposaketako kudeatzalea bestela OSDak ez du ongi funtzionatuko"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Konposaketako kudeatzailea ez da detektatu.\n"
+"Bat exekutatzen dagoela jakin ezean, aktibatu konposaketako kudeatzalea "
+"bestela OSDak ez du ongi funtzionatuko"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -846,47 +865,47 @@
 msgid "Misc"
 msgstr "Hainbat"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr ""
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr ""
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr ""
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr ""
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr ""
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr ""
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr ""
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -898,231 +917,234 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Gailua"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metadatuak"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Erabili CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Erabili CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "HTTP erabili CDDBP ordez"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Bidea:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Portua:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Audio CD plugina"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Audio CDa"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Unitatea hutsik dago"
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Onartu gabeko disko mota."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Jo CDa"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Gehitu CDa"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr ""
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Konpresioa"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Bolumen zentrala:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Bitarte dinamikoa:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr ""
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Joko Kontsola Musika Deskodetzailea"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Orokorra"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Erreprodukzioa"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Baxua:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "seg"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Altua:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Abestiaren luzera lehenetsia:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Birlagintzea"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Gaitu audioa berriro lagintzea"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Birlagintze-tasa:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ezikusi egin SPCko etiketetako luzerari"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Handiagotu reverb-a"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "Abestiaren luzera lehenetsia (segundotan adierazita) luzeraren informaziorik ematen ez duten abestietan erabiltzen da (adib, pistak begiztan)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Abestiaren luzera lehenetsia (segundotan adierazita) luzeraren informaziorik "
+"ematen ez duten abestietan erabiltzen da (adib, pistak begiztan)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1132,74 +1154,76 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intentsitatea:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Ekoa"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr ""
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Berelikatzea:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Bolumena:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
@@ -1207,11 +1231,11 @@
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1221,7 +1245,7 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg plugina"
 
@@ -1303,11 +1327,13 @@
 msgid "Joint Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Estereoa"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Monoa"
 
@@ -1355,7 +1381,7 @@
 msgid "Error protection"
 msgstr "Erroreen aurkako babesa"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Kalitatea"
 
@@ -1435,19 +1461,19 @@
 msgid "Tags"
 msgstr "Etiketak"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis kodetzailearen konfigurazioa"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Kalitate maila (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1455,21 +1481,37 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "FLAC Deskodetzailea"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "GIO plugina"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
@@ -1477,500 +1519,548 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr ""
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Sarera zenbakia"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Titulua"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Urtea"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Diskoa"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Pista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr ""
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Ilara posizioa"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Iraupena"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Fitxategi bidea"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Fitxategi izena"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr ""
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
-msgstr ""
+msgstr "Bit-tasa:"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Aukeratu zutabeak"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Eskuragarri:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Aukeratua:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr ""
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Desgaitu"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
-msgstr ""
+msgstr "Ireki fitxategiak"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
-msgstr ""
+msgstr "Ireki BKU ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr ""
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr ""
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr ""
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr ""
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Hobespenak ...."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "I_rten"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
-msgstr ""
+msgstr "Erreproduzitu"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
-msgstr ""
+msgstr "Pausatu"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
-msgstr ""
+msgstr "Gelditu"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
-msgstr ""
+msgstr "Aurrekoa"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr ""
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr ""
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Pista zenbakiaren arabera"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr ""
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Pista zenbakiaren arabera"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr ""
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr ""
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr ""
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr ""
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr ""
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr ""
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
+#: src/gtkui/menus.c:236
+msgid "_Sort"
 msgstr ""
 
-#: src/gtkui/menus.c:203
-msgid "_Sort"
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Ordenatu hautatutakoak"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
 msgstr ""
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr ""
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr ""
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr ""
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr ""
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "_Ilara Kudeatzailea..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr ""
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr ""
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr ""
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr ""
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr ""
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr ""
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr ""
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr ""
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr ""
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr ""
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr ""
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr ""
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr ""
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr ""
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr ""
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr ""
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr ""
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Ilararatu/Ilaratik kendu"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr ""
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr ""
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr ""
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "GTK Interfazea"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Errorea"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "kanal %d"
 msgstr[1] "%d kanal"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Aurreko pista"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Erreproduzitu"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pausatu/jarraitu"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Gelditu"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Hurrengo pista"
+msgid "Rewind 5 seconds"
+msgstr ""
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Joan 5 segundo aurrera"
+msgid "Mute"
+msgstr "Mututu"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Joan 5 segundo atzera"
+msgid "Volume up"
+msgstr ""
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Mututu"
+msgid "Volume down"
+msgstr ""
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Igo bolumena"
+msgid "Jump to file"
+msgstr ""
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Jeitsi bolumena"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Joan fitxategira"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Erakutsi pantaila gaineko mezuak (OSD)"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+msgid "Toggle repeat"
 msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Erakutsi pantaila gaineko mezuak (OSD)"
+msgid "Toggle shuffle"
+msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Aldatu Errepikapena"
+msgid "Toggle stop after current"
+msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Aldatu Ausazkoa"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Saguaren botoi nagusia eraldatzailerik gabe lotzea ez da gomendatzen.\n\nJarraitzea nahi duzu?"
+msgstr ""
+"Saguaren botoi nagusia eraldatzailerik gabe lotzea ez da gomendatzen.\n"
+"\n"
+"Jarraitzea nahi duzu?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Saguaren botoiak lotzea"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Laster-tekla globalen pluginaren konfigurazioa"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Sakatu tekla konbinazioa testu-eremuaren barruan.\nSaguaren botoiak ere lotu ditzakezu."
+msgstr ""
+"Sakatu tekla konbinazioa testu-eremuaren barruan.\n"
+"Saguaren botoiak ere lotu ditzakezu."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Laster-teklak"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Ekintza:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Tekla-konbinazioa:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1985,11 +2075,11 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
@@ -1997,62 +2087,67 @@
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr ""
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s Ezarpenak"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "LADSPA Ostalari Ezarpenak"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Modulo bideak:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Banatu bide ezberdinak bi puntu bidez ( : ).\nLADSPA_PATH bidean eta bide hauetan bilatuko da.\nBide berria gehitu eta gero, sakatu Enter Plugin berriak bilatzeko."
+msgstr ""
+"Banatu bide ezberdinak bi puntu bidez ( : ).\n"
+"LADSPA_PATH bidean eta bide hauetan bilatuko da.\n"
+"Bide berria gehitu eta gero, sakatu Enter Plugin berriak bilatzeko."
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Plugin eskuragarriak:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Gaitu"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Gaitutako pluginak:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr ""
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr ""
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2060,27 +2155,27 @@
 "%s: how to create a proper config file\n"
 msgstr ""
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr ""
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr ""
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr ""
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr ""
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2096,67 +2191,67 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr ""
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Berkonektatu LIRC zerbitzarira"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Itxaron berkonektatu aurretik:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "LIRC plugina"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki plugina"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "M3U Erreprodukzio-zerrendak"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Ukimen sortzailea: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Ukimen sortzailea: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2165,84 +2260,218 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr ""
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Irteera kanalak:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "MMS Plugina"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "MPG123 plugina"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr ""
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS plugina"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Geldituta"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious ez da jotzen ari."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr ""
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pausatu"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Hurrengoa"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr ""
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Soinu-gailua:"
 
@@ -2267,22 +2496,23 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr ""
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 Deskodetzailea"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2302,160 +2532,200 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr ""
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr ""
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr ""
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr ""
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr ""
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr ""
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr ""
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
 msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Zerbitzuak"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
 msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Erabiltzaile-izena:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Pasahitza:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr ""
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr ""
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Artista ezezaguna"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Disko ezezaguna"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
 msgstr ""
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d album"
 msgstr[1] "%d albums"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2466,7 +2736,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2477,73 +2747,73 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr ""
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr ""
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr ""
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr ""
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr ""
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr ""
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Erreproduzitzailea:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Hautatu erreproduzitzaile nagusiaren leihoko letra-tipoa:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Erreprodukzio-zerrenda:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Hautatu erreprodukzio-zerrendaren letra-tipoa:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Letra-tipoak"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Azala"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Interfazearen Hobespenak"
 
@@ -2599,7 +2869,7 @@
 msgid "Presets"
 msgstr "Aurrezarpenak"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Kargatu aurrezarpena"
 
@@ -2612,7 +2882,7 @@
 msgid "Load equalizer preset"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Gorde aurrezarpenak"
 
@@ -2624,7 +2894,7 @@
 msgid "Save equalizer preset"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Ezabatu aurrezarpena"
 
@@ -2632,739 +2902,765 @@
 msgid "Delete auto-preset"
 msgstr ""
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Bilatu %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Bolumena: %% %d"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balantzea: %% %d ezkerrean"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Balantzea: erdian"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balantzea: %% %d eskuinean"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Aukeren menua"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Desgaitu 'Beti gainean'"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Gaitu 'Beti gainean'"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Fitxategi-informazioaren koadroa"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Bisualizazioaren menua"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Single modua."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Erreprodukzio-zerrenda modua."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Kantuaren ostean geldituko da."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Ez da kantuaren ostean geldituko."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr ""
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Gelditu uneko abestiaren ondoren"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Erpinak"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Errepikatu"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Ausazkoa"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Erreprodukzio-zerrenda aurreraturik ez"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Erakutsi erreproduzitzailea"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Erakutsi erreprodukzio-zerrendaren editorea"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Erakutsi ekualizadorea"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Beti gainean"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Jarri laneko area guztietan"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Bildu erreproduzitzailea"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Bildu erreprodukzio-zerrendaren editorea"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Bildu ekualizadorea"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analizatzailea"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Esparrua"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Ahotsmarka"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Itzalita"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normala"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Sua"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Marra bertikalak"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Marrak"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Barrak"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Puntu esparrua"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Marra esparrua"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Esparru soila"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Izotza"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Leuna"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Motelena"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Motela"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Tartekoa"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Azkarra"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Azkarrena"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Igarotako denbora"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Geratzen den denbora"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pausatu"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Hurrengoa"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Bisualizazioa"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Bisualizazio modua"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Analizatzaile modua"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Esparru modua"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Ahotsmarkaren modua"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "LeihoItzaldura VU modua"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Analizatzailearen erortzea"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Erpinen erortzea"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Erreprodukzio-zerrenda"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Erreprodukzio-zerrenda berria"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Hautatu hurrengo erreprodukzio-zerrenda"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Hautatu aurreko erreprodukzio-zerrenda"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Ezabatu erreprodukzio-zerrenda"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Inportatu erreprodukzio-zerrenda"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
-msgstr "Erreprodukzio-zerrendaren fitxategia kargatzen du hautatutako erreprodukzio-zerrendan."
+msgstr ""
+"Erreprodukzio-zerrendaren fitxategia kargatzen du hautatutako erreprodukzio-"
+"zerrendan."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Esportatu erreprodukzio-zerrenda"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Hautatutako erreprodukzio-zerrenda gordetzen du"
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Freskatu zerrenda"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Erreprodukzio-zerrendako sarrera bati esleituta dagoen metadatuak freskatzen ditu."
+msgstr ""
+"Erreprodukzio-zerrendako sarrera bati esleituta dagoen metadatuak freskatzen "
+"ditu."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Erreprodukzio-zerrenda kudeatzailea"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Ilara kudeatzailea"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Ikusi"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Interfazea"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Intefazearen Hobespenak ...."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Gehitu interneteko helbidea..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Gehitu urruneko pista erreprodukzio-zerrendari."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Gehitu fitxategiak..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Gehitu fitxategiak erreprodukzio-zerrendari."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Bilatu eta hautatu"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Erreprodukzio-zerrendan bilatzen du eta irizpide zehatz batzuetan oinarritutako erreprodukzio-zerrendako sarrerak hautatzen ditu."
+msgstr ""
+"Erreprodukzio-zerrendan bilatzen du eta irizpide zehatz batzuetan "
+"oinarritutako erreprodukzio-zerrendako sarrerak hautatzen ditu."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Alderantzikatu hautapena"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Hautatutako edo hautatu gabeko sarrerak alderantzikatzen ditu."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Hautatu denak"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Hautatu erreprodukzio-zerrendako sarrera guztiak."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Ez hautatu ezer"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Erreprodukzio-zerrendako sarrera guztiak desautatzen ditu."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Kendu guztiak"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Sarrera guztiak kentzen ditu erreprodukzio-zerrendatik"
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Garbitu ilara"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Erreprodukzio-zerrendarekin esleitutako ilara garbitzen du."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Kendu fitxategi erabilkaitzak"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
-msgstr "Erabilgarri ez dauden fitxategiak kentzen ditu erreprodukzio-zerrendatik."
+msgstr ""
+"Erabilgarri ez dauden fitxategiak kentzen ditu erreprodukzio-zerrendatik."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Kendu bikoiztuak"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Tituluaren arabera"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
-msgstr "Tituluaren arabera bikoiztutako sarrerak kentzen ditu erreprodukzio-zerrendatik."
+msgstr ""
+"Tituluaren arabera bikoiztutako sarrerak kentzen ditu erreprodukzio-"
+"zerrendatik."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Fitxategi-izenaren arabera"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Fitxategi-izenaren arabera bikoiztutako sarrerak kenten ditu erreprodukzio-zerrendatik."
+msgstr ""
+"Fitxategi-izenaren arabera bikoiztutako sarrerak kenten ditu erreprodukzio-"
+"zerrendatik."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Bide-izenaren arabera"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Bide-izen osoaren arabera bikoiztutako sarrerak kentzen ditu erreprodukzio-zerrendatik."
+msgstr ""
+"Bide-izen osoaren arabera bikoiztutako sarrerak kentzen ditu erreprodukzio-"
+"zerrendatik."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Kendu desautatutakoak"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Desautatutako sarrerak kentzen ditu erreprodukzio-zerrendatik."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Kendu hautatutakoak"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Hautatutako sarrerak kentzen ditu erreprodukzio-zerrendatik."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Nahastu ausaz zerrenda"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Nahastu ausaz erreprodukzio-zerrenda"
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Alderantzikatu zerrenda"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Alderantzikatu erreprodukzio-zerrenda."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Ordenatu zerrenda"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Tituluaren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Diskoaren arabera"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Ordenatu zerrenda diskoaren arabera"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Artistaren arabera"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Artistaren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Fitxategi-izenaren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Bide-izen osoaren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Dataren arabera"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Eraldatze-dataren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Pista zenbakiaren arabera"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Pista zenbakiaren arabera ordenatzen du zerrenda."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Ordenatu hautatutakoak"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Fitxategia"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Pluginen zerbitzuak"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Ikusi pistaren xehetasunak"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Ikusi pistaren xehetasunak"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Audacious-i buruz"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Erreproduzitu fitxategia"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Kargatu eta erreproduzitu fitxategi bat"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Erreproduzitu kokalekua"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Erreproduzitu multimedia hautatutako kokalekutik"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Pluginen zerbitzuak"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Ireki hobespenen leihoa"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Irten Audacious-etik"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Ezarri A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Garbitu A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Joan fitxategira"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Jauzi denborara"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Txandakatu ilara"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Erreprodukzio-zerrendako ilarako sarrerak gaitzen/desgaitzen ditu."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Moztu"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Kargatu"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Inportatu"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Gorde"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Aurrezarpena"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Autokargaren aurrezarpena"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Kargatu autokargaren aurrezarpenak"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Kargatu aurrezarpen lehenetsia ekualizadorean"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Zero"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Ezarri ekualizadorearen aurrezarpenen maila zerorekin"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Fitxategitik"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Kargatu aurrezarpenak fitxategitik"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "WinAMP EQF fitxategitik"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Kargatu aurrezarpenak WinAMP EQF fitxategitik"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP aurrezarpenak"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Inportatu WinAMP aurrezarpenak"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Gorde autokargaren aurrezarpenak"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Gorde aurrezarpen lehenetsia"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Fitxategian"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Gorde aurrezarpena fitxategian"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "WinAMP EQF fitxategian"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Gorde aurrezarpena WinAMP EQF fitxategian"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Ezabatu autokargaren aurrezarpenak"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Bilatu sarrerak erreprodukzio-zerrenda aktiboan"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Hautatu sarrerak erreprodukzio-zerrendan eremu bat edo gehiago betez. Eremuek adierazpen erregularrak erabiltzen dituzte, maiuskulak eta minuskulak ez bereiztuz. Ez badakizu adierazpen erregularrak nola ibiltzen diren, sartu bilatzea nahi duzunaren zati literal bat."
+msgstr ""
+"Hautatu sarrerak erreprodukzio-zerrendan eremu bat edo gehiago betez. "
+"Eremuek adierazpen erregularrak erabiltzen dituzte, maiuskulak eta "
+"minuskulak ez bereiztuz. Ez badakizu adierazpen erregularrak nola ibiltzen "
+"diren, sartu bilatzea nahi duzunaren zati literal bat."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Izenburua: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Diskoa: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Fitxategi-izena: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Garbitu aurreko hautapena bilatu aurretik"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Txandakatu automatikoki ilara bat datozen sarrerentzako"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Sortu erreprodukzio-zerrenda berria bat datozen sarrerekin"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Audacious erreprodukzio-zerrendaren editorea"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr ""
@@ -3382,81 +3678,107 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Ezin izan da direktorioa (%s) sortu: %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Sndfile plugina"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Sndio irteera pluginari buruz"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Sndio irteera plugina\n\nThomas Pfaff-ek idatzia <tpfaff@tp76.info>\n"
+msgstr ""
+"Sndio irteera plugina\n"
+"\n"
+"Thomas Pfaff-ek idatzia <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Onartu gabeko formatua"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Audio gailuak onartzen ez duen formatua eskatu da.\n\nMesedez berriro saiatu sndiod(1) zerbitzaria martxan dela"
+msgstr ""
+"Audio gailuak onartzen ez duen formatua eskatu da.\n"
+"\n"
+"Mesedez berriro saiatu sndiod(1) zerbitzaria martxan dela"
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "sndio gailua"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(hutsik badago: lehenetsia)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Ados"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Utzi"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr ""
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Exekutatuko den komandoa audacious-ek abesti berria hastean."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Komandoa:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Exekutatuko den komandoa abestiaren amaierantz joatean."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Exekutatuko den komandoa Audacious erreprodukzio-zerrendaren amaierara iristean."
+msgstr ""
+"Exekutatuko den komandoa Audacious erreprodukzio-zerrendaren amaierara "
+"iristean."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Exekutatuko den komandoa abesti baten titulua aldatzean (adib. sareko korronteen tituluak)."
+msgstr ""
+"Exekutatuko den komandoa abesti baten titulua aldatzean (adib. sareko "
+"korronteen tituluak)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3473,35 +3795,85 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Hurrengo formatu kateak erabili ditzazkezu \neta komandoa deitu aurretik ordezaktuko dira\n(Denak ez dira erabilgarriak erreproduzkio-zerrenda bukaerako komanoan):\n\n%F: Frekuentzia (hertziotan)\n%c: Kanal kopurua\n%f: Fitxategi izena (bide osoa)\n%l: Iraupena (milisegunduetan)\n%n edo %s: Kantuaren izena\n%r:Bitartea (bit segunduko\n%t: Erreprodukzio-zerrendan posizioa (%02d)\n%p: Jotzen ari da (1 edo 0)\n%a: Artista\n%b: Diskoa\n%T: Pista izena"
-
-#: src/song_change/song_change.c:489
+msgstr ""
+"Hurrengo formatu kateak erabili ditzazkezu \n"
+"eta komandoa deitu aurretik ordezaktuko dira\n"
+"(Denak ez dira erabilgarriak erreproduzkio-zerrenda bukaerako komanoan):\n"
+"\n"
+"%F: Frekuentzia (hertziotan)\n"
+"%c: Kanal kopurua\n"
+"%f: Fitxategi izena (bide osoa)\n"
+"%l: Iraupena (milisegunduetan)\n"
+"%n edo %s: Kantuaren izena\n"
+"%r:Bitartea (bit segunduko\n"
+"%t: Erreprodukzio-zerrendan posizioa (%02d)\n"
+"%p: Jotzen ari da (1 edo 0)\n"
+"%a: Artista\n"
+"%b: Diskoa\n"
+"%T: Pista izena"
+
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Shell-ari emandako parametroak komatxoen artean kapsulatu behar dira. Bestela segurtasunezko arriskua izan daiteke."
+msgstr ""
+"Shell-ari emandako parametroak komatxoen artean kapsulatu "
+"behar dira. Bestela segurtasunezko arriskua izan daiteke."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Komandoak"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Abiadura eta Tonoa"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Abiadura:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Tonoa:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Abiadura eta Tonoa"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3512,63 +3884,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Aldatu bolumena"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Aldatu erreprodukzioaren abestia"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Bestelako Ezarpenak"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr ""
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Tonu-sortzailea: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3577,11 +3949,11 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr ""
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -3589,15 +3961,15 @@
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr ""
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3618,44 +3990,47 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis Deskodetzailea"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "VTX Deskodetzailea"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "WavPack Deskodetzailea"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "2SF Deskodetzailea"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - hautatu fitxategia"

audacious-plugins-3.4.2.tar.bz2/po/fi.po Added

@@ -0,0 +1,4304 @@
+# Finnish translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Jaergenoth <jstuomisto@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-04 12:38+0000\n"
+"Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
+"Language-Team: Finnish (http://www.transifex.com/projects/p/audacious/"
+"language/fi/)\n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
+msgid "mono"
+msgstr "mono"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
+msgid "stereo"
+msgstr "stereo"
+
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
+msgid "surround"
+msgstr "surround"
+
+#: src/aac/libmp4.c:930
+msgid "AAC Decoder"
+msgstr "AAC-dekooderi"
+
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
+msgid "sequenced"
+msgstr "sarjoitettu"
+
+#: src/adplug/plugin.c:14
+msgid "AdPlug (AdLib Player)"
+msgstr "AdPlug (AdLib-soitin)"
+
+#: src/alarm/alarm.c:809
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr ""
+"Liitännäinen jolla voidaan aloittaa toistaminen tietyllä ajan hetkellä.\n"
+"\n"
+"Alkuperäiset kehittäjät Adam Feakin ja Daniel Stodden."
+
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
+msgid "Alarm"
+msgstr "Herätyskello"
+
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Aika\n"
+" Kellonaika:\n"
+" Millon herätyskello soi.\n"
+"\n"
+" Hiljennä, kun kulunut:\n"
+" Hiljennä herätyskello tämän ajan kuluttua.\n"
+" (jos herätys-ikkunaa ei ole suljettu)\n"
+"\n"
+"\n"
+"Päivät\n"
+" Päivä:\n"
+" Valitse päivät jolloin herätyskello on aktiivinen.\n"
+"\n"
+" Aika:\n"
+" Valitse jokaiselle päivälle herätysaika erikseen,\n"
+" tai valitse käytettäväksi oletus herätysaikaa.\n"
+"\n"
+"\n"
+
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Äänenvoimakkuus\n"
+" Häivytys:\n"
+" Häivytä sisään tämän ajan kuluessa.\n"
+"\n"
+" Aloita:\n"
+" Aloita häivytys tästä äänenvoimakkuudesta\n"
+"\n"
+" Lopullinen:\n"
+" Lopullinen äänenvoimakkuus.\n"
+" Jos aika on asetettu nollaksi, asetetaan tämä \n"
+" äänenvoimakkuus ja aloitetaan toistaminen.\n"
+"\n"
+"\n"
+"Asetukset:\n"
+" Lisäkomento:\n"
+" Suoritetaan tämä komento kun hälytys alkaa.\n"
+"\n"
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+" Soittolista:\n"
+" Lataa tämä soittolista. Jos soittolistaa\n"
+" ei anneta, käytetään nykyistä.\n"
+" URL mp3- tai ogg-virralle voidaan\n"
+" myös syöttää tähän.\n"
+"\n"
+" Muistutus:\n"
+" Näytä muistutus kun hälytys alkaa.\n"
+" Kirjoita muistutus laatikkoon ja kytke\n"
+" se päälle, jos haluat muistutuksen näkyvän."
+
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Herätys!"
+
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Muistutuksesi tälle päivälle on..."
+
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Muistutus"
+
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Maanantai"
+
+#: src/alarm/interface.c:140
+msgid "Tuesday"
+msgstr "Tiistai"
+
+#: src/alarm/interface.c:140
+msgid "Wednesday"
+msgstr "Keskiviikko"
+
+#: src/alarm/interface.c:141
+msgid "Thursday"
+msgstr "Torstai"
+
+#: src/alarm/interface.c:141
+msgid "Friday"
+msgstr "Perjantai"
+
+#: src/alarm/interface.c:141
+msgid "Saturday"
+msgstr "Lauantai"
+
+#: src/alarm/interface.c:141
+msgid "Sunday"
+msgstr "Sunnuntai"
+
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Herätyskellon asetukset"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Aika"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Kellonaika (oletus):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Hiljennä, kun aikaa kulunut:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "tunnit"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minuutit"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Valitse päivät jolloin herätyskello on aktiivinen"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Päivä"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Oletus"
+
+#: src/alarm/interface.c:310
+msgid "Days"
+msgstr "Päivät"
+
+#: src/alarm/interface.c:319
+msgid "Fading"
+msgstr "Häivytys"
+
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
+msgid "seconds"
+msgstr "sekuntia"
+
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
+msgid "Volume"
+msgstr "Äänenvoimakkuus"
+
+#: src/alarm/interface.c:339
+msgid "Start at"
+msgstr "Aloita"
+
+#: src/alarm/interface.c:357
+msgid "Final"
+msgstr "Lopullinen"
+
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Nykyinen"
+
+#: src/alarm/interface.c:387
+msgid "Additional Command"
+msgstr "Lisäkomento"
+
+#: src/alarm/interface.c:393
+msgid "enable"
+msgstr "käytä"
+
+#: src/alarm/interface.c:400
+msgid "Playlist (optional)"
+msgstr "Soittolista (valinnainen)"
+
+#: src/alarm/interface.c:407
+msgid "Select a playlist"
+msgstr "Valitse soittolista"
+
+#: src/alarm/interface.c:419
+msgid "Use reminder"
+msgstr "Käytä muistutusta"
+
+#: src/alarm/interface.c:428
+msgid "Options"
+msgstr "Asetukset"
+
+#: src/alarm/interface.c:433
+msgid "What do these options mean?"
+msgstr "Mitä nämä asetukset tarkoittavat?"
+
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
+msgid "Help"
+msgstr "Ohje"
+
+#: src/albumart/albumart.c:143
+msgid "Album Art"
+msgstr "Levynkansitaide"
+
+#: src/alsa/config.c:212
+msgid "Default PCM device"
+msgstr "Oletus PCM-laite"
+
+#: src/alsa/config.c:241
+msgid "Default mixer device"
+msgstr "Oletus miksauslaite"
+
+#: src/alsa/config.c:428
+msgid "ALSA Output Plugin Preferences"
+msgstr "ALSA-lähdön asetukset"
+
+#: src/alsa/config.c:434
+msgid "PCM device:"
+msgstr "PCM-laite:"
+
+#: src/alsa/config.c:436
+msgid "Mixer device:"
+msgstr "Miksauslaite:"
+
+#: src/alsa/config.c:438
+msgid "Mixer element:"
+msgstr "Miksauskanava:"
+
+#: src/alsa/config.c:441
+msgid "Work around drain hangup"
+msgstr "Korjaa \"drain hangup\""
+
+#: src/alsa/plugin.c:25
+msgid ""
+"ALSA Output Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"ALSA-lähdön liitännäinen Audacioukselle.\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"Kiitokseni William Pitcock:lle (ALSA Output Plugin NG:n kehittäjä), jonka "
+"koodi toimi referenssinä silloin, kun ALSA:n manuaali ei riittänyt."
+
+#: src/alsa/plugin.c:32
+msgid "ALSA Output"
+msgstr "ALSA-lähtö"
+
+#: src/amidi-plug/amidi-plug.c:248
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr ""
+"Et ole valinnut yhtään sekvensseriporttia MIDI-toistolle. Voit tehdä sen "
+"MIDI-liitännäisen asetuksista."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-liitännäinen (MIDI-soitin)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
+msgid "ALSA Backend "
+msgstr "ALSA-taustajärjestelmä"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"Tämä taustajärjestelmä lähettää MIDI-tapahtumia käyttäjän valitsemalle "
+"ryhmälle ALSA-sekvensseriportteja. ALSA-sekvensseri tarjoaa portteja "
+"äänikorttien syntetisaattoreille (esim. emu10k1), "
+"ohjelmistosyntetisaattoreille, ulkoisille laitteille, jne. \n"
+"Taustajärjestelmä ei tuota ääntä, vaan MIDI-tapahtumat käsitellään suoraan "
+"laitteistossa tai ohjelmassa. Esimerkiksi laitteistosyntetisaattorille "
+"lähetetyt MIDI-tapahtumat toistetaan suoraan.\n"
+"Luonut Giacomo Lozito."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
+msgid "FluidSynth Backend "
+msgstr "FluidSynth-taustajärjestelmä"
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"Tämä taustajärjestelmä tuottaa ääntä lähettämällä MIDI-tapahtumia "
+"FluidSynthille, reaaliaikaiselle ohjelmistosyntetisaattorille, joka perustuu "
+"SoundFont2 -spesifikaatiolle (www.fluidsynth.org).\n"
+"Tuotettua ääntä voidaan muokata soittimen tehosteliitännäisillä, mikä "
+"lopuksi prosessoidaan valitulla äänilähdön liitännäisellä.\n"
+"Luonut Giacomo Lozito."
+
+#: src/amidi-plug/i_configure-alsa.c:353
+msgid "Port"
+msgstr "Portti"
+
+#: src/amidi-plug/i_configure-alsa.c:355
+msgid "Client name"
+msgstr "Asiakasohjelman nimi"
+
+#: src/amidi-plug/i_configure-alsa.c:357
+msgid "Port name"
+msgstr "Portin nimi"
+
+#: src/amidi-plug/i_configure-alsa.c:371
+msgid "ALSA output ports"
+msgstr "ALSA-lähdön portit"
+
+#: src/amidi-plug/i_configure-alsa.c:432
+msgid "Soundcard: "
+msgstr "Äänikortti:"
+
+#: src/amidi-plug/i_configure-alsa.c:434
+msgid "Mixer control: "
+msgstr "Miksauskanava:"
+
+#: src/amidi-plug/i_configure-alsa.c:444
+msgid "Mixer settings"
+msgstr "Miksausasetukset"
+
+#: src/amidi-plug/i_configure-alsa.c:472
+msgid ""
+"ALSA\n"
+"backend"
+msgstr ""
+"ALSA-\n"
+"taustajärjestelmä"
+
+#: src/amidi-plug/i_configure-ap.c:63
+msgid "AMIDI-Plug - backend information"
+msgstr "AMIDI-liitännäinen - taustajärjestelmän tiedot"
+
+#: src/amidi-plug/i_configure-ap.c:221
+msgid "Backend selection"
+msgstr "Taustajärjestelmän valinta"
+
+#: src/amidi-plug/i_configure-ap.c:261
+msgid "Playback settings"
+msgstr "Toiston asetukset"
+
+#: src/amidi-plug/i_configure-ap.c:266
+msgid "Transpose: "
+msgstr "Transponointi:"
+
+#: src/amidi-plug/i_configure-ap.c:275
+msgid "Drum shift: "
+msgstr "Rummun siirto:"
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "Advanced settings"
+msgstr "Edistyneet asetukset"
+
+#: src/amidi-plug/i_configure-ap.c:297
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "laske soittolistan MIDI-tiedostojen kesto"
+
+#: src/amidi-plug/i_configure-ap.c:304
+msgid "extract comments from MIDI file (if available)"
+msgstr "poimi kommentit MIDI-tiedostosta (jos saatavilla)"
+
+#: src/amidi-plug/i_configure-ap.c:311
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "poimi lyriikat MIDI-tiedostosta (jos saatavilla)"
+
+#: src/amidi-plug/i_configure-ap.c:344
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr ""
+"AMIDI-\n"
+"liitännäinen"
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug Settings"
+msgstr "AMIDI-liitännäisen asetukset"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:63
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-liitännäinen - valitse SoundFont-tiedosto"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:321
+msgid "SoundFont settings"
+msgstr "SoundFont-asetukset"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:359
+msgid "Filename"
+msgstr "Tiedostonimi"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:363
+msgid "Size (bytes)"
+msgstr "Koko (tavuina)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:412
+msgid "Load SF on player start"
+msgstr "Lataa SF kun soitin käynnistetään"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:416
+msgid "Load SF on first MIDI file play"
+msgstr "Lataa SF kun ensimmäinen MIDI-tiedosto toistetaan"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:431
+msgid "Synthesizer settings"
+msgstr "Syntetisaattorin asetukset"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:440
+msgid "gain"
+msgstr "vahvistus"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
+msgid "use default"
+msgstr "käytä oletusta"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
+msgid "value:"
+msgstr "arvo:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:470
+msgid "polyphony"
+msgstr "polyfonia"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:500
+msgid "reverb"
+msgstr "kaikuefekti"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
+msgid "yes"
+msgstr "kyllä"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
+msgid "no"
+msgstr "ei"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:534
+msgid "chorus"
+msgstr "kuoroefekti"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "sample rate"
+msgstr "näytteenottotaajuus"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:574
+msgid "22050 Hz "
+msgstr "22050 Hz"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:577
+msgid "44100 Hz "
+msgstr "44100 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:580
+msgid "96000 Hz "
+msgstr "96000 Hz"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:583
+msgid "custom "
+msgstr "mukautettu"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:592
+msgid "Hz "
+msgstr "Hz"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:662
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr ""
+"FluidSynth-\n"
+"taustajärjestelmä"
+
+#: src/amidi-plug/i_fileinfo.c:175
+msgid "Name:"
+msgstr "Nimi:"
+
+#: src/amidi-plug/i_fileinfo.c:200
+msgid " MIDI Info "
+msgstr " MIDI-tiedot "
+
+#: src/amidi-plug/i_fileinfo.c:214
+msgid "Format:"
+msgstr "Formaatti:"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "Length (msec):"
+msgstr "Kesto (ms):"
+
+#: src/amidi-plug/i_fileinfo.c:220
+msgid "No. of Tracks:"
+msgstr "Raitojen lukumäärä:"
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "variable"
+msgstr "muuttuja"
+
+#: src/amidi-plug/i_fileinfo.c:228
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidi-plug/i_fileinfo.c:236
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidi-plug/i_fileinfo.c:239
+msgid "Time Div:"
+msgstr "Aikajako:"
+
+#: src/amidi-plug/i_fileinfo.c:250
+msgid " MIDI Comments and Lyrics "
+msgstr " MIDI-kommentit ja -lyriikat "
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no comments available in this MIDI file *"
+msgstr "* MIDI-tiedostossa ei ollut kommentteja *"
+
+#: src/amidi-plug/i_fileinfo.c:314
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* MIDI-tiedostossa ei ollut lyriikoita *"
+
+#: src/amidi-plug/i_fileinfo.c:367
+msgid " (invalid UTF-8)"
+msgstr " (virheellinen UTF-8)"
+
+#: src/amidi-plug/i_utils.c:39
+msgid "About AMIDI-Plug"
+msgstr "Tietoja AMIDI-liitännäisestä"
+
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr ""
+
+#: src/amidi-plug/i_utils.c:54
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing"
+msgstr ""
+"\n"
+"modulaarinen MIDI-soitin\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"Luonut Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"Erityiskiitokset...\n"
+"\n"
+"Clemens Ladisch ja Jaroslav Kysela\n"
+"aplaymidi ja amixer olivat erittäin hyödyllisiä, \n"
+"alsa-lib dokumentaation ohella. Ne auttoivat\n"
+"oppimaan lisää ALSA:n ohjelmointirajapinnasta.\n"
+"\n"
+"Alfredo Spadafina\n"
+"hienosta MIDI-näppäimistö logosta\n"
+"\n"
+"Tony Vroon\n"
+"avusta alpha-testauksessa"
+
+#: src/aosd/aosd.c:29
+msgid "Audacious OSD "
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd.c:37
+msgid "AOSD (On-Screen Display)"
+msgstr "AOSD (On-Screen Display)"
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "Suorakulmio"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "Pyöristetty suorakulmio"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "Kovera suorakulmio"
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "Ei mitään"
+
+#: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "Toiston aloitus"
+
+#: src/aosd/aosd_trigger.c:75
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Näyttää OSD:n kun kappaleen toisto alkaa."
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Title Change"
+msgstr "Nimen muutos"
+
+#: src/aosd/aosd_trigger.c:80
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr ""
+"Näyttää OSD:n kun kappaleen nimi muuttuu toiston aikana, mutta tiedostonimi "
+"pysyy samana. Hyödyllinen lähinnä internet-virroille."
+
+#: src/aosd/aosd_trigger.c:86
+msgid "Pause On"
+msgstr "Keskeytys"
+
+#: src/aosd/aosd_trigger.c:87
+msgid "Triggers OSD when playback is paused."
+msgstr "Näyttää OSD:n kun toisto keskeytetään."
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Pause Off"
+msgstr "Toisto jatkuu"
+
+#: src/aosd/aosd_trigger.c:92
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Näyttää OSD:n kun toisto jatkuu."
+
+#: src/aosd/aosd_ui.c:168
+msgid "Placement"
+msgstr "Sijoitus"
+
+#: src/aosd/aosd_ui.c:200
+msgid "Relative X offset:"
+msgstr "Suhteellinen X:n poikkeama:"
+
+#: src/aosd/aosd_ui.c:207
+msgid "Relative Y offset:"
+msgstr "Suhteellinen Y:n poikkeama:"
+
+#: src/aosd/aosd_ui.c:214
+msgid "Max OSD width:"
+msgstr "OSD:n maksimileveys:"
+
+#: src/aosd/aosd_ui.c:225
+msgid "Multi-Monitor options"
+msgstr "Monen näytön asetukset"
+
+#: src/aosd/aosd_ui.c:229
+msgid "Display OSD using:"
+msgstr "Näytä OSD käyttäen:"
+
+#: src/aosd/aosd_ui.c:231
+msgid "all monitors"
+msgstr "kaikki näytöt"
+
+#: src/aosd/aosd_ui.c:234
+#, c-format
+msgid "monitor %i"
+msgstr "näyttö %i"
+
+#: src/aosd/aosd_ui.c:287
+msgid "Timing (ms)"
+msgstr "Ajoitus (ms)"
+
+#: src/aosd/aosd_ui.c:292
+msgid "Display:"
+msgstr "Näytä:"
+
+#: src/aosd/aosd_ui.c:297
+msgid "Fade in:"
+msgstr "Häivytä sisään:"
+
+#: src/aosd/aosd_ui.c:302
+msgid "Fade out:"
+msgstr "Häivytä ulos:"
+
+#: src/aosd/aosd_ui.c:383
+msgid "Fonts"
+msgstr "Kirjasimet"
+
+#: src/aosd/aosd_ui.c:391
+#, c-format
+msgid "Font %i:"
+msgstr "Kirjasin %i:"
+
+#: src/aosd/aosd_ui.c:409
+msgid "Shadow"
+msgstr "Varjo"
+
+#: src/aosd/aosd_ui.c:439
+msgid "Internationalization"
+msgstr "Kansainvälistys"
+
+#: src/aosd/aosd_ui.c:445
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "Poista käytöstä tekstin muutos UTF-8:ksi (aosd)"
+
+#: src/aosd/aosd_ui.c:462
+msgid "Select Skin File"
+msgstr "Valitse skinitiedosto"
+
+#: src/aosd/aosd_ui.c:573
+msgid "Render Style"
+msgstr "Esitystyyli"
+
+#: src/aosd/aosd_ui.c:589
+msgid "Colors"
+msgstr "Värit"
+
+#: src/aosd/aosd_ui.c:602
+#, c-format
+msgid "Color %i:"
+msgstr "Väri %i:"
+
+#: src/aosd/aosd_ui.c:620
+msgid "Custom Skin"
+msgstr "Mukautettu skini"
+
+#: src/aosd/aosd_ui.c:626
+msgid "Skin file:"
+msgstr "Skinitiedosto:"
+
+#: src/aosd/aosd_ui.c:630
+msgid "Browse"
+msgstr "Selaa"
+
+#: src/aosd/aosd_ui.c:729
+msgid "Enable trigger"
+msgstr "Käytä liipaisinta"
+
+#: src/aosd/aosd_ui.c:756
+msgid "Event"
+msgstr "Tapahtuma"
+
+#: src/aosd/aosd_ui.c:784
+msgid "Composite manager detected"
+msgstr "Komposointimanageri havaittu"
+
+#: src/aosd/aosd_ui.c:791
+msgid ""
+"Composite manager not detected;\n"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Komposointimanageria ei havaittu.\n"
+"Jos komposointimanageri ei ole vielä päällä, aktivoi se tai muutoin OSD ei "
+"toimi kunnolla."
+
+#: src/aosd/aosd_ui.c:799
+msgid "Composite manager not required for fake transparency"
+msgstr "Komposointimanageria ei tarvita jäljiteltyyn läpinäkyvyyteen"
+
+#: src/aosd/aosd_ui.c:837
+msgid "Transparency"
+msgstr "Läpinäkyvyys"
+
+#: src/aosd/aosd_ui.c:843
+msgid "Fake transparency"
+msgstr "Jäljitelty läpinäkyvyys"
+
+#: src/aosd/aosd_ui.c:845
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Oikea läpinäkyvyys (vaatii X:n komposointilaajennuksen)"
+
+#: src/aosd/aosd_ui.c:887
+msgid "Composite extension not loaded"
+msgstr "Komposointilaajennusta ei ole ladattu"
+
+#: src/aosd/aosd_ui.c:895
+msgid "Composite extension not available"
+msgstr "Komposointilaajennus ei ole saatavilla"
+
+#: src/aosd/aosd_ui.c:914
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd_ui.c:995
+msgid "Audacious OSD - configuration"
+msgstr "Audacious OSD - asetukset"
+
+#: src/aosd/aosd_ui.c:1016
+msgid "Test"
+msgstr "Testaa"
+
+#: src/aosd/aosd_ui.c:1031
+msgid "Position"
+msgstr "Sijainti"
+
+#: src/aosd/aosd_ui.c:1036
+msgid "Animation"
+msgstr "Animaatio"
+
+#: src/aosd/aosd_ui.c:1041
+msgid "Text"
+msgstr "Teksti"
+
+#: src/aosd/aosd_ui.c:1046
+msgid "Decoration"
+msgstr "Koristeet"
+
+#: src/aosd/aosd_ui.c:1051
+msgid "Trigger"
+msgstr "Liipaisin"
+
+#: src/aosd/aosd_ui.c:1056
+msgid "Misc"
+msgstr "Muut"
+
+#: src/asx/asx.c:96
+msgid "ASXv1/ASXv2 Playlists"
+msgstr "ASXv1/ASXv2 -soittolistat"
+
+#: src/audpl/audpl.c:222
+msgid "Audacious Playlists (audpl)"
+msgstr "Audacious -soittolistat (audpl)"
+
+#: src/blur_scope/blur_scope.c:47
+msgid "Color"
+msgstr "Väri"
+
+#: src/blur_scope/blur_scope.c:56
+msgid "Blur Scope"
+msgstr "Blur Scope"
+
+#: src/bs2b/plugin.c:136
+msgid "Bauer Stereophonic-to-Binaural Preferences"
+msgstr "Bauer Stereophonic-to-Binaural -asetukset"
+
+#: src/bs2b/plugin.c:147
+msgid "Feed level:"
+msgstr "Syöttötaso:"
+
+#: src/bs2b/plugin.c:161
+msgid "Cut frequency:"
+msgstr "Leikkaustaajuus:"
+
+#: src/bs2b/plugin.c:175
+msgid "Presets:"
+msgstr "Esiasetukset:"
+
+#: src/bs2b/plugin.c:197
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
+
+#: src/cairo-spectrum/cairo-spectrum.c:297
+msgid "Spectrum Analyzer"
+msgstr "Spektrin analysaattori"
+
+#: src/cdaudio-ng/cdaudio-ng.c:103
+msgid ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"and to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you to Tony Vroon for mentoring and guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project."
+msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> ja muut.\n"
+"\n"
+"Kiitoket libcdio:n kehittäjille <http://www.gnu.org/software/libcdio/>\n"
+"sekä libcddb:n kehittäjille <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Kiitokset myös Tony Vroon:lle opastuksesta ja avusta.\n"
+"\n"
+"Tämä oli Google Summer of Code 2007 -projekti."
+
+#: src/cdaudio-ng/cdaudio-ng.c:121
+msgid "Device"
+msgstr "Laite"
+
+#: src/cdaudio-ng/cdaudio-ng.c:122
+msgid "Read speed:"
+msgstr "Lukunopeus:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:125
+msgid "Override device:"
+msgstr "Laite:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:127
+msgid "Metadata"
+msgstr "Metatiedot"
+
+#: src/cdaudio-ng/cdaudio-ng.c:128
+msgid "Use CD-Text"
+msgstr "Käytä CD-tekstiä"
+
+#: src/cdaudio-ng/cdaudio-ng.c:130
+msgid "Use CDDB"
+msgstr "Käytä CDDB:tä"
+
+#: src/cdaudio-ng/cdaudio-ng.c:132
+msgid "Use HTTP instead of CDDBP"
+msgstr "Käytä HTTP:tä CDDBP:n sijasta"
+
+#: src/cdaudio-ng/cdaudio-ng.c:134
+msgid "Server:"
+msgstr "Palvelin:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:136
+msgid "Path:"
+msgstr "Polku:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:138
+msgid "Port:"
+msgstr "Portti:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:148
+msgid "Audio CD Plugin"
+msgstr "Ääni CD -liitännäinen"
+
+#: src/cdaudio-ng/cdaudio-ng.c:249
+msgid "Failed to initialize cdio subsystem."
+msgstr "cdio-alijärjestelmää ei voitu alustaa."
+
+#: src/cdaudio-ng/cdaudio-ng.c:306
+#, c-format
+msgid "Invalid URI %s."
+msgstr "Viallinen URI %s."
+
+#: src/cdaudio-ng/cdaudio-ng.c:308
+#, c-format
+msgid "Track %d not found."
+msgstr "Raitaa %d ei löydetty."
+
+#: src/cdaudio-ng/cdaudio-ng.c:310
+#, c-format
+msgid "Track %d is a data track."
+msgstr "Raita %d on dataraita."
+
+#: src/cdaudio-ng/cdaudio-ng.c:312
+msgid "Failed to open audio output."
+msgstr "Äänilähtöä ei voitu avata."
+
+#: src/cdaudio-ng/cdaudio-ng.c:395
+msgid "Error reading audio CD."
+msgstr "Virhe luettaessa ääni CD:tä."
+
+#: src/cdaudio-ng/cdaudio-ng.c:505
+msgid "Audio CD"
+msgstr "Ääni CD"
+
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr "Ei voitu avata CD-asemaa %s."
+
+#: src/cdaudio-ng/cdaudio-ng.c:547
+msgid "No audio capable CD drive found."
+msgstr "Ääneen kykenevää CD-asemaa ei löydetty."
+
+#: src/cdaudio-ng/cdaudio-ng.c:574
+msgid "Failed to finish initializing opened CD drive."
+msgstr "Avatun CD-aseman alustaminen epäonnistui."
+
+#: src/cdaudio-ng/cdaudio-ng.c:587
+msgid "Failed to retrieve first/last track number."
+msgstr "Ei voitu lukea ensimmäistä/viimeistä raitaa."
+
+#: src/cdaudio-ng/cdaudio-ng.c:612
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr "Ei voida lukea alku/loppu LSN:ää raidalle %d."
+
+#: src/cdaudio-ng/cdaudio-ng.c:702
+msgid "Failed to create the cddb connection."
+msgstr "CDDB-yhteyden luonti epäonnistui."
+
+#: src/cdaudio-ng/cdaudio-ng.c:777
+msgid "Failed to query the CDDB server"
+msgstr "CDDB-palvelimen kysely epäonnistui."
+
+#: src/cdaudio-ng/cdaudio-ng.c:779
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr "CDDB-palvelimen kysely epäonnistui: %s"
+
+#: src/cdaudio-ng/cdaudio-ng.c:803
+#, c-format
+msgid "Failed to read the cddb info: %s"
+msgstr "Ei voitu lukea cddb-tietoa: %s"
+
+#: src/cdaudio-ng/cdaudio-ng.c:876
+msgid "Drive is empty."
+msgstr "Asema on tyhjä."
+
+#: src/cdaudio-ng/cdaudio-ng.c:878
+msgid "Unsupported disk type."
+msgstr "Levytyyppiä ei tueta."
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Play CD"
+msgstr "Toista CD"
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Add CD"
+msgstr "Lisää CD"
+
+#: src/cd-menu-items/cd-menu-items.c:57
+msgid "Audio CD Menu Items"
+msgstr "Ääni CD -valikkonimikkeet"
+
+#: src/compressor/plugin.c:35
+msgid "Compression"
+msgstr "Kompressio"
+
+#: src/compressor/plugin.c:36
+msgid "Center volume:"
+msgstr "Keskikanava:"
+
+#: src/compressor/plugin.c:39
+msgid "Dynamic range:"
+msgstr "Dynaaminen alue:"
+
+#: src/compressor/plugin.c:53
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Dynaamisen alueen kompressori -liitännäinen Audacioukselle\n"
+"Copyright 2010-2012 John Lindgren"
+
+#: src/compressor/plugin.c:58
+msgid "Dynamic Range Compressor"
+msgstr "Dynaamisen alueen kompressori"
+
+#: src/console/configure.c:134 src/console/plugin.c:42
+msgid "Game Console Music Decoder"
+msgstr "Pelikonsoli-dekooderi"
+
+#: src/console/configure.c:151
+msgid "General"
+msgstr "Yleiset"
+
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
+msgid "Playback"
+msgstr "Toisto"
+
+#: src/console/configure.c:168
+msgid "Bass:"
+msgstr "Basso:"
+
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
+msgid "secs"
+msgstr "sekunteja"
+
+#: src/console/configure.c:179
+msgid "Treble:"
+msgstr "Diskantti:"
+
+#: src/console/configure.c:200
+msgid "Default song length:"
+msgstr "Kappaleen oletuskesto:"
+
+#: src/console/configure.c:206
+msgid "Resampling"
+msgstr "Uudelleennäytteistys"
+
+#: src/console/configure.c:212
+msgid "Enable audio resampling"
+msgstr "Käytä äänen uudelleennäytteistystä"
+
+#: src/console/configure.c:227
+msgid "Resampling rate:"
+msgstr "Näytteenottotaajuus:"
+
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
+msgid "Hz"
+msgstr "Hz"
+
+#: src/console/configure.c:242
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/configure.c:243
+msgid "Ignore length from SPC tags"
+msgstr "Sivuuta kesto SPC-tietueista"
+
+#: src/console/configure.c:244
+msgid "Increase reverb"
+msgstr "Lisää kaikuefektiä"
+
+#: src/console/configure.c:269
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Kappaleen oletuskestoa (sekunteina) käytetään kappaleille, joille ei ole "
+"määritelty kestoa (esim. luuppaavat raidat)."
+
+#: src/console/plugin.c:27
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+msgstr ""
+"Pelikonsoli-dekooderi perustuu Game_Music_Emu 0.5.2:lle\n"
+"Tuetut formaatit: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious liitännäisen kehittivät:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+
+#: src/crossfade/crossfade.c:81
+msgid ""
+"Crossfading failed because the songs had a different number of channels. "
+"You can use the Channel Mixer to convert the songs to the same number of "
+"channels."
+msgstr ""
+"Ristiinhäivytys epäonnistui koska kappaleilla oli eri määrä kanavia. Voit "
+"käyttää kanavamikseriä muuntaaksesi kappaleiden sisältämien kanavien määrää."
+
+#: src/crossfade/crossfade.c:88
+msgid ""
+"Crossfading failed because the songs had different sample rates. You can "
+"use the Sample Rate Converter to convert the songs to the same sample rate."
+msgstr ""
+"Ristiinhäivytys epäonnistui koska kappaleilla oli eri "
+"näytteenottotaajuudet. Voit käyttää uudelleennäytteistäjää muuntaaksesi "
+"kappaleiden näytteenottotaajuutta."
+
+#: src/crossfade/crossfade.c:254
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Ristiinhäivytys-liitännäinen Audacioukselle\n"
+"Copyright 2010-2012 John Lindgren"
+
+#: src/crossfade/crossfade.c:258
+msgid "Crossfade"
+msgstr "Ristiinhäivytys"
+
+#: src/crossfade/crossfade.c:259
+msgid "Overlap:"
+msgstr "Limittäisyys:"
+
+#: src/crossfade/crossfade.c:269
+msgid "Crossfade"
+msgstr "Ristiinhäivytys"
+
+#: src/crystalizer/crystalizer.c:40
+msgid "Crystalizer"
+msgstr "Crystalizer"
+
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
+msgid "Intensity:"
+msgstr "Vahvuus:"
+
+#: src/crystalizer/crystalizer.c:51
+msgid "Crystalizer"
+msgstr "Crystalizer"
+
+#: src/cue/cue.c:158
+msgid "Cue Sheet Plugin"
+msgstr "Cue Sheet -liitännäinen"
+
+#: src/echo_plugin/echo.c:24
+msgid "Echo"
+msgstr "Kaikuefekti"
+
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
+msgid "Delay:"
+msgstr "Viive:"
+
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
+msgid "ms"
+msgstr "ms"
+
+#: src/echo_plugin/echo.c:28
+msgid "Feedback:"
+msgstr "Feedback:"
+
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
+msgid "Volume:"
+msgstr "Äänenvoimakkuus:"
+
+#: src/echo_plugin/echo.c:114
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"\n"
+"Surround echo by Carl van Schaik, 1999"
+msgstr ""
+"Kaikuefekti-liitännäinen\n"
+"Luonut Johan Levin, 1999\n"
+"\n"
+"Surround-kaiun luonut Carl van Schaik, 1999"
+
+#: src/echo_plugin/echo.c:120
+msgid "Echo"
+msgstr "Kaikuefekti"
+
+#: src/ffaudio/ffaudio-core.c:648
+msgid ""
+"Multi-format audio decoding plugin for Audacious using\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Monen ääniformaatin dekoodaus -liitännäinen Audacioukselle käyttäen FFmpeg "
+"multimedia frameworkia (http://www.ffmpeg.org/).\n"
+"\n"
+"Audacious liitännäisen kehittivät:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+
+#: src/ffaudio/ffaudio-core.c:695
+msgid "FFmpeg Plugin"
+msgstr "FFmpeg-liitännäinen"
+
+#: src/filewriter/filewriter.c:409
+msgid "FileWriter Configuration"
+msgstr "FileWriter-asetukset"
+
+#: src/filewriter/filewriter.c:421
+msgid "Output file format:"
+msgstr "Tiedostoformaatti:"
+
+#: src/filewriter/filewriter.c:439
+msgid "Configure"
+msgstr "Muuta asetuksia"
+
+#: src/filewriter/filewriter.c:449
+msgid "Save into original directory"
+msgstr "Tallenna alkuperäiseen kansioon"
+
+#: src/filewriter/filewriter.c:454
+msgid "Save into custom directory"
+msgstr "Tallenna muuhun kansioon"
+
+#: src/filewriter/filewriter.c:464
+msgid "Output file folder:"
+msgstr "Tiedoston kohdekansio:"
+
+#: src/filewriter/filewriter.c:468
+msgid "Pick a folder"
+msgstr "Valitse kansio"
+
+#: src/filewriter/filewriter.c:481
+msgid "Get filename from:"
+msgstr "Hae tiedostonimi:"
+
+#: src/filewriter/filewriter.c:484
+msgid "original file tags"
+msgstr "alkuperäiset tiedoston tietueet"
+
+#: src/filewriter/filewriter.c:490
+msgid "original filename"
+msgstr "alkuperäinen tiedostonimi"
+
+#: src/filewriter/filewriter.c:497
+msgid "Don't strip file name extension"
+msgstr "Pidä tiedoston pääte"
+
+#: src/filewriter/filewriter.c:506
+msgid "Prepend track number to filename"
+msgstr "Lisää raidan numero tiedostonimeen"
+
+#: src/filewriter/filewriter.c:515
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+
+#: src/filewriter/filewriter.c:532
+msgid "FileWriter Plugin"
+msgstr "FileWriter-liitännäinen"
+
+#: src/filewriter/mp3.c:37 src/filewriter/mp3.c:748
+msgid "Auto"
+msgstr "Automaattinen"
+
+#: src/filewriter/mp3.c:37
+msgid "Joint Stereo"
+msgstr "Joint Stereo"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/mp3.c:688
+msgid "MP3 Configuration"
+msgstr "MP3-asetukset"
+
+#: src/filewriter/mp3.c:712
+msgid "Algorithm Quality:"
+msgstr "Algoritmin laatu:"
+
+#: src/filewriter/mp3.c:737
+msgid "Output Samplerate:"
+msgstr "Näytteenottotaajuus:"
+
+#: src/filewriter/mp3.c:765
+msgid "(Hz)"
+msgstr "(Hz)"
+
+#: src/filewriter/mp3.c:772
+msgid "Bitrate / Compression ratio:"
+msgstr "Bittinopeus / Pakkaussuhde:"
+
+#: src/filewriter/mp3.c:796
+msgid "Bitrate (kbps):"
+msgstr "Bittinopeus (kbps):"
+
+#: src/filewriter/mp3.c:829
+msgid "Compression ratio:"
+msgstr "Pakkaussuhde:"
+
+#: src/filewriter/mp3.c:853
+msgid "Audio Mode:"
+msgstr "Äänitila:"
+
+#: src/filewriter/mp3.c:878
+msgid "Misc:"
+msgstr "Muut:"
+
+#: src/filewriter/mp3.c:889
+msgid "Enforce strict ISO complience"
+msgstr "Pakota tarkka ISO-yhteensopivuus"
+
+#: src/filewriter/mp3.c:900
+msgid "Error protection"
+msgstr "Virhesuojaus"
+
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
+msgid "Quality"
+msgstr "Laatu"
+
+#: src/filewriter/mp3.c:921
+msgid "Enable VBR/ABR"
+msgstr "Käytä VBR/ABR"
+
+#: src/filewriter/mp3.c:931
+msgid "Type:"
+msgstr "Tyyppi:"
+
+#: src/filewriter/mp3.c:964
+msgid "VBR Options:"
+msgstr "VBR-asetukset:"
+
+#: src/filewriter/mp3.c:980
+msgid "Minimum bitrate (kbps):"
+msgstr "Minimi bittinopeus (kbps):"
+
+#: src/filewriter/mp3.c:1007
+msgid "Maximum bitrate (kbps):"
+msgstr "Maksimi bittinopeus (kbps):"
+
+#: src/filewriter/mp3.c:1030
+msgid "Strictly enforce minimum bitrate"
+msgstr "Valvo tiukasti minimi bittinopeutta"
+
+#: src/filewriter/mp3.c:1042
+msgid "ABR Options:"
+msgstr "ABR-asetukset:"
+
+#: src/filewriter/mp3.c:1052
+msgid "Average bitrate (kbps):"
+msgstr "Bittinopeuden keskiarvo (kbps):"
+
+#: src/filewriter/mp3.c:1080
+msgid "VBR quality level:"
+msgstr "VBR:n laatutaso:"
+
+#: src/filewriter/mp3.c:1099
+msgid "Don't write Xing VBR header"
+msgstr "Älä kirjoita Xing VBR -otsaketta"
+
+#: src/filewriter/mp3.c:1112
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1121
+msgid "Frame parameters:"
+msgstr "Kehyksen parametrit:"
+
+#: src/filewriter/mp3.c:1133
+msgid "Mark as copyright"
+msgstr "Merkitse tekijänoikeudeksi"
+
+#: src/filewriter/mp3.c:1144
+msgid "Mark as original"
+msgstr "Merkitse alkuperäiseksi"
+
+#: src/filewriter/mp3.c:1156
+msgid "ID3 params:"
+msgstr "ID3-parametrit:"
+
+#: src/filewriter/mp3.c:1167
+msgid "Force addition of version 2 tag"
+msgstr "Pakota v2-tagin lisäys"
+
+#: src/filewriter/mp3.c:1177
+msgid "Only add v1 tag"
+msgstr "Lisää vain v1-tagi"
+
+#: src/filewriter/mp3.c:1184
+msgid "Only add v2 tag"
+msgstr "Lisää vain v2-tagi"
+
+#: src/filewriter/mp3.c:1205
+msgid "Tags"
+msgstr "Tagit"
+
+#: src/filewriter/vorbis.c:209
+msgid "Vorbis Encoder Configuration"
+msgstr "Vorbis-enkooderin asetukset"
+
+#: src/filewriter/vorbis.c:232
+msgid "Quality level (0 - 10):"
+msgstr "Laatutaso (0 - 10):"
+
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
+msgid "lossless"
+msgstr "häviötön"
+
+#: src/flacng/plugin.c:269
+msgid ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Alkuperäinen koodi\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+
+#: src/flacng/plugin.c:277
+msgid "FLAC Decoder"
+msgstr "FLAC-dekooderi"
+
+#: src/gio/gio.c:300
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+"GIO-liitännäinen Audacioukselle\n"
+"Copyright 2009-2012 John Lindgren"
+
+#: src/gio/gio.c:322
+msgid "GIO Plugin"
+msgstr "GIO-liitännäinen"
+
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Lets you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"Gnomen oikopolku -liitännäinen\n"
+"Ohjaa soitinta Gnomen oikopoluilla.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
+msgid "Gnome Shortcuts"
+msgstr "Gnomen oikopolut"
+
+#: src/gtkui/columns.c:32
+msgid "Entry number"
+msgstr "Numero"
+
+#: src/gtkui/columns.c:32
+msgid "Title"
+msgstr "Nimi"
+
+#: src/gtkui/columns.c:33
+msgid "Artist"
+msgstr "Esittäjä"
+
+#: src/gtkui/columns.c:33
+msgid "Year"
+msgstr "Vuosi"
+
+#: src/gtkui/columns.c:33
+msgid "Album"
+msgstr "Albumi"
+
+#: src/gtkui/columns.c:33
+msgid "Track"
+msgstr "Raita"
+
+#: src/gtkui/columns.c:33
+msgid "Genre"
+msgstr "Tyylilaji"
+
+#: src/gtkui/columns.c:34
+msgid "Queue position"
+msgstr "Sijainti jonossa"
+
+#: src/gtkui/columns.c:34
+msgid "Length"
+msgstr "Kesto"
+
+#: src/gtkui/columns.c:34
+msgid "File path"
+msgstr "Tiedostopolku"
+
+#: src/gtkui/columns.c:34
+msgid "File name"
+msgstr "Tiedostonimi"
+
+#: src/gtkui/columns.c:35
+msgid "Custom title"
+msgstr "Mukautettu nimi"
+
+#: src/gtkui/columns.c:35
+msgid "Bitrate"
+msgstr "Bittinopeus"
+
+#: src/gtkui/columns.c:277
+msgid "Choose Columns"
+msgstr "Valitse sarakkeet"
+
+#: src/gtkui/columns.c:293
+msgid "Available:"
+msgstr "Saatavilla:"
+
+#: src/gtkui/columns.c:327
+msgid "Chosen:"
+msgstr "Valittu:"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Left"
+msgstr "Telakoi vasemmalle"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Right"
+msgstr "Telakoi oikealle"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Top"
+msgstr "Telakoi ylhäälle"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Bottom"
+msgstr "Telakoi alhaalle"
+
+#: src/gtkui/layout.c:120
+msgid "Undock"
+msgstr "Poista telakointi"
+
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
+msgid "Disable"
+msgstr "Poista käytöstä"
+
+#: src/gtkui/menus.c:170
+msgid "_Open Files ..."
+msgstr "Avaa tied_ostot..."
+
+#: src/gtkui/menus.c:171
+msgid "Open _URL ..."
+msgstr "Avaa _URL..."
+
+#: src/gtkui/menus.c:172
+msgid "_Add Files ..."
+msgstr "_Lisää tiedostoja..."
+
+#: src/gtkui/menus.c:173
+msgid "Add U_RL ..."
+msgstr "Lisää U_RL..."
+
+#: src/gtkui/menus.c:175
+msgid "_Search Library"
+msgstr "_Etsi kirjastosta"
+
+#: src/gtkui/menus.c:177
+msgid "A_bout ..."
+msgstr "_Tietoja..."
+
+#: src/gtkui/menus.c:178
+msgid "_Preferences ..."
+msgstr "_Asetukset..."
+
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
+msgid "_Quit"
+msgstr "_Sulje"
+
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
+msgid "_Play"
+msgstr "_Toista"
+
+#: src/gtkui/menus.c:183
+msgid "Paus_e"
+msgstr "_Keskeytä"
+
+#: src/gtkui/menus.c:184
+msgid "_Stop"
+msgstr "_Pysäytä"
+
+#: src/gtkui/menus.c:185
+msgid "Pre_vious"
+msgstr "_Edellinen"
+
+#: src/gtkui/menus.c:186
+msgid "_Next"
+msgstr "_Seuraava"
+
+#: src/gtkui/menus.c:188
+msgid "_Repeat"
+msgstr "_Kertaus"
+
+#: src/gtkui/menus.c:189
+msgid "S_huffle"
+msgstr "S_ekoitus"
+
+#: src/gtkui/menus.c:190
+msgid "N_o Playlist Advance"
+msgstr "Älä _etene soittolistalla"
+
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "_Pysäytä tämän kappaleen jälkeen"
+
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
+msgid "Song _Info ..."
+msgstr "K_appaleen tiedot..."
+
+#: src/gtkui/menus.c:194
+msgid "Jump to _Time ..."
+msgstr "Sii_rry aikaan..."
+
+#: src/gtkui/menus.c:195
+msgid "_Jump to Song ..."
+msgstr "S_iirry kappaleeseen..."
+
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Aseta kertauksen alkupiste A"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Aseta kertauksen loppupiste B"
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "_Tyhjennä kertauspisteet"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
+msgid "By _Title"
+msgstr "_Nimen mukaan"
+
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "_Tiedostonimen mukaan"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "Tiedosto_polun mukaan"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Ka_ppalenumeron mukaan"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
+msgid "By _Artist"
+msgstr "_Esittäjän mukaan"
+
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "Al_bumin mukaan"
+
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
+msgid "By Release _Date"
+msgstr "_Julkaisupäivämäärän mukaan"
+
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "_Keston mukaan"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
+msgid "By _File Path"
+msgstr "_Tiedostopolun mukaan"
+
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
+msgid "By _Custom Title"
+msgstr "_Mukautetun nimen mukaan"
+
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
+msgid "R_everse Order"
+msgstr "_Käänteinen järjestys"
+
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
+msgid "_Random Order"
+msgstr "_Satunnainen järjestys"
+
+#: src/gtkui/menus.c:233
+msgid "_Play This Playlist"
+msgstr "_Toista tämä soittolista"
+
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
+msgid "_Refresh"
+msgstr "_Päivitä"
+
+#: src/gtkui/menus.c:236
+msgid "_Sort"
+msgstr "_Lajittele"
+
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Järjestä valitut"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Poista _kopiot"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Poista _ei saatavilla olevat tiedostot"
+
+#: src/gtkui/menus.c:241
+msgid "_New"
+msgstr "_Uusi"
+
+#: src/gtkui/menus.c:242
+msgid "Ren_ame ..."
+msgstr "Uudelleen _nimeä..."
+
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
+msgid "_Close"
+msgstr "_Sulje"
+
+#: src/gtkui/menus.c:245
+msgid "_Import ..."
+msgstr "_Tuo..."
+
+#: src/gtkui/menus.c:246
+msgid "_Export ..."
+msgstr "_Vie..."
+
+#: src/gtkui/menus.c:248
+msgid "Playlist _Manager ..."
+msgstr "Soittolistojen _hallinta..."
+
+#: src/gtkui/menus.c:249
+msgid "_Queue Manager ..."
+msgstr "_Jonomanageri..."
+
+#: src/gtkui/menus.c:252
+msgid "Volume _Up"
+msgstr "_Nosta äänenvoimakkuutta"
+
+#: src/gtkui/menus.c:253
+msgid "Volume _Down"
+msgstr "_Laske äänenvoimakkuutta"
+
+#: src/gtkui/menus.c:255
+msgid "_Equalizer"
+msgstr "_Taajuuskorjain"
+
+#: src/gtkui/menus.c:257
+msgid "E_ffects"
+msgstr "T_ehosteet"
+
+#: src/gtkui/menus.c:260
+msgid "_Interface"
+msgstr "_Käyttöliittymä"
+
+#: src/gtkui/menus.c:261
+msgid "_Visualizations"
+msgstr "_Visualisoinnit"
+
+#: src/gtkui/menus.c:263
+msgid "Show _Menu Bar"
+msgstr "Näytä _valikkopalkki"
+
+#: src/gtkui/menus.c:264
+msgid "Show I_nfo Bar"
+msgstr "Näytä _tietopalkki"
+
+#: src/gtkui/menus.c:265
+msgid "Show Info Bar Vis_ualization"
+msgstr "Näytä tietopalkin vis_ualisaatio"
+
+#: src/gtkui/menus.c:266
+msgid "Show _Status Bar"
+msgstr "Näytä tila_rivi"
+
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Näytä _jäljellä oleva aika"
+
+#: src/gtkui/menus.c:270
+msgid "Show Close _Buttons"
+msgstr "Näytä sulkemis_painikkeet"
+
+#: src/gtkui/menus.c:271
+msgid "Show Column _Headers"
+msgstr "Näytä sarakkeiden _otsikot"
+
+#: src/gtkui/menus.c:272
+msgid "Choose _Columns ..."
+msgstr "Valitse _sarakkeet..."
+
+#: src/gtkui/menus.c:273
+msgid "Scrol_l on Song Change"
+msgstr "_Vieritä kappaleen vaihtuessa"
+
+#: src/gtkui/menus.c:276
+msgid "_File"
+msgstr "_Tiedosto"
+
+#: src/gtkui/menus.c:277
+msgid "_Playback"
+msgstr "T_oisto"
+
+#: src/gtkui/menus.c:278
+msgid "P_laylist"
+msgstr "_Soittolista"
+
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
+msgid "_Services"
+msgstr "_Palvelut"
+
+#: src/gtkui/menus.c:280
+msgid "_Output"
+msgstr "_Ääni"
+
+#: src/gtkui/menus.c:281
+msgid "_View"
+msgstr "_Näkymä"
+
+#: src/gtkui/menus.c:285
+msgid "_Queue/Unqueue"
+msgstr "_Lisää jonoon/Poista jonosta"
+
+#: src/gtkui/menus.c:288
+msgid "Cu_t"
+msgstr "L_eikkaa"
+
+#: src/gtkui/menus.c:289
+msgid "_Copy"
+msgstr "_Kopioi"
+
+#: src/gtkui/menus.c:290
+msgid "_Paste"
+msgstr "_Liitä"
+
+#: src/gtkui/menus.c:291
+msgid "Select _All"
+msgstr "Valitse _kaikki"
+
+#: src/gtkui/menus.c:297
+msgid "_Rename ..."
+msgstr "_Uudelleen nimeä..."
+
+#: src/gtkui/ui_gtk.c:96
+msgid "GTK Interface"
+msgstr "GTK-käyttöliittymä"
+
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.c:204
+msgid "Buffering ..."
+msgstr "Puskuroidaan..."
+
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
+msgid "Error"
+msgstr "Virhe"
+
+#: src/gtkui/ui_statusbar.c:108
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] "%d kanava"
+msgstr[1] "%d kanavaa"
+
+#: src/gtkui/ui_statusbar.c:123
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr "Edellinen raita"
+
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
+msgid "Play"
+msgstr "Toista"
+
+#: src/hotkey/gui.c:72
+msgid "Pause/Resume"
+msgstr "Keskeytä/Jatka"
+
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
+msgid "Stop"
+msgstr "Pysäytä"
+
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr "Seuraava raita"
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "5 sekuntia eteenpäin"
+
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
+msgstr "5 sekuntia taaksepäin"
+
+#: src/hotkey/gui.c:77
+msgid "Mute"
+msgstr "Vaimenna"
+
+#: src/hotkey/gui.c:78
+msgid "Volume up"
+msgstr "Nosta äänenvoimakkuutta"
+
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr "Laske äänenvoimakkuutta"
+
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
+msgstr "Siirry tiedostoon"
+
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr "Näytä/Piilota soittimen ikkunat"
+
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Näytä OSD"
+
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
+msgstr "Kertaus"
+
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
+msgstr "Sekoitus"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr "Pysäytä nykyisen jälkeen"
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
+msgstr "Nosta soittimen ikkunat"
+
+#: src/hotkey/gui.c:96
+msgid "(none)"
+msgstr "(ei mitään)"
+
+#: src/hotkey/gui.c:233
+msgid ""
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"Ei ole suositeltavaa kytkeä hiiren painalluksia ilman muunnosnäppäimiä.\n"
+"\n"
+"Haluatko jatkaa?"
+
+#: src/hotkey/gui.c:235
+msgid "Binding mouse buttons"
+msgstr "Kytketään hiiren painalluksia"
+
+#: src/hotkey/gui.c:385
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Globaalit pikanäppäimet -liitännäisen asetukset"
+
+#: src/hotkey/gui.c:401
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+"Paina näppäinyhdistelmää tekstikentän sisällä.\n"
+"Voit käyttää myös hiiren nappeja."
+
+#: src/hotkey/gui.c:406
+msgid "Hotkeys:"
+msgstr "Pikanäppäimet:"
+
+#: src/hotkey/gui.c:423
+msgid "Action:"
+msgstr "Toiminto:"
+
+#: src/hotkey/gui.c:430
+msgid "Key Binding:"
+msgstr "Näppäinsidos:"
+
+#: src/hotkey/plugin.c:66
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"Globaalit pikanäppäimet -liitännäinen\n"
+"Ohjaa soitinta globaaleilla näppäinyhdistelmillä tai multimedianäppäimillä.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Kontribuutiot:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
+
+#: src/hotkey/plugin.c:78
+msgid "Global Hotkeys"
+msgstr "Globaalit pikanäppäimet"
+
+#: src/jack/jack.c:410
+msgid ""
+"Based on xmms-jack, by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Ported to Audacious by Giacomo Lozito"
+msgstr ""
+"Perustuu xmms-jack:iin, luonut Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Portannut Audacioukselle Giacomo Lozito"
+
+#: src/jack/jack.c:416
+msgid "JACK Output"
+msgstr "JACK-lähtö"
+
+#: src/ladspa/plugin.c:493
+#, c-format
+msgid "%s Settings"
+msgstr "%s asetukset"
+
+#: src/ladspa/plugin.c:561
+msgid "LADSPA Host Settings"
+msgstr "LADSPA-isännän asetukset"
+
+#: src/ladspa/plugin.c:570
+msgid "Module paths:"
+msgstr "Moduulipolut:"
+
+#: src/ladspa/plugin.c:575
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+"Erota polut kaksoispisteellä.\n"
+"Näistä poluista etsitään liitännäisiä, LADSPA_PATH:n lisäksi.\n"
+"Uuden polun lisäämisen jälkeen paina entteriä hakeaksesi uusia liitännäisiä."
+""
+
+#: src/ladspa/plugin.c:591
+msgid "Available plugins:"
+msgstr "Saatavilla olevat liitännäiset:"
+
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
+msgid "Enable"
+msgstr "Käytä"
+
+#: src/ladspa/plugin.c:610
+msgid "Enabled plugins:"
+msgstr "Aktiiviset liitännäiset:"
+
+#: src/ladspa/plugin.c:626
+msgid "Settings"
+msgstr "Asetukset"
+
+#: src/ladspa/plugin.c:645
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+"LADSPA-isäntä Audacioukselle\n"
+"Copyright 2011 John Lindgren"
+
+#: src/ladspa/plugin.c:650
+msgid "LADSPA Host"
+msgstr "LADSPA-isäntä"
+
+#: src/lirc/lirc.c:76
+#, c-format
+msgid "%s: could not init LIRC support\n"
+msgstr "%s: ei voida alustaa LIRC-tukea\n"
+
+#: src/lirc/lirc.c:83
+#, c-format
+msgid ""
+"%s: could not read LIRC config file\n"
+"%s: please read the documentation of LIRC\n"
+"%s: how to create a proper config file\n"
+msgstr ""
+"%s: ei voitu lukea LIRC:n asetustiedostoa\n"
+"%s: lue LIRC:n dokumentaatiosta\n"
+"%s: kuinka luoda kelvollinen asetustiedosto \n"
+
+#: src/lirc/lirc.c:114
+#, c-format
+msgid "%s: trying to reconnect...\n"
+msgstr "%s: yritetään yhdistää uudelleen...\n"
+
+#: src/lirc/lirc.c:354
+#, c-format
+msgid "%s: unknown command \"%s\"\n"
+msgstr "%s: tuntematon komento \"%s\"\n"
+
+#: src/lirc/lirc.c:365
+#, c-format
+msgid "%s: disconnected from LIRC\n"
+msgstr "%s: LIRC-yhteys katkaistu\n"
+
+#: src/lirc/lirc.c:371
+#, c-format
+msgid "%s: will try reconnect every %d seconds...\n"
+msgstr "%s: yritetään yhdistää uudelleen joka %d sekunti...\n"
+
+#: src/lirc/lirc.c:381
+msgid ""
+"A simple plugin to control Audacious using the LIRC remote control daemon\n"
+"\n"
+"Adapted for Audacious by:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Based on the XMMS LIRC plugin by:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"For more information about LIRC, see http://lirc.org."
+msgstr ""
+"Yksinkertainen liitännäinen Audaciouksen ohjaamiseen LIRC:n avulla.\n"
+"\n"
+"Muuntanut Audacioukselle:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Perustuu XMMS LIRC -liitännäiseen, jonka kehittivät:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Lisää tieto LIRC:stä http://lirc.org."
+
+#: src/lirc/lirc.c:392
+msgid "Connection"
+msgstr "Yhteys"
+
+#: src/lirc/lirc.c:393
+msgid "Reconnect to LIRC server"
+msgstr "Yhdistä uudelleen LIRC-palvelimelle"
+
+#: src/lirc/lirc.c:395
+msgid "Wait before reconnecting:"
+msgstr "Odota ennen uudelleenyhdistämistä:"
+
+#: src/lirc/lirc.c:405
+msgid "LIRC Plugin"
+msgstr "LIRC-liitännäinen"
+
+#: src/lyricwiki/lyricwiki.c:117
+msgid "No lyrics available"
+msgstr "Lyriikoita ei saatavilla"
+
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
+#, c-format
+msgid "Unable to fetch %s"
+msgstr "Ei voitu hakea %s"
+
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
+#, c-format
+msgid "Unable to parse %s"
+msgstr "Ei voida jäsentää %s"
+
+#: src/lyricwiki/lyricwiki.c:260
+msgid "Looking for lyrics ..."
+msgstr "Etsitään lyriikoita..."
+
+#: src/lyricwiki/lyricwiki.c:271
+msgid "Missing song metadata"
+msgstr "Kappaleen metatiedot puuttuvat"
+
+#: src/lyricwiki/lyricwiki.c:284
+msgid "Connecting to lyrics.wikia.com ..."
+msgstr "Yhdistetään lyrics.wikia.com..."
+
+#: src/lyricwiki/lyricwiki.c:411
+msgid "LyricWiki Plugin"
+msgstr "LyricWiki-liitännäinen"
+
+#: src/m3u/m3u.c:121
+msgid "M3U Playlists"
+msgstr "M3U-soittolistat"
+
+#: src/metronom/metronom.c:127
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Tahtigeneraattori: %d bpm"
+
+#: src/metronom/metronom.c:129
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Tahtigeneraattori: %d bpm %d/%d"
+
+#: src/metronom/metronom.c:246
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr ""
+"Tahtigeneraattori, luonut Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Käyttääksesi sitä, lisää URL: tact://beats*num/den\n"
+"esim. tact://77 soittaaksesi 77 iskua minuutissa.\n"
+"Tai tact://60*3/4 soittaaksesi 60 iskua minuutissa tahdilla 3/4"
+
+#: src/metronom/metronom.c:255
+msgid "Tact Generator"
+msgstr "Tahtigeneraattori"
+
+#: src/mixer/mixer.c:169
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+"Kanavamikseri-liitännäinen Audacioukselle\n"
+"Copyright 2011-2012 John Lindgren ja Michał Lipski"
+
+#: src/mixer/mixer.c:173
+msgid "Channel Mixer"
+msgstr "Kanavamikseri"
+
+#: src/mixer/mixer.c:174
+msgid "Output channels:"
+msgstr "Kanavat:"
+
+#: src/mixer/mixer.c:184
+msgid "Channel Mixer"
+msgstr "Kanavamikseri"
+
+#: src/mms/mms.c:224
+msgid "MMS Plugin"
+msgstr "MMS-liitännäinen"
+
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
+msgid "ModPlug (Module Player)"
+msgstr "ModPlug (Module Player)"
+
+#: src/mpg123/mpg123.c:213
+msgid "Surround"
+msgstr "Surround"
+
+#: src/mpg123/mpg123.c:569
+msgid "MPG123 Plugin"
+msgstr "MPG123-liitännäinen"
+
+#: src/mpris2/plugin.c:403
+msgid "MPRIS 2 Server"
+msgstr "MPRIS 2 -palvelin"
+
+#: src/neon/neon.c:1228
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr "Neon HTTP/HTTPS -liitännäinen"
+
+#: src/notify/event.c:64
+msgid "Stopped"
+msgstr "Pysäytetty"
+
+#: src/notify/event.c:64
+msgid "Audacious is not playing."
+msgstr "Audacious ei tällä hetkellä soita mitään."
+
+#: src/notify/notify.c:33
+msgid ""
+"Desktop Notifications Plugin for Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
+msgid "Desktop Notifications"
+msgstr "Työpöydän ilmoitukset"
+
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Keskeytä"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Seuraava"
+
+#: src/oss4/plugin.c:36
+msgid "1. Default device"
+msgstr "1. Oletuslaite"
+
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
+msgid "Audio device:"
+msgstr "Äänilaite:"
+
+#: src/oss4/plugin.c:77
+msgid "Use alternate device:"
+msgstr "Käytä vaihtoehtoista laitetta:"
+
+#: src/oss4/plugin.c:81
+msgid "Save volume between sessions."
+msgstr "Tallenna äänenvoimakkuus eri sessioiden välillä."
+
+#: src/oss4/plugin.c:83
+msgid "Enable format conversions made by the OSS software."
+msgstr "Käytä OSS:n luomia formaatin muutoksia."
+
+#: src/oss4/plugin.c:85
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Kytke eksklusiivinen tila päälle virtuaalisen miksauksen estämiseksi."
+
+#: src/oss4/plugin.c:108
+msgid ""
+"OSS4 Output Plugin for Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"OSS4-lähdön liitännäinen Audacioukselle\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"Haluaisin kiittää ihmisiä kanavalla #audacious, erityisesti Tony Vroonia "
+"sekä John Lindgreniä. Kiitokset myös edellisen OSS-liitännäisen kehittäjille."
+
+#: src/oss4/plugin.c:115
+msgid "OSS4 Output"
+msgstr "OSS4-lähtö"
+
+#: src/pls/pls.c:113
+msgid "PLS Playlists"
+msgstr "PLS-soittolistat"
+
+#: src/psf/plugin.c:264
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr "OpenPSF PSF1/PSF2 -dekooderi"
+
+#: src/pulse_audio/pulse_audio.c:644
+msgid ""
+"Audacious PulseAudio Output Plugin\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+"Audaciouksen PulseAudio-lähdön liitännäinen\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+
+#: src/pulse_audio/pulse_audio.c:662
+msgid "PulseAudio Output"
+msgstr "PulseAudio-lähtö"
+
+#: src/resample/resample.c:161
+msgid ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Uudelleenäytteistys-liitännäinen Audacioukselle\n"
+"Copyright 2010-2012 John Lindgren"
+
+#: src/resample/resample.c:165
+msgid "Skip/repeat samples"
+msgstr "Sivuuta/kertaa näytteet"
+
+#: src/resample/resample.c:166
+msgid "Linear interpolation"
+msgstr "Lineaarinen interpolaatio"
+
+#: src/resample/resample.c:167
+msgid "Fast sinc interpolation"
+msgstr "Nopea sinc-interpolaatio"
+
+#: src/resample/resample.c:168
+msgid "Medium sinc interpolation"
+msgstr "Kohtalainen sinc-interpolaatio"
+
+#: src/resample/resample.c:169
+msgid "Best sinc interpolation"
+msgstr "Paras sinc-interpolaatio"
+
+#: src/resample/resample.c:172
+msgid "Conversion"
+msgstr "Muunnos"
+
+#: src/resample/resample.c:173
+msgid "Method:"
+msgstr "Metodi:"
+
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
+msgid "Rate:"
+msgstr "Näytteenottotaajuus:"
+
+#: src/resample/resample.c:179
+msgid "Rate Mappings"
+msgstr "Kartoitus"
+
+#: src/resample/resample.c:180
+msgid "Use rate mappings"
+msgstr "Käytä kartoituksia"
+
+#: src/resample/resample.c:182
+msgid "8 kHz:"
+msgstr "8 kHz:"
+
+#: src/resample/resample.c:185
+msgid "16 kHz:"
+msgstr "16 kHz:"
+
+#: src/resample/resample.c:188
+msgid "22.05 kHz:"
+msgstr "22.05 kHz:"
+
+#: src/resample/resample.c:191
+msgid "44.1 kHz:"
+msgstr "44.1 kHz:"
+
+#: src/resample/resample.c:194
+msgid "48 kHz:"
+msgstr "48 kHz:"
+
+#: src/resample/resample.c:197
+msgid "96 kHz:"
+msgstr "96 kHz:"
+
+#: src/resample/resample.c:200
+msgid "192 kHz:"
+msgstr "192 kHz:"
+
+#: src/resample/resample.c:210
+msgid "Sample Rate Converter"
+msgstr "Uudelleenäytteistäjä"
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "OK. Päivitetään raitoja käyttäjälle: %s"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Lupa evätty"
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Avaa seuraava linkki salliaksesi Audaciouksen päivittää soitettuja raitojasi:"
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Pidä tämä ikkuna auki ja paina \"Tarkista oikeudet\" -painiketta uudelleen.\n"
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"Soitettujen kappaleiden tiedot tallennetaan koneellesi.\n"
+"Tiedot lähetetään heti kun mahdollista."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Verkko-ongelma."
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "Last.fm -palveluun yhdistettäessä ilmeni ongelmia. Yritä uudelleen."
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Tarkistetaan..."
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "_Tarkista oikeudet"
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_Kumoa oikeudet"
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Sinun pitää sallia Audaciouksen päivittää raitoja Last.fm -tilillesi.\n"
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Scrobbler -liitännäistä ei voitu käynnistää.\n"
+"Asennuksessasi saattaa olla jotain vikaa."
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Audacious Scrobbler 2.0 -liitännäinen, luonut Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Kiitos John Lindgrenille avusta projektin alussa.\n"
+"\n"
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+
+#: src/sdlout/plugin.c:26
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"SDL-lähdön liitännäinen Audacioukselle\n"
+"Copyright 2010 John Lindgren"
+
+#: src/sdlout/plugin.c:31
+msgid "SDL Output"
+msgstr "SDL-lähtö"
+
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
+msgid "Library"
+msgstr "Kirjasto"
+
+#: src/search-tool/search-tool.c:219
+msgid "Unknown Artist"
+msgstr "Tuntematon esittäjä"
+
+#: src/search-tool/search-tool.c:221
+msgid "Unknown Album"
+msgstr "Tuntematon albumi"
+
+#: src/search-tool/search-tool.c:632
+#, c-format
+msgid ""
+"%s\n"
+" on %s by %s"
+msgstr ""
+"%s\n"
+" albumilla %s esittäjältä %s"
+
+#: src/search-tool/search-tool.c:638
+#, c-format
+msgid "%d album"
+msgid_plural "%d albums"
+msgstr[0] "%d albumi"
+msgstr[1] "%d albumia"
+
+#: src/search-tool/search-tool.c:640
+#, c-format
+msgid ""
+"%s\n"
+" %s, %d song"
+msgid_plural ""
+"%s\n"
+" %s, %d songs"
+msgstr[0] ""
+"%s\n"
+" %s, %d kappale"
+msgstr[1] ""
+"%s\n"
+" %s, %d kappaletta"
+
+#: src/search-tool/search-tool.c:646
+#, c-format
+msgid ""
+"%s\n"
+" %d song by %s"
+msgid_plural ""
+"%s\n"
+" %d songs by %s"
+msgstr[0] ""
+"%s\n"
+" %d kappale esittäjältä %s"
+msgstr[1] ""
+"%s\n"
+" %d kappaletta esittäjältä %s"
+
+#: src/search-tool/search-tool.c:687
+msgid "_Create Playlist"
+msgstr "_Luo soittolista"
+
+#: src/search-tool/search-tool.c:694
+msgid "_Add to Playlist"
+msgstr "L_isää soittolistalle"
+
+#: src/search-tool/search-tool.c:734
+msgid "Search library"
+msgstr "Etsi kirjastosta"
+
+#: src/search-tool/search-tool.c:739
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"Tuodaksesi musiikkikirjastosi Audacioukseen, valitse kansio ja paina sen "
+"jälkeen päivitys painiketta."
+
+#: src/search-tool/search-tool.c:747
+msgid "Please wait ..."
+msgstr "Odota..."
+
+#: src/search-tool/search-tool.c:769
+msgid "Choose Folder"
+msgstr "Valitse kansio"
+
+#: src/search-tool/search-tool.c:808
+msgid "Search Tool"
+msgstr "Etsintätyökalu"
+
+#: src/skins/plugin.c:49
+msgid "Winamp Classic Interface"
+msgstr "Winampin klassinen käyttöliittymä"
+
+#: src/skins/skins_cfg.c:204
+msgid "_Player:"
+msgstr "_Soitin:"
+
+#: src/skins/skins_cfg.c:205
+msgid "Select main player window font:"
+msgstr "Valitse pääikkunan kirjasin:"
+
+#: src/skins/skins_cfg.c:207
+msgid "_Playlist:"
+msgstr "_Soittolista:"
+
+#: src/skins/skins_cfg.c:208
+msgid "Select playlist font:"
+msgstr "Valitse soittolistan kirjasin:"
+
+#: src/skins/skins_cfg.c:212
+msgid "_Fonts"
+msgstr "_Kirjasimet"
+
+#: src/skins/skins_cfg.c:215
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Käytä bittikartta-kirjasimia (vain ASCII)"
+
+#: src/skins/skins_cfg.c:217
+msgid "Scroll song title in both directions"
+msgstr "Vieritä kappaleen nimeä kumpaankin suuntaan"
+
+#: src/skins/skins_cfg.c:295
+msgid "_Skin"
+msgstr "_Tyyli"
+
+#: src/skins/skins_cfg.c:342
+msgid "Interface Preferences"
+msgstr "Käyttöliittymän asetukset"
+
+#: src/skins/ui_equalizer.c:328
+msgid "Preamp"
+msgstr "Esivahvistus"
+
+#: src/skins/ui_equalizer.c:332
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/ui_equalizer.c:375
+msgid "Audacious Equalizer"
+msgstr "Audaciouksen taajuuskorjain"
+
+#: src/skins/ui_equalizer.c:890
+msgid "Presets"
+msgstr "Esiasetukset"
+
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
+msgid "Load preset"
+msgstr "Lataa esiasetus"
+
+#: src/skins/ui_equalizer.c:988
+msgid "Load auto-preset"
+msgstr "Lataa automaattinen esiasetus"
+
+#: src/skins/ui_equalizer.c:1018 src/skins/ui_equalizer.c:1036
+#: src/skins/ui_equalizer.c:1052
+msgid "Load equalizer preset"
+msgstr "Lataa taajuuskorjaimen esiasetus"
+
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
+msgid "Save preset"
+msgstr "Tallenna esiasetukset"
+
+#: src/skins/ui_equalizer.c:1087
+msgid "Save auto-preset"
+msgstr "Tallenna automaattinen esiasetus"
+
+#: src/skins/ui_equalizer.c:1118 src/skins/ui_equalizer.c:1154
+msgid "Save equalizer preset"
+msgstr "Tallenna taajuuskorjaimen esiasetus"
+
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
+msgid "Delete preset"
+msgstr "Poista esiasetus"
+
+#: src/skins/ui_equalizer.c:1190
+msgid "Delete auto-preset"
+msgstr "Poista automaattisesti ladattava esiasetus"
+
+#: src/skins/ui_main.c:414
+msgid "kbps"
+msgstr "kbps"
+
+#: src/skins/ui_main.c:422
+msgid "kHz"
+msgstr "kHz"
+
+#: src/skins/ui_main.c:770
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Siirry kohtaan %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/ui_main.c:791
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Äänenvoimakkuus: %d%%"
+
+#: src/skins/ui_main.c:814
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Tasapaino: %d%% vasen"
+
+#: src/skins/ui_main.c:816
+msgid "Balance: center"
+msgstr "Tasapaino: keskellä"
+
+#: src/skins/ui_main.c:818
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Tasapaino: %d%% oikea"
+
+#: src/skins/ui_main.c:942
+msgid "Options Menu"
+msgstr "Asetusvalikko"
+
+#: src/skins/ui_main.c:946
+msgid "Disable 'Always On Top'"
+msgstr "Poista käytöstä 'Aina päällimmäisenä'"
+
+#: src/skins/ui_main.c:948
+msgid "Enable 'Always On Top'"
+msgstr "Käytä 'Aina päällimmäisenä'"
+
+#: src/skins/ui_main.c:951
+msgid "File Info Box"
+msgstr "Tiedoston tietolaatikko"
+
+#: src/skins/ui_main.c:956
+msgid "Visualization Menu"
+msgstr "Visualisointivalikko"
+
+#: src/skins/ui_main.c:1591
+msgid "Single mode."
+msgstr "Yksittäinen -tila."
+
+#: src/skins/ui_main.c:1593
+msgid "Playlist mode."
+msgstr "Soittolista -tila."
+
+#: src/skins/ui_main.c:1615
+msgid "Stopping after song."
+msgstr "Pysäytä kappaleen jälkeen."
+
+#: src/skins/ui_main.c:1617
+msgid "Not stopping after song."
+msgstr "Älä pysäytä kappaleen jälkeen."
+
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Kertauksen alkupiste A asetettu."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Kertauksen loppupiste B asetettu."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Kertauspisteet tyhjennetty."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
+msgid "Autoscroll Song Name"
+msgstr "Vieritä automaattisesti nimeä"
+
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
+msgid "Stop after Current Song"
+msgstr "Pysäytä tämänhetkisen kappaleen jälkeen"
+
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
+msgid "Peaks"
+msgstr "Huiput"
+
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
+msgid "Repeat"
+msgstr "Kertaus"
+
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
+msgid "Shuffle"
+msgstr "Sekoitus"
+
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
+msgid "No Playlist Advance"
+msgstr "Älä etene soittolistalla"
+
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
+msgid "Show Player"
+msgstr "Näytä soitin"
+
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
+msgid "Show Playlist Editor"
+msgstr "Näytä soittolistan muokkain"
+
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
+msgid "Show Equalizer"
+msgstr "Näytä taajuuskorjain"
+
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
+msgid "Always on Top"
+msgstr "Aina päällimmäisenä"
+
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
+msgid "Put on All Workspaces"
+msgstr "Näytä kaikilla työpöydillä"
+
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
+msgid "Roll up Player"
+msgstr "Rullaa soitin ylös"
+
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
+msgid "Roll up Playlist Editor"
+msgstr "Rullaa soittolistan muokkain ylös"
+
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
+msgid "Roll up Equalizer"
+msgstr "Rullaa taajuuskorjain ylös"
+
+#: src/skins/ui_manager.c:114
+msgid "Analyzer"
+msgstr "Analyzer"
+
+#: src/skins/ui_manager.c:115
+msgid "Scope"
+msgstr "Scope"
+
+#: src/skins/ui_manager.c:116
+msgid "Voiceprint"
+msgstr "Voiceprint"
+
+#: src/skins/ui_manager.c:117
+msgid "Off"
+msgstr "Pois"
+
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
+msgid "Normal"
+msgstr "Normaali"
+
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+msgid "Fire"
+msgstr "Tuli"
+
+#: src/skins/ui_manager.c:123
+msgid "Vertical Lines"
+msgstr "Pystysuorat viivat"
+
+#: src/skins/ui_manager.c:127
+msgid "Lines"
+msgstr "Viivat"
+
+#: src/skins/ui_manager.c:128
+msgid "Bars"
+msgstr "Palkit"
+
+#: src/skins/ui_manager.c:132
+msgid "Dot Scope"
+msgstr "Dot Scope"
+
+#: src/skins/ui_manager.c:133
+msgid "Line Scope"
+msgstr "Line Scope"
+
+#: src/skins/ui_manager.c:134
+msgid "Solid Scope"
+msgstr "Solid Scope"
+
+#: src/skins/ui_manager.c:140
+msgid "Ice"
+msgstr "Jää"
+
+#: src/skins/ui_manager.c:145
+msgid "Smooth"
+msgstr "Tasainen"
+
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
+msgid "Slowest"
+msgstr "Hitain"
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slow"
+msgstr "Hidas"
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
+msgid "Medium"
+msgstr "Keskinkertainen"
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Fast"
+msgstr "Nopea"
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fastest"
+msgstr "Nopein"
+
+#: src/skins/ui_manager.c:165
+msgid "Time Elapsed"
+msgstr "Aikaa kulunut"
+
+#: src/skins/ui_manager.c:166
+msgid "Time Remaining"
+msgstr "Aikaa jäljellä"
+
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
+msgid "Previous"
+msgstr "Edellinen"
+
+#: src/skins/ui_manager.c:195
+msgid "Visualization"
+msgstr "Visualisaatio"
+
+#: src/skins/ui_manager.c:196
+msgid "Visualization Mode"
+msgstr "Visualisaatiotila"
+
+#: src/skins/ui_manager.c:197
+msgid "Analyzer Mode"
+msgstr "Analyzer-tila"
+
+#: src/skins/ui_manager.c:198
+msgid "Scope Mode"
+msgstr "Scope-tila"
+
+#: src/skins/ui_manager.c:199
+msgid "Voiceprint Mode"
+msgstr "Voiceprint-tila"
+
+#: src/skins/ui_manager.c:200
+msgid "WindowShade VU Mode"
+msgstr "WindowShade VU -tila"
+
+#: src/skins/ui_manager.c:201
+msgid "Analyzer Falloff"
+msgstr "Analysaattorin tiputus"
+
+#: src/skins/ui_manager.c:202
+msgid "Peaks Falloff"
+msgstr "Huippujen tiputus"
+
+#: src/skins/ui_manager.c:207
+msgid "Playlist"
+msgstr "Soittolista"
+
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
+msgid "Play Playlist"
+msgstr "Toista soittolista"
+
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
+msgid "New Playlist"
+msgstr "Uusi soittolista"
+
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
+msgid "Select Next Playlist"
+msgstr "Valitse seuraava soittolista"
+
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
+msgid "Select Previous Playlist"
+msgstr "Valitse edellinen soittolista"
+
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
+msgid "Delete Playlist"
+msgstr "Poista soittolista"
+
+#: src/skins/ui_manager.c:224
+msgid "Import Playlist"
+msgstr "Tuo soittolista"
+
+#: src/skins/ui_manager.c:225
+msgid "Loads a playlist file into the selected playlist."
+msgstr "Lataa soittolista-tiedoston valittuun soittolistaan."
+
+#: src/skins/ui_manager.c:228
+msgid "Export Playlist"
+msgstr "Vie soittolista"
+
+#: src/skins/ui_manager.c:229
+msgid "Saves the selected playlist."
+msgstr "Tallentaa valitun soittolistan."
+
+#: src/skins/ui_manager.c:231
+msgid "Refresh List"
+msgstr "Päivitä lista"
+
+#: src/skins/ui_manager.c:232
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "Päivitä kappaleen metatiedot."
+
+#: src/skins/ui_manager.c:235
+msgid "Playlist Manager"
+msgstr "Soittolistojen hallinta"
+
+#: src/skins/ui_manager.c:238
+msgid "Queue Manager"
+msgstr "Jonomanageri"
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Näkymä"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "Käyttöliittymä"
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr "Käyttöliittymän asetukset..."
+
+#: src/skins/ui_manager.c:250
+msgid "Add Internet Address..."
+msgstr "Lisää internet-osoite..."
+
+#: src/skins/ui_manager.c:251
+msgid "Adds a remote track to the playlist."
+msgstr "Lisää ei-lokaali raita soittolistalle."
+
+#: src/skins/ui_manager.c:254
+msgid "Add Files..."
+msgstr "Lisää tiedostoja..."
+
+#: src/skins/ui_manager.c:255
+msgid "Adds files to the playlist."
+msgstr "Lisää tiedostoja soittolistaan."
+
+#: src/skins/ui_manager.c:260
+msgid "Search and Select"
+msgstr "Etsi ja valitse"
+
+#: src/skins/ui_manager.c:261
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr ""
+"Etsii ja valitsee soittolistalta kappaleita hakukriteerien perusteella."
+
+#: src/skins/ui_manager.c:264
+msgid "Invert Selection"
+msgstr "Käänteinen valinta"
+
+#: src/skins/ui_manager.c:265
+msgid "Inverts the selected and unselected entries."
+msgstr "Kääntää nykyisen valinnan."
+
+#: src/skins/ui_manager.c:268
+msgid "Select All"
+msgstr "Valitse kaikki"
+
+#: src/skins/ui_manager.c:269
+msgid "Selects all of the playlist entries."
+msgstr "Valitsee kaikki soittolistan kappaleet."
+
+#: src/skins/ui_manager.c:272
+msgid "Select None"
+msgstr "Ei mitään"
+
+#: src/skins/ui_manager.c:273
+msgid "Deselects all of the playlist entries."
+msgstr "Poista kaikki valinnat."
+
+#: src/skins/ui_manager.c:278
+msgid "Remove All"
+msgstr "Poista kaikki"
+
+#: src/skins/ui_manager.c:279
+msgid "Removes all entries from the playlist."
+msgstr "Poistaa kaikki kappaleet soittolistalta."
+
+#: src/skins/ui_manager.c:282
+msgid "Clear Queue"
+msgstr "Tyhjennä jono"
+
+#: src/skins/ui_manager.c:283
+msgid "Clears the queue associated with this playlist."
+msgstr "Tyhjentää tämän soittolistan jonon."
+
+#: src/skins/ui_manager.c:286
+msgid "Remove Unavailable Files"
+msgstr "Poista ei saatavilla olevat tiedostot"
+
+#: src/skins/ui_manager.c:287
+msgid "Removes unavailable files from the playlist."
+msgstr "Poistaa soittolistalta tiedostot, joita ei ole saatavilla."
+
+#: src/skins/ui_manager.c:290
+msgid "Remove Duplicates"
+msgstr "Poista kopiot"
+
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
+msgid "By Title"
+msgstr "Nimen mukaan"
+
+#: src/skins/ui_manager.c:293
+msgid "Removes duplicate entries from the playlist by title."
+msgstr "Poista soittolistalta kappaleet joilla on sama nimi."
+
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
+msgid "By Filename"
+msgstr "Tiedostonimen mukaan"
+
+#: src/skins/ui_manager.c:297
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr "Poista soittolistalta kappaleet joilla on sama tiedostonimi."
+
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
+msgid "By Path + Filename"
+msgstr "Polun ja tiedostonimen mukaan"
+
+#: src/skins/ui_manager.c:301
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr "Poista soittolistalta kappaleet joilla on sama tiedostopolku."
+
+#: src/skins/ui_manager.c:304
+msgid "Remove Unselected"
+msgstr "Poista ei valitut"
+
+#: src/skins/ui_manager.c:305
+msgid "Remove unselected entries from the playlist."
+msgstr "Poista soittolistalta kappaleet jotka eivät ole valittuna."
+
+#: src/skins/ui_manager.c:308
+msgid "Remove Selected"
+msgstr "Poista valitut"
+
+#: src/skins/ui_manager.c:309
+msgid "Remove selected entries from the playlist."
+msgstr "Poista soittolistalta kappaleet jotka ovat valittuna."
+
+#: src/skins/ui_manager.c:314
+msgid "Randomize List"
+msgstr "Sekoita lista"
+
+#: src/skins/ui_manager.c:315
+msgid "Randomizes the playlist."
+msgstr "Sekoittaa soittolistan satunnaiseen järjestykseen."
+
+#: src/skins/ui_manager.c:318
+msgid "Reverse List"
+msgstr "Käännä lista"
+
+#: src/skins/ui_manager.c:319
+msgid "Reverses the playlist."
+msgstr "Lajittelee listan käänteiseen järjestykseen."
+
+#: src/skins/ui_manager.c:322
+msgid "Sort List"
+msgstr "Lajittele lista"
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "Sorts the list by title."
+msgstr "Lajittelee listan nimen perusteella."
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+msgid "By Album"
+msgstr "Albumin mukaan"
+
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+msgid "Sorts the list by album."
+msgstr "Lajittelee listan albumin perusteella."
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+msgid "By Artist"
+msgstr "Esittäjän mukaan"
+
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+msgid "Sorts the list by artist."
+msgstr "Lajittelee listan esittäjän perusteella."
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "Sorts the list by filename."
+msgstr "Lajittelee listan tiedostonimen perusteella."
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "Sorts the list by full pathname."
+msgstr "Järjestä lista tiedostopolun mukaan."
+
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+msgid "By Date"
+msgstr "Päivämäärän mukaan"
+
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+msgid "Sorts the list by modification time."
+msgstr "Järjestä lista muokkausajan mukaan."
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+msgid "By Track Number"
+msgstr "Raidan mukaan"
+
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+msgid "Sorts the list by track number."
+msgstr "Järjestä lista raidan mukaan."
+
+#: src/skins/ui_manager.c:352
+msgid "Sort Selected"
+msgstr "Järjestä valitut"
+
+#: src/skins/ui_manager.c:388
+msgid "File"
+msgstr "Tiedosto"
+
+#: src/skins/ui_manager.c:391
+msgid "Plugin Services"
+msgstr "Liitännäispalvelut"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View Track Details"
+msgstr "Näytä raidan yksityiskohdat"
+
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+msgid "View track details"
+msgstr "Näytä raidan yksityiskohdat"
+
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
+msgid "About Audacious"
+msgstr "Tietoja Audaciouksesta"
+
+#: src/skins/ui_manager.c:402
+msgid "Play File"
+msgstr "Toista tiedosto"
+
+#: src/skins/ui_manager.c:403
+msgid "Load and play a file"
+msgstr "Lataa ja toista tiedosto"
+
+#: src/skins/ui_manager.c:405
+msgid "Play Location"
+msgstr "Toista sijainti"
+
+#: src/skins/ui_manager.c:406
+msgid "Play media from the selected location"
+msgstr "Toista mediaa valitusta sijainnista"
+
+#: src/skins/ui_manager.c:408
+msgid "Plugin services"
+msgstr "Liitännäispalvelut"
+
+#: src/skins/ui_manager.c:410
+msgid "Preferences"
+msgstr "Asetukset"
+
+#: src/skins/ui_manager.c:411
+msgid "Open preferences window"
+msgstr "Avaa asetusikkuna"
+
+#: src/skins/ui_manager.c:414
+msgid "Quit Audacious"
+msgstr "Sulje Audacious"
+
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
+msgid "Set A-B"
+msgstr "Aseta A-B"
+
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
+msgid "Clear A-B"
+msgstr "Tyhjennä A-B"
+
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Siirry tiedostoon"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
+msgid "Jump to Time"
+msgstr "Siirry aikaan"
+
+#: src/skins/ui_manager.c:428
+msgid "Queue Toggle"
+msgstr "Lisää/Poista jonosta"
+
+#: src/skins/ui_manager.c:429
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "Lisää tai poistaa kappaleen soittolistan jonosta."
+
+#: src/skins/ui_manager.c:432
+msgid "Copy"
+msgstr "Kopioi"
+
+#: src/skins/ui_manager.c:435
+msgid "Cut"
+msgstr "Leikkaa"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Liitä"
+
+#: src/skins/ui_manager.c:445
+msgid "Load"
+msgstr "Lataa"
+
+#: src/skins/ui_manager.c:446
+msgid "Import"
+msgstr "Tuo"
+
+#: src/skins/ui_manager.c:447
+msgid "Save"
+msgstr "Tallenna"
+
+#: src/skins/ui_manager.c:448
+msgid "Delete"
+msgstr "Poista"
+
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
+msgid "Preset"
+msgstr "Esiasetus"
+
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
+msgid "Auto-load preset"
+msgstr "Automaattisesti ladattava esiasetus"
+
+#: src/skins/ui_manager.c:454
+msgid "Load auto-load preset"
+msgstr "Lataa automaattisesti ladattava esiasetus"
+
+#: src/skins/ui_manager.c:457
+msgid "Load default preset into equalizer"
+msgstr "Lataa oletusesiasetus taajuuskorjaimeen"
+
+#: src/skins/ui_manager.c:459
+msgid "Zero"
+msgstr "Nolla"
+
+#: src/skins/ui_manager.c:460
+msgid "Set equalizer preset levels to zero"
+msgstr "Aseta taajuuskorjaimen esiasetuksen tasot nollaan"
+
+#: src/skins/ui_manager.c:462
+msgid "From file"
+msgstr "Tiedostosta"
+
+#: src/skins/ui_manager.c:463
+msgid "Load preset from file"
+msgstr "Lataa esiasetus tiedostosta"
+
+#: src/skins/ui_manager.c:465
+msgid "From WinAMP EQF file"
+msgstr "Winampin EQF-tiedostosta"
+
+#: src/skins/ui_manager.c:466
+msgid "Load preset from WinAMP EQF file"
+msgstr "Lataa esiasetus Winampin EQF-tiedostosta"
+
+#: src/skins/ui_manager.c:468
+msgid "WinAMP Presets"
+msgstr "Winampin esiasetukset"
+
+#: src/skins/ui_manager.c:469
+msgid "Import WinAMP presets"
+msgstr "Tuo Winampin esiasetukset"
+
+#: src/skins/ui_manager.c:475
+msgid "Save auto-load preset"
+msgstr "Tallenna automaattisesti ladattava esiasetus"
+
+#: src/skins/ui_manager.c:478
+msgid "Save default preset"
+msgstr "Tallenna oletusesiasetus"
+
+#: src/skins/ui_manager.c:480
+msgid "To file"
+msgstr "Tiedostoon"
+
+#: src/skins/ui_manager.c:481
+msgid "Save preset to file"
+msgstr "Tallenna esiasetus tiedostoon"
+
+#: src/skins/ui_manager.c:483
+msgid "To WinAMP EQF file"
+msgstr "Winampin EQF-tiedostoon"
+
+#: src/skins/ui_manager.c:484
+msgid "Save preset to WinAMP EQF file"
+msgstr "Tallenna esiasetus Winampin EQF-tiedostoon"
+
+#: src/skins/ui_manager.c:490
+msgid "Delete auto-load preset"
+msgstr "Poista automaattisesti ladattava esiasetus"
+
+#: src/skins/ui_playlist.c:244
+msgid "Search entries in active playlist"
+msgstr "Etsi kappaleita aktiivisesta soittolistasta"
+
+#: src/skins/ui_playlist.c:251
+msgid ""
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr ""
+"Etsi kappaleita soittolistalta täyttämällä yhden tai useamman kentistä. "
+"Kentät käyttävät säännöllisten lausekkeiden syntaksia, kirjainkoolla ei ole "
+"merkitystä. Jos et tiedä kuinka säännöllisiä lausekkeita käytetään, kirjoita "
+"kenttään suoraan se mitä haluat etsiä."
+
+#: src/skins/ui_playlist.c:259
+msgid "Title: "
+msgstr "Nimi:"
+
+#: src/skins/ui_playlist.c:267
+msgid "Album: "
+msgstr "Albumi:"
+
+#: src/skins/ui_playlist.c:275
+msgid "Artist: "
+msgstr "Esittäjä:"
+
+#: src/skins/ui_playlist.c:283
+msgid "Filename: "
+msgstr "Tiedostonimi:"
+
+#: src/skins/ui_playlist.c:292
+msgid "Clear previous selection before searching"
+msgstr "Tyhjennä aiempi valinta ennen hakemista"
+
+#: src/skins/ui_playlist.c:295
+msgid "Automatically toggle queue for matching entries"
+msgstr "Lisää tai poista automaattisesti täsmäävät kappaleet jonosta"
+
+#: src/skins/ui_playlist.c:298
+msgid "Create a new playlist with matching entries"
+msgstr "Luo uusi soittolista täsmäävistä kappaleista"
+
+#: src/skins/ui_playlist.c:738
+msgid "Audacious Playlist Editor"
+msgstr "Audaciouksen soittolistan muokkain"
+
+#: src/skins/ui_playlist.c:772
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d / %d)"
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr "Pakattu Winamp 2.x skini"
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr "Pakkaamaton Winamp 2.x skini"
+
+#: src/skins/util.c:773
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr "Ei voitu luoda kansiota (%s): %s\n"
+
+#: src/sndfile/plugin.c:416
+msgid ""
+"Based on the xmms_sndfile plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Perustuu xmms_sndfile-liitännäiselle:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Muokannut Audacioukselle Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/sndfile/plugin.c:435
+msgid "Sndfile Plugin"
+msgstr "Sndfile-liitännäinen"
+
+#: src/sndio/sndio.c:172
+msgid "About Sndio Output Plugin"
+msgstr "Tietoja Sndio Output -liitännäisestä"
+
+#: src/sndio/sndio.c:173
+msgid ""
+"Sndio Output Plugin\n"
+"\n"
+"Written by Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Sndio Output -liitännäinen\n"
+"\n"
+"Luonut Thomas Pfaff <tpfaff@tp76.info>\n"
+
+#: src/sndio/sndio.c:248
+msgid "Unsupported format"
+msgstr "Formaattia ei tueta"
+
+#: src/sndio/sndio.c:249
+msgid ""
+"A format not supported by the audio device was requested.\n"
+"\n"
+"Please try again with the sndiod(1) server running."
+msgstr ""
+"Yritettiin toistaa formaattia jota äänilaite ei tue.\n"
+"\n"
+"Yritä uudelleen kun sndiod(1) palvelin on käynnissä."
+
+#: src/sndio/sndio.c:384
+msgid "sndio device"
+msgstr "sndio-laite"
+
+#: src/sndio/sndio.c:400
+msgid "(empty means default)"
+msgstr "(tyhjä tarkoittaa oletusta)"
+
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Peruuta"
+
+#: src/song_change/song_change.c:54
+msgid "Song Change"
+msgstr "Kappaleen vaihtuminen"
+
+#: src/song_change/song_change.c:436
+msgid "Command to run when Audacious starts a new song."
+msgstr "Komento joka ajetaan kun kappaleen toisto alkaa."
+
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
+msgid "Command:"
+msgstr "Komento:"
+
+#: src/song_change/song_change.c:442
+msgid "Command to run toward the end of a song."
+msgstr "Komento joka ajetaan kun kappale lähestyy loppua."
+
+#: src/song_change/song_change.c:448
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr "Komento joka ajetaan kun päästään soittolistan loppuun."
+
+#: src/song_change/song_change.c:454
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr ""
+"Komento joka ajetaan kun kappaleen nimi vaihtuu (esim. internet-virrat)."
+
+#: src/song_change/song_change.c:460
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command):\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%l: Length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr ""
+"Voit käyttää seuraavia merkkijonoja jotka \n"
+"korvataan komentoa kutsuttaessa.\n"
+"(kaikki eivät välttämättä ole hyödyllisiä):\n"
+"\n"
+"%F: taajuus (hertseinä)\n"
+"%c: kanavien lukumäärä\n"
+"%f: tiedostopolku\n"
+"%l: kesto (millisekunteina)\n"
+"%n tai %s: kappaleen nimi\n"
+"%r: nopeus (bittejä/sekunti)\n"
+"%t: sija soittolistassa (%02d)\n"
+"%p: toistetaanko jotain (1 tai 0)\n"
+"%a: esittäjä\n"
+"%b: albumi\n"
+"%T: kappaleen nimi"
+
+#: src/song_change/song_change.c:487
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr ""
+"Komentoriville syötettävät parametrit tulisi asettaa "
+"lainausmerkkien sisään. Lainausmerkkien käyttämättä jättäminen on "
+"tietoturvariski."
+
+#: src/song_change/song_change.c:498
+msgid "Commands"
+msgstr "Komennot"
+
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
+msgid "Speed and Pitch"
+msgstr "Nopeus ja sävelkorkeus"
+
+#: src/speed-pitch/speed-pitch.c:226
+msgid "Speed:"
+msgstr "Nopeus:"
+
+#: src/speed-pitch/speed-pitch.c:229
+msgid "Pitch:"
+msgstr "Sävelkorkeus:"
+
+#: src/speed-pitch/speed-pitch.c:264
+msgid "Speed and Pitch"
+msgstr "Nopeus ja sävelkorkeus"
+
+#: src/statusicon/statusicon.c:390
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+"Tilaikoni-liitännäinen\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Tämä liitännäinen tarjoaa järjestelmäpalkkiin sijoitettavan ikonin."
+
+#: src/statusicon/statusicon.c:397
+msgid "Mouse Scroll Action"
+msgstr "Hiiren rullan vieritystoiminto"
+
+#: src/statusicon/statusicon.c:398
+msgid "Change volume"
+msgstr "Muuta äänenvoimakkuutta"
+
+#: src/statusicon/statusicon.c:401
+msgid "Change playing song"
+msgstr "Vaihda kappaletta"
+
+#: src/statusicon/statusicon.c:404
+msgid "Other Settings"
+msgstr "Muut asetukset"
+
+#: src/statusicon/statusicon.c:405
+msgid "Disable the popup window"
+msgstr "Poista ponnahdusikkuna käytöstä"
+
+#: src/statusicon/statusicon.c:407
+msgid "Close to the system tray"
+msgstr "Sulje järjestelmäpalkkiin"
+
+#: src/statusicon/statusicon.c:409
+msgid "Advance in playlist when scrolling upward"
+msgstr "Etene soittolistassa kun vieritetään ylöspäin"
+
+#: src/statusicon/statusicon.c:418
+msgid "Status Icon"
+msgstr "Tilaikoni"
+
+#: src/stereo_plugin/stereo.c:17
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+"Extra Stereo -liitännäinen\n"
+"\n"
+"By Johan Levin, 1999"
+
+#: src/stereo_plugin/stereo.c:25
+msgid "Extra Stereo"
+msgstr "Extra Stereo"
+
+#: src/stereo_plugin/stereo.c:36
+msgid "Extra Stereo"
+msgstr "Extra Stereo"
+
+#: src/tonegen/tonegen.c:84
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.c:84
+msgid "Tone Generator: "
+msgstr "Sointugeneraattori:"
+
+#: src/tonegen/tonegen.c:197
+msgid ""
+"Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
+msgstr ""
+"Siniaaltogeneraattori, luonut Håvard Kvålen <havardk@xmms.org>\n"
+"Muokannut Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Käyttääksesi, lisää URL: tone://frequency1;frequency2;frequency3;...\n"
+"esim. tone://2000;2005 toistaaksesi 2000 Hz:n ja 2005 Hz:n soinnun"
+
+#: src/tonegen/tonegen.c:206
+msgid "Tone Generator"
+msgstr "Sointugeneraattori"
+
+#: src/unix-io/unix-io.c:243
+msgid ""
+"File I/O Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
+msgstr ""
+"Tiedosto I/O -liitännäinen Audacioukselle\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"TÄMÄ LIITÄNNÄINEN ON TÄRKEÄ. ÄLÄ POISTA TÄTÄ KÄYTÖSTÄ."
+
+#: src/unix-io/unix-io.c:266
+msgid "File I/O Plugin"
+msgstr "Tiedosto I/O -liitännäinen"
+
+#: src/voice_removal/voice_removal.c:58
+msgid "Voice Removal"
+msgstr "Äänen poisto"
+
+#: src/vorbis/vorbis.c:562
+msgid ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Based on the Xiph.org Foundation's Ogg Vorbis Plugin:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Original code by:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contributions from:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Audaciouksen Ogg Vorbis -dekooderi\n"
+"\n"
+"Perustuu Xiph.org säätiön Ogg Vorbis -liitännäiselle:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Alkuperäinen kehittäjä:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Kontribuutiot:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
+
+#: src/vorbis/vorbis.c:582
+msgid "Ogg Vorbis Decoder"
+msgstr "Ogg Vorbis -dekooderi"
+
+#: src/vtx/vtx.c:242
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Vortex tiedostoformaatin toistin, luonut Sashnov Alexander <sashnov@ngs.ru>\n"
+"Perustuu in_vtx.dll:ään, luonut Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious liitännäisen luonut Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/vtx/vtx.c:248
+msgid "VTX Decoder"
+msgstr "VTX-dekooderi"
+
+#: src/wavpack/wavpack.c:282
+msgid "lossy (hybrid)"
+msgstr "häviöllinen (hybridi)"
+
+#: src/wavpack/wavpack.c:284
+msgid "lossy"
+msgstr "häviöllinen"
+
+#: src/wavpack/wavpack.c:334
+msgid ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
+msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Osan liitännäisen koodista kirjoittanut Miles Egan."
+
+#: src/wavpack/wavpack.c:341
+msgid "WavPack Decoder"
+msgstr "WavPack-dekooderi"
+
+#: src/xsf/plugin.c:274
+msgid "2SF Decoder"
+msgstr "2SF-dekooderi"
+
+#: src/xspf/xspf.c:440
+msgid "XML Shareable Playlists (XSPF)"
+msgstr "XML jaettavat soittolistat (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-liitännäinen - valitse tiedosto"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Järjestä _valitut"

audacious-plugins-3.3.4.tar.bz2/po/fr.po -> audacious-plugins-3.4.2.tar.bz2/po/fr.po Changed

@@ -1,593 +1,665 @@
 # French translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Alain-Olivier Breysse <yahoe.001@gmail.com>, 2012.
-# <jagw40k@free.fr>, 2011-2012.
-# Jean-Alexandre Anglès d'Auriac <jagw40k@free.fr>, 2011.
+# Alain-Olivier Breysse <yahoe.001@gmail.com>, 2012-2013
+# Oxayotl <jagw40k@free.fr>, 2013
+# Oxayotl <jagw40k@free.fr>, 2011-2012
+# Jean-Alexandre Anglès d'Auriac <jagw40k@free.fr>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-17 01:53+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-09-11 03:31+0000\n"
 "Last-Translator: Alain-Olivier Breysse <yahoe.001@gmail.com>\n"
-"Language-Team: French\n"
+"Language-Team: French (http://www.transifex.com/projects/p/audacious/"
+"language/fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "stereo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "son ambiophonique"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Décodeur AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "séquencé"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Lecteur AdLib)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "Un greffon pour lancer la lecture à une période spécifiée à l'avance\n\nÉcrit à l'origine par Adam Feakin et Daniel Stodden."
+msgstr ""
+"Un greffon pour lancer la lecture à une période spécifiée à l'avance\n"
+"\n"
+"Écrit à l'origine par Adam Feakin et Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarme"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Ceci est votre réveil."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Paramètres de l'alarme"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Heure"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "heures"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minutes"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Horaire\n"
+" Alarme à : \n"
+" L'heure à laquelle l'alarme se déclenche\n"
+"\n"
+" Silencieux après : \n"
+" Arrêt de l'alarme après cette durée.\n"
+" (si la fenêtre de dialogue de réveil n'est pas fermé)\n"
+"\n"
+"Jours\n"
+" Jours :\n"
+" Choisissez les jours d'activité de l'alarme.\n"
+"\n"
+" Heure :\n"
+" Choisissez l'heure à laquelle l'alarme se déclenchera\n"
+" ce jour-là ou cochez l'utilisation de l'horaire par défaut.\n"
+"\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Arrêt après :"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Volume\n"
+"Fondu :\n"
+"Ajuste le volume au niveau choisi\n"
+"pour cette durée.\n"
+"\n"
+"Débute à :\n"
+"Commence le fondu à ce volume.\n"
+"\n"
+"Final :\n"
+"Le volume final du fondu. Si le fondu\n"
+"est à 0 le volume est réglé ainsi et la lecture\n"
+"commence.\n"
+"\n"
+"Options :\n"
+"Commandes additionnelles :\n"
+"Exécute cette commande à l'heure de l'alarme.\n"
+"\n"
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+" Liste de lecture :\n"
+"\n"
+" Charge cette liste de lecture. Si aucune liste de lecture\n"
+" n'est précisée, la liste de lecture actuelle sera utilisée. \n"
+" L'adresse d'un flux mp3 ou ogg peu aussi être choisie.\n"
+"\n"
+" Pense-bête :\n"
+" Affiche un pense-bête quand l'alarme se déclenche.\n"
+" Tapez le rappel dans le champs de texte et cochez\n"
+" la case pour que le rappel soit affiché."
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Se déclencher (par défaut) à :"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Ceci est votre réveil."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Choisissez les jours où l'alarme se déclenche"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Votre pense-bête du jour est ..."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Défaut"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Pense-bête"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Jour"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Lundi"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Vendredi"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Samedi"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Lundi"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Paramètres de l'alarme"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Heure"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Se déclencher (par défaut) à :"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Arrêt après :"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "heures"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minutes"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Choisissez les jours où l'alarme se déclenche"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Jour"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Défaut"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Jours"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Fondu"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "secondes"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Volume actuel"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Commencer à"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Finir à"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Volume actuel"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Commande additionnelle"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "activer"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Liste de lecture (optionnel)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Choisir une liste de lecture"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Pense-bête"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Afficher le pense-bête suivant"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Options"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Que signifient ces options ?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nHeure\n Alarme à : \n Heure de l'alarme.\n\n Silencieux après : \n Arrêt de l'alarme après cette durée.\n (si la fenêtre de dialogue de réveil n'est pas fermé)\n\nJours\n Jours :\n Choisissez les jours d'activité de l'alarme.\n\n Heure :\n Choisissez l'heure journalière de l'alarme,\n ou cochez l'utilisation de l'heure par défaut.\n\n\nVolume\n Fondu : \n Augmente le volume progressivement\n pour atteindre le niveau choisi au bout de la durée choisie\n\n Commence à : \n Commence le fondu à partir de ce volume.\n\n Fini à : \n Volume final.\n\nOptions :\n Commandes additionnelles :\n Exécute cette commande à l'heure de l'alarme.\n\n Liste de lecture : \n Charger cette liste de lecture (extension .m3u\n requise). Si aucune liste de lecture n'est précisée, alors\n la liste actuelle sera utilisée.\n L'adresse URL d'un flux MP3/OGG peut aussi être saisie.\n\n Pense-bête :\n Affiche un pense-bête durant l'alarme. Tapez le \n dans la boîte et cochez la case si vous voulez le\n voir s'afficher.\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Aide"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Annuler"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Votre pense-bête pour aujourd'hui est…"
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Merci"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Pochette"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Périphérique PCM par défaut"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Mélangeur audio par défaut"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Préférences du greffon de sortie ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Périphérique PCM :"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Canal de mélange audio :"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Mélangeur :"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Contourner le problème d'interruption du flux « drain hang-up »"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "Greffon de sortie ALSA pour Audacious\n© Copyright 2009-2012 John Lindgren\nRemerciements à Wiliam Pitcock, auteur du greffon de sortie ALSA NG, dont le code a servi de référence lorsque la documentation d'ALSA n'était pas suffisante"
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"Greffon de sortie ALSA pour Audacious\n"
+"© Copyright 2009-2012 John Lindgren\n"
+"Remerciements à Wiliam Pitcock, auteur du greffon de sortie ALSA NG, dont le "
+"code a servi de référence lorsque la documentation d'ALSA n'était pas "
+"suffisante"
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "Sortie ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (Lecteur MIDI)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Vous n'avez pas choisi les ports du séquenceur pour la lecture MIDI. Vous pouvez le faire dans les préférences du greffon MIDI."
+msgstr ""
+"Vous n'avez pas choisi les ports du séquenceur pour la lecture MIDI. Vous "
+"pouvez le faire dans les préférences du greffon MIDI."
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (Lecteur MIDI)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "ALSA "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Ce système envoie les événements MIDI à l'ensemble des ports du séquenceur « ALSA » que l'utilisateur a spécifié. L'interface du séquenceur « ALSA » offre des possibilités variées : elle peut fournir des ports aux synthétiseurs matériels des cartes sons (« emu10k1 », par exemple), mais aussi aux synthétiseurs logiciels, aux périphériques externes, etc.\nCe système de sortie ne produit pas de flux audio : les événements MIDI sont gérés directement par les périphériques et les applications associés aux ports « ALSA ». Par exemple, les événements MIDI envoyés au synthétiseur matériel seront directement interprétés.\n\nAuteur : Giacomo Lozito."
+msgstr ""
+"Ce système envoie les événements MIDI à l'ensemble des ports du séquenceur « "
+"ALSA » que l'utilisateur a spécifié. L'interface du séquenceur « ALSA » "
+"offre des possibilités variées : elle peut fournir des ports aux "
+"synthétiseurs matériels des cartes sons (« emu10k1 », par exemple), mais "
+"aussi aux synthétiseurs logiciels, aux périphériques externes, etc.\n"
+"Ce système de sortie ne produit pas de flux audio : les événements MIDI sont "
+"gérés directement par les périphériques et les applications associés aux "
+"ports « ALSA ». Par exemple, les événements MIDI envoyés au synthétiseur "
+"matériel seront directement interprétés.\n"
+"\n"
+"Auteur : Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "FluidSynth "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Ce sytème de sortie produit un flux audio en envoyant les évènements MIDI vers FluidSynth, un synthétiseur logiciel en temps réel conçu d'après la spécification SoundFont2 (www.fluidsynth.org).\nLe flux produit peut être manipulé par des greffons d'effet de lecture et est traité par le greffon de sortie choisi.\nSystème de sortie écrit par Giacomo Lozito."
+msgstr ""
+"Ce sytème de sortie produit un flux audio en envoyant les évènements MIDI "
+"vers FluidSynth, un synthétiseur logiciel en temps réel conçu d'après la "
+"spécification SoundFont2 (www.fluidsynth.org).\n"
+"Le flux produit peut être manipulé par des greffons d'effet de lecture et "
+"est traité par le greffon de sortie choisi.\n"
+"Système de sortie écrit par Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Port"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Nom du client"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Nom du port"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Ports de sortie ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Carte son : "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Contrôle du mélangeur : "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Paramètres du mélangeur"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "Sortie\n\"ALSA\""
+msgstr ""
+"Sortie\n"
+"\"ALSA\""
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - Informations sur le système de sortie"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Choix du système de sortie"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Paramètres de lecture"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transposition : "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Décalage des percussions :"
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Paramètres avancés"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "précalculer la durée des fichiers MIDI dans la liste de lecture"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "extraire les commentaires des fichiers MIDI (s'ils sont disponibles)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "extraire les paroles des fichiers MIDI (si elles sont disponibles)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - choix du fichier"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Paramètres d'AMIDI-Plug"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - choix du fichier « SoundFont »"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Paramètres de la banque de sons « SoundFont »"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Nom du fichier"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Taille (octets)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Charger la banque de sons au démarrage du lecteur"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Charger la banque de sons à la lecture du premier fichier MIDI"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Paramètres du synthétiseur"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "Gain"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "valeur par défaut"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "valeur :"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "Polyphonie"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "Réverbération"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "oui"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "non"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "Effet de chœur"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "Fréquence d'échantillonnage"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "personnalisé "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Sortie\n'FluidSynth'"
+msgstr ""
+"Sortie\n"
+"'FluidSynth'"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nom :"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " Informations sur le fichier MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Format :"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Durée (msec.) :"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Nombre de pistes :"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM :"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg) :"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Division du temps :"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
-msgstr " Commentaires et paroles du fichier MIDI "
+msgstr ""
+" Commentaires et paroles du fichier MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* aucun commentaire n'est disponible dans ce fichier MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* aucune parole n'est disponible dans ce fichier MIDI"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (format UTF-8 invalide)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "À propos d'AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr "AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -608,7 +680,26 @@
 "\n"
 "Tony Vroon\n"
 "for the good help with alpha testing"
-msgstr "\nlecteur musical modulaire MIDI\nhttp://www.develia.org/projects.php?p=amidiplug\n\nécrit par Giacomo Lozito\n<james@develia.org>\n\nun grand merci à...\n\nClemens Ladisch et Jaroslav Kysela\npour leurs excellents programmes aplaymidi et amixer ;\nils furent très utiles, avec les docs alsa-lib, afin d'en apprendre\nplus à propos de l'interface de programmation ALSA\n\nAlfredo Spadafina\npour le beau logo de clavier MIDI\n\nTony Vroon\npour son aide appréciée durant les tests alpha"
+msgstr ""
+"\n"
+"lecteur musical modulaire MIDI\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"écrit par Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"un grand merci à...\n"
+"\n"
+"Clemens Ladisch et Jaroslav Kysela\n"
+"pour leurs excellents programmes aplaymidi et amixer ;\n"
+"ils furent très utiles, avec les docs alsa-lib, afin d'en apprendre\n"
+"plus à propos de l'interface de programmation ALSA\n"
+"\n"
+"Alfredo Spadafina\n"
+"pour le beau logo de clavier MIDI\n"
+"\n"
+"Tony Vroon\n"
+"pour son aide appréciée durant les tests alpha"
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
@@ -640,7 +731,9 @@
 
 #: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "Déclenche l'affichage à l'écran lorsqu'une entrée de la liste de lecture est lue."
+msgstr ""
+"Déclenche l'affichage à l'écran lorsqu'une entrée de la liste de lecture est "
+"lue."
 
 #: src/aosd/aosd_trigger.c:79
 msgid "Title Change"
@@ -651,7 +744,11 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Déclenche l'affichage à l'écran si, pendant la lecture, le titre du morceau change, alors que le nom du fichier est identique. Cette option est particulièrement utile pour afficher le changement de titre des flux Internet."
+msgstr ""
+"Déclenche l'affichage à l'écran si, pendant la lecture, le titre du morceau "
+"change, alors que le nom du fichier est identique. Cette option est "
+"particulièrement utile pour afficher le changement de titre des flux "
+"Internet."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -667,7 +764,8 @@
 
 #: src/aosd/aosd_trigger.c:92
 msgid "Triggers OSD when playback is unpaused."
-msgstr "Déclenche l'affichage à l'écran lorsque la pause de lecture eest désactivée."
+msgstr ""
+"Déclenche l'affichage à l'écran lorsque la pause de lecture eest désactivée."
 
 #: src/aosd/aosd_ui.c:168
 msgid "Placement"
@@ -783,8 +881,13 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Aucun gestionnaire composite n'a été détecté;\nà moins que vous ne soyez certain d'utiliser un tel gestionnaire,\nveuillez activer un gestionnaire composite sinon l'affichage à l'écran ne fonctionnera pas correctement."
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Aucun gestionnaire composite n'a été détecté;\n"
+"à moins que vous ne soyez certain d'utiliser un tel gestionnaire,\n"
+"veuillez activer un gestionnaire composite sinon l'affichage à l'écran ne "
+"fonctionnera pas correctement."
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -847,47 +950,47 @@
 msgid "Misc"
 msgstr "Options diverses"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "Listes de lecture ASXv1 et ASXv2"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Listes de lecture au format Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Couleur"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Oscilloscope flou"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Préférences de stéréophonique-vers-binaural Bauer"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Niveau d'entrée :"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Fréquence de coupure :"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Préréglages :"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Stéréophonique-vers-binaural Bauer (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Analyseur de spectre"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -897,233 +1000,250 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "© Copyright 2007-2012 Calin Crisan <ccrisan@gmail.com> et autres.\n\nUn grand merci aux développeurs de libcdio <http://www.gnu.org/software/libcdio/>\net à ceux de libcddb <http://libcddb.sourceforge.net/>.\n\nDe même, merci à Tony Vroon pour m'avoir épaulé et guidé.\n\nCeci était un projet Google Summer of Code de 2007."
+msgstr ""
+"© Copyright 2007-2012 Calin Crisan <ccrisan@gmail.com> et autres.\n"
+"\n"
+"Un grand merci aux développeurs de libcdio <http://www.gnu.org/software/"
+"libcdio/>\n"
+"et à ceux de libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"De même, merci à Tony Vroon pour m'avoir épaulé et guidé.\n"
+"\n"
+"Ceci était un projet Google Summer of Code de 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Lecteur"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Vitesse de lecture : "
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Forcer le lecteur : "
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Utiliser CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Utiliser CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Utiliser « HTTP » à la place de « CDDBP »"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Serveur : "
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Chemin : "
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Port :"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Greffon CD audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Échec de l'initialisation du sous-système cdio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URL %s invalide."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Piste %d non trouvée."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr "La piste %d en est une de données."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Échec de l'ouverture de la sortie audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Erreur de lecture du CD audio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "CD audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Échec de l'ouverture du lecteur de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "Aucun lecture de CD audio n'a été trouvé."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "N'a pu finir d'initialiser le lecteur CD ouvert."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Échec de la récupération du premier et/ou du dernier numéro de piste"
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr "Impossible de lire le numéro de secteur logique (LSN) de début ou de fin pour la piste %d."
+msgstr ""
+"Impossible de lire le numéro de secteur logique (LSN) de début ou de fin "
+"pour la piste %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Échec de la connexion à cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Échec de la requête auprès du serveur CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Échec de la requête auprès du serveur CDDB : %s ."
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Échec de la lecture des informations cddb : %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Le lecteur est vide"
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Type de disque non pris en charge"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Lire les pistes du CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Lire le CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Éléments du menu CD Audio"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Compression"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Volume central :"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Plage dynamique :"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Greffon compresseur (DRC) pour Audacious\n© Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Greffon compresseur (DRC) pour Audacious\n"
+"© Copyright 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Compresseur de gamme dynamique"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Décodeur « Game Console Music »"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Général"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Lecture"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Grave :"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "secondes"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Aigu :"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Durée par défaut du morceau :"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Rééchantillonnage"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Activer le rééchantillonnage"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Fréquence de rééchantillonnage :"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignorer les métadonnées SPC relatives à la durée"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Augmenter la réverbération"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "La durée par défaut du morceau, exprimée en secondes, est utilisée pour les morceaux qui ne disposent pas d'information de durée (les pistes en boucle, par exemple)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"La durée par défaut du morceau, exprimée en secondes, est utilisée pour les "
+"morceaux qui ne disposent pas d'information de durée (les pistes en boucle, "
+"par exemple)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1131,88 +1251,109 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "Moteur de décodage de musique pour console basé sur Game_Music_Emu 0.5.2\nFormats pris en charge : AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n\nGreffon Audacious par :\nWilliam Pitcock <nenolod@dereferenced.org>\nShay Green <gblargg@gmail.com>"
+msgstr ""
+"Moteur de décodage de musique pour console basé sur Game_Music_Emu 0.5.2\n"
+"Formats pris en charge : AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, "
+"VGZ\n"
+"\n"
+"Greffon Audacious par :\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "Le fondu enchaîné a échoué car les morceaux avaient un nombre différents de canaux. Vous pouvez utiliser le « Mélangeur de canaux » pour les uniformiser."
+msgstr ""
+"Le fondu enchaîné a échoué car les morceaux avaient un nombre différents de "
+"canaux. Vous pouvez utiliser le « Mélangeur de canaux » pour les "
+"uniformiser."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Le fondu enchaîné a échoué car les morceaux avaient des taux d’échantillonnage différents. Vous pouvez utiliser le « Convertisseur de taux d’échantillonnage » pour les uniformiser."
+msgstr ""
+"Le fondu enchaîné a échoué car les morceaux avaient des taux "
+"d’échantillonnage différents. Vous pouvez utiliser le « Convertisseur de "
+"taux d’échantillonnage » pour les uniformiser."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Greffon de fondus pour Audacious\n© Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Greffon de fondus pour Audacious\n"
+"© Copyright 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Fondu enchaîné"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Recouvrement:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Fondu enchaîné"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Crystaliseur"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intensité :"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Cristalliseur "
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Greffon des fichiers .cue"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Écho"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Délai : "
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Retour : "
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Volume : "
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Effet d'écho\nPar Johan Levin, 1999\n\nEffet d'écho ambiophonique par Carl van Schalk, 1999"
+msgstr ""
+"Effet d'écho\n"
+"Par Johan Levin, 1999\n"
+"\n"
+"Effet d'écho ambiophonique par Carl van Schalk, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Écho"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1220,9 +1361,15 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Greffon pour Audacious de décodage multiformat basé \nsur le cadre d'applications multimédia FFmpeg (http://www.ffmpeg.org/)\n\nGreffon Audacious par :\nWilliam Pitcock <nenolod@nenolod.net>\nMatti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Greffon pour Audacious de décodage multiformat basé \n"
+"sur le cadre d'applications multimédia FFmpeg (http://www.ffmpeg.org/)\n"
+"\n"
+"Greffon Audacious par :\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Greffon FFmpeg"
 
@@ -1260,7 +1407,7 @@
 
 #: src/filewriter/filewriter.c:484
 msgid "original file tags"
-msgstr "labels du fichier d'origine"
+msgstr "étiquettes du fichier d'origine"
 
 #: src/filewriter/filewriter.c:490
 msgid "original filename"
@@ -1290,7 +1437,20 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Ce programme est un logiciel libre; vous pouvez le redistribuer et/ou le modifier selon les termes de la Licence Publique Générale GNU publiée par\na Free Software Foundation; version 2 ou bien toute autre version\nultérieure choisie par vous.\n\nCe programme est distribué car potentiellement utile, mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties de COMMERCIALISATION ou d'ADAPTATION DANS UN BUT SPÉCIFIQUE. \nReportez-vous à la Licence Publique Générale GNU pour plus de détails.\n\nVous devez avoir reçu une copie de la Licence Publique Générale GNU en même temps que ce programme ; si ce n’est pas le cas, écrivez à la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Ce programme est un logiciel libre; vous pouvez le redistribuer et/ou le "
+"modifier selon les termes de la Licence Publique Générale GNU tel qu'elle "
+"est publiée par la Free Software Foundation, en utilisant la version 2 de "
+"celle-ci, ou une version ultérieure, à votre discrétion.\n"
+"\n"
+"Ce programme est distribué car potentiellement utile, mais SANS AUCUNE "
+"GARANTIE, ni explicite ni implicite, y compris les garanties de "
+"COMMERCIALISATION ou d'ADAPTATION DANS UN BUT SPÉCIFIQUE. \n"
+"Reportez-vous à la Licence Publique Générale GNU pour plus de détails.\n"
+"\n"
+"Vous devez avoir reçu une copie de la Licence Publique Générale GNU en même "
+"temps que ce programme ; si ce n’est pas le cas, écrivez à la Free Software "
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1304,11 +1464,13 @@
 msgid "Joint Stereo"
 msgstr "Stéréo combiné"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Stéréo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1356,7 +1518,7 @@
 msgid "Error protection"
 msgstr "Protection contre les erreurs"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Qualité"
 
@@ -1422,556 +1584,641 @@
 
 #: src/filewriter/mp3.c:1167
 msgid "Force addition of version 2 tag"
-msgstr "Forcer l'ajout de la version 2 des labels"
+msgstr "Forcer l'ajout de la version 2 des étiquettes"
 
 #: src/filewriter/mp3.c:1177
 msgid "Only add v1 tag"
-msgstr "Ajouter uniquement la version 1 des labels"
+msgstr "Ajouter uniquement la version 1 des étiquettes"
 
 #: src/filewriter/mp3.c:1184
 msgid "Only add v2 tag"
-msgstr "Ajouter uniquement la version 2 des labels"
+msgstr "Ajouter uniquement la version 2 des étiquettes"
 
 #: src/filewriter/mp3.c:1205
 msgid "Tags"
-msgstr "Labels"
+msgstr "Étiquettes"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Configuration de l'encodeur Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Niveau de qualité (0 - 10) :"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "sans perte"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Code d'origine par\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Code d'origine par\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Décodeur FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "Greffon GIO pour Audacious\n© Copyright 2009-2012 John Lindgren"
+msgstr ""
+"Greffon GIO pour Audacious\n"
+"© Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Greffon GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analyseur de spectre utilisant OpenGL pour Audacious\n"
+"Copyright 2013 Christophe Budé et John Lindgren\n"
+"\n"
+"Basé sur le greffon pour XMMS\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, et "
+"4Front Technologies\n"
+"\n"
+"Licence : GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Analyseur de spectre utilisant OpenGL"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Greffon de support des raccourcis de Gnome\nPermet de contrôler Audacious via les raccourcis de Gnome\n\n© Copyright 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"Greffon de support des raccourcis de Gnome\n"
+"Permet de contrôler Audacious via les raccourcis de Gnome\n"
+"\n"
+"© Copyright 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Raccourcis de Gnome"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Place dans la liste"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Titre"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Année"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Numéro de piste"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Genre"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Position dans la file"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Durée"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Chemin d'accès du fichier"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Nom du fichier"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Titre personnalisé"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Débit binaire"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Choisir les colonnes"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Disponibles :"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Sélectionnées :"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Intégrer à gauche"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Intégrer à droite"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Intégrer en haut"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Intégrer en bas"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Séparer"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Désactiver"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Ouvrir des fichiers..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Ouvrir un adresse _URL..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Ajouter des fichiers..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Ajouter une adresse U_RL..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
-msgstr "Rechercher dans la bibliothèque"
+msgstr "Rechercher dans la _médiathèque"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
-msgstr "À _propos de..."
+msgstr "À propos _de..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Préférences..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Lecture"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Paus_e"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "Pré_cédent"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
-msgstr "_Suivant"
+msgstr "S_uivant"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "_Répéter"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
-msgstr "L_ecture aléatoire"
+msgstr "Lecture _aléatoire"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
-msgstr "N_e pas avancer dans la liste de lecture"
+msgstr "_Ne pas avancer dans la liste de lecture"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Arrêter _après le titre en cours"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Arrêter après cette c_hanson"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
-msgstr "Information sur le morceau..."
+msgstr "_Information sur le morceau..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
-msgstr "Sauter au _temps…"
+msgstr "Sauter vers la _position... (temps)"
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
-msgstr "_Sauter au morceau..."
+msgstr "Sauter au _morceau..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Par _numéro de piste"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Point de répétition _A"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Point de répétition _B"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "_Effacer les points de répétition"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Par _titre"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "Par nom de _fichier"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "Par _chemin de fichier"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Par _numéro de piste"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Par _artiste"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Par a_lbum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "Par al_bum"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Par _date de parution"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "Par _durée"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Par chemin d'accès de _fichier"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Par _titre personnalisé"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "I_nverser l'ordre"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "Ordre _aléatoire"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
-msgstr "Lire cette liste de lecture"
+msgstr "_Lire cette liste de lecture"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Réactualiser"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Retirer les fichiers non disponibles"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Trier"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Trier la sélection"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Enlever les _doublons"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Retirer les fichiers _non disponibles"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Nouvelle liste de lecture"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Re_nommer ..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Fermer"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importer"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Exporter"
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "_Gestionnaire de liste de lecture..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
-msgstr "_Gestionnaire de file d'attente..."
+msgstr "Gestionnaire de file d'_attente..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "Augmenter le _volume"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "_Réduire le volume"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
-msgstr "_Égaliseur"
+msgstr "Éga_liseur"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_ffets audio"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Interface"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Visualisations"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Afficher la barre de _menu"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Afficher la barre d'i_nformation"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Affiche la vis_ualisation « Barre d'infos »"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
-msgstr "Afficher la barre d'_état"
+msgstr "Afficher la _barre d'état"
+
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Afficher le temps _restant"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
-msgstr "Afficher les boutons de fermeture"
+msgstr "Afficher les _boutons de fermeture"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Afficher les _titres des colonnes"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Choisir les _colonnes..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
-msgstr "Afficher le morceau courant au changement de piste"
+msgstr "_Afficher le morceau lu lors d'un changement de piste"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Lecture"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "L_iste de lecture"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Services"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Sortie"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Affichage"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
-msgstr "_Mettre/enlever dans la file"
+msgstr "_Ajouté / retiré de la file"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "Cou_per"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Copier"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Coller"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Sélectionner _tout"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Renommer la piste de lecture …"
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Mise en mémoire tampon..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Erreur"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canaux"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr "Piste précédente"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Lecture"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pause / Reprise"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Arrêt"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "Piste suivante"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
 msgstr "Avancer de 5 secondes"
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
 msgstr "Reculer de 5 secondes"
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
 msgstr "Muet"
 
-#: src/hotkey/gui.c:80
-msgid "Volume Up"
+#: src/hotkey/gui.c:78
+msgid "Volume up"
 msgstr "Augmenter le volume"
 
-#: src/hotkey/gui.c:81
-msgid "Volume Down"
+#: src/hotkey/gui.c:79
+msgid "Volume down"
 msgstr "Réduire le volume"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
 msgstr "Aller au fichier"
 
-#: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Montre/cache le lecteur"
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr "Montrer/cacher les fenêtres du lecteur"
 
-#: src/hotkey/gui.c:84
+#: src/hotkey/gui.c:82
 msgid "Show On-Screen-Display"
 msgstr "Activer l'affichage à l'écran"
 
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
+msgstr "Activer/désactiver la répétition"
+
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
+msgstr "Activer/désactiver la lecture aléatoire"
+
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Active/désactive la répétition"
+msgid "Toggle stop after current"
+msgstr "Activer/désactiver l'arrêt après le morceau en cours"
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Active/désactive la lecture aléatoire"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr "Montre/Active la fenêtre du lecteur"
+msgid "Raise player window(s)"
+msgstr "Monter les fenêtres du lecteur au premier plan"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(aucun)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Il n'est pas recommandé d'associer les boutons\nde la souris principale sans touche de séquence\n(« Ctrl », « VerrMaj », « Maj », etc...)\n\nSouhaitez-vous poursuivre ?"
+msgstr ""
+"Il n'est pas recommandé d'associer les boutons\n"
+"de la souris principale sans touche de séquence\n"
+"(« Ctrl », « VerrMaj », « Maj », etc...)\n"
+"\n"
+"Souhaitez-vous poursuivre ?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Association des boutons de la souris"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Configuration du greffon « Global Hotkey »"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Appuyez sur une combinaison de touches à l'intérieur d'un champ textuel.\nVous pouvez aussi créer des associations avec les boutons de la souris.\n "
+msgstr ""
+"Appuyez sur une combinaison de touches à l'intérieur d'un champ textuel.\n"
+"Vous pouvez aussi créer des associations avec les boutons de la souris.\n"
+" "
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Raccourcis clavier :"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Action : "
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Touche associée :"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1984,104 +2231,132 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "Greffon de raccourcis universels\nPour contrôler le lecteur avec des combinaisons de touches ou avec les touches multimédia\n\n© Copyright 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nLes contributeurs comprennent :\n© Copyright 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n© Copyright 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n Bryn Davies <curious@ihug.com.au>,\n Jonathan A. Davis <davis@jdhouse.org>,\n Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"Greffon de raccourcis universels\n"
+"Pour contrôler le lecteur avec des combinaisons de touches ou avec les "
+"touches multimédia\n"
+"\n"
+"© Copyright 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Les contributeurs comprennent :\n"
+"© Copyright 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"© Copyright 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Raccourcis universels"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Basé sur xmms-jack, par Chris Morgan:\nhttp://xmms-jack.sourceforge.net/\n\nPorté pour Audacious par Giacomo Lozito"
+msgstr ""
+"Basé sur xmms-jack, par Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Porté pour Audacious par Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "Sortie JACK"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Réglages %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Réglages de l'hôte ADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Chemins de recherche des greffons :"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Séparez les différents chemins par : (deux-points).\n Les greffons sont recherchés dans ces chemins ainsi que ceux de la variable LADSPA_PATH.\nAprès avoir ajouté de nouveaux chemins, pressez Entrée pour mettre à jour les greffons disponibles."
+msgstr ""
+"Séparez les différents chemins par : (deux-points).\n"
+" Les greffons sont recherchés dans ces chemins ainsi que ceux de la variable "
+"LADSPA_PATH.\n"
+"Après avoir ajouté de nouveaux chemins, pressez Entrée pour mettre à jour "
+"les greffons disponibles."
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Greffons disponibles :"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Activer"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Greffons activés :"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Paramètres"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "Hôte LADSPA pour Audacious\n© Copyright 2011 John Lindgren"
+msgstr ""
+"Hôte LADSPA pour Audacious\n"
+"© Copyright 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "Hôte LADSPA"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: n'a pas pu initialiser le support de LIRC\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: N'a pas pu lire le fichier de configuration de LIRC\n%s: Veuillez s'il vous plait lire la documentation de LIRC\n%s: sur comment créer un fichier de configuration valide\n"
+msgstr ""
+"%s: N'a pas pu lire le fichier de configuration de LIRC\n"
+"%s: Veuillez s'il vous plait lire la documentation de LIRC\n"
+"%s: sur comment créer un fichier de configuration valide\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: essaie de se reconnecter…\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: commande inconnue « %s »\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: déconnecté de LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: essaiera de se reconnecter toutes les %d secondes…\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2095,155 +2370,326 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "Un greffon simple pour contrôler Audacious à l'aide de la gestion de télécommande par LIRC\n\nAdapté pour Audacious par :\nTony Vroon <chainsaw@gentoo.org>\nJoonas Harjumäki <jharjuma@gmail.com>\n\nBasé sur le greffon LIRC pour XMMS par :\nCarl van Schaik <carl@leg.uct.ac.za>\nChristoph Bartelmus <xmms@bartelmus.de>\nAndrew O. Shadoura <bugzilla@tut.by>\n\nPour plus d'information sur LIRC, se référer à http://lirc.org."
+msgstr ""
+"Un greffon simple pour contrôler Audacious à l'aide de la gestion de "
+"télécommande par LIRC\n"
+"\n"
+"Adapté pour Audacious par :\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Basé sur le greffon LIRC pour XMMS par :\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Pour plus d'information sur LIRC, se référer à http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Connexion"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Se reconnecter automatiquement au serveur LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Se reconnecter au bout de"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "Greffon LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Paroles non disponibles"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Impossible de récupérer %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Impossible de traiter %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Recherche des paroles …"
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Métadonnées de morceau manquantes"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Connexion à lyrics.wikia.com …"
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "Greffon LyricWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "Listes de lecture M3U"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Métronome : %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Métronome : %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "Un métronome par Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nPour l'utiliser, ajoutez une URL sous la forme : tact://beats*num/den\nPar exemple. tact://77 pour battre 77 temps par minutes\nou tact://60*3/4 pour battre 60 temps en mesures 3/4"
+msgstr ""
+"Un métronome par Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Pour l'utiliser, ajoutez une URL sous la forme : tact://beats*num/den\n"
+"Par exemple. tact://77 pour battre 77 temps par minutes\n"
+"ou tact://60*3/4 pour battre 60 temps en mesures 3/4"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Métronome"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Greffon de mélange des canaux pour Audacious\n© Copyright 2011-2012 John Lindgren et Michał Lipski"
+msgstr ""
+"Greffon de mélange des canaux pour Audacious\n"
+"© Copyright 2011-2012 John Lindgren et Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Mélangeur de canaux"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Canaux de sortie :"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Mélangeur de canaux"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Greffon MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Résolution"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bits"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bits"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Canaux"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Rééchantillonnage"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Le plus proche (le plus rapide)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Linéaire (rapide)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Interpolation par segments (bon)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Polyphasé (le meilleur) "
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Taux d’échantillonnage"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr " Niveau :"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Coupure :"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Réverbération"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Amplificateur de basses"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Ambiophonique "
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Préampli"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Divers"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Suréchantillonnage"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Réduction du bruit"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Jouer les MODs Amiga"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Répéter"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Comptage des répétitions :"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Pour répéter à l'infini, mettre le comptage des répétions à -1."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Lecteur de module)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Son ambiophonique"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "Greffon MPG123"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "Serveur MPRIS 2"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Greffon HTTP/HTTPS neon"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious n'est pas en train de lire de musique."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Basé sur libnotify-aosd par Maximilian Bogner :\nhttp://www.mbogner.de/projects/libnotify-aosd/\n© Copyright 2010 Maximilian Bogner\n© Copyright 2011 John Lindgren\n\nCe greffon est un logiciel libre; vous pouvez le redistribuer et/ou le modifier selon les termes de la Licence Publique Générale GNU tel qu'elle est publiée par la Free Software Foundation, en utilisant la version 3 de celle-ci, ou une version ultérieure, à votre discrétion.\n\nCe greffon est distribué car potentiellement utile, mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties de COMMERCIALISATION ou d'ADAPTATION DANS UN BUT SPÉCIFIQUE. \nReportez-vous à la Licence Publique Générale GNU pour plus de détails.\n\nVous devez avoir reçu une copie de la Licence Publique Générale GNU en même temps que ce programme. Si ce n’est pas le cas, lire <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Greffon de notifications pour Audacious\n"
+"Copyright © 2010 Maximilian Bogner\n"
+"Copyright © 2011-2013 John Lindgren et Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Ce programme est un logiciel libre; vous pouvez le redistribuer et/ou le "
+"modifier selon les termes de la Licence Publique Générale GNU tel qu'elle "
+"est publiée par la Free Software Foundation, en utilisant la version 3 de "
+"celle-ci, ou une version ultérieure, à votre discrétion.\n"
+"\n"
+"Ce programme est distribué car potentiellement utile, mais SANS AUCUNE "
+"GARANTIE, ni explicite ni implicite, y compris les garanties de "
+"COMMERCIALISATION ou d'ADAPTATION DANS UN BUT SPÉCIFIQUE. \n"
+"Reportez-vous à la Licence Publique Générale GNU pour plus de détails.\n"
+"\n"
+"Vous devez avoir reçu une copie de la Licence Publique Générale GNU en même "
+"temps que ce programme ; si ce n’est pas le cas, écrivez à la Free Software "
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Permettre le contrôle d'Audacious depuis les notifications."
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Rendre les notifications persistentes."
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Notifications natives"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Afficher"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pause"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Suivant"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Périphérique par défaut"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Périphérique audio :"
 
@@ -2268,22 +2714,29 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "Greffon de sortie OSS4 pour Audacious\n© Copyright 2010-2012 Michał Lipski\n\nJe souhaiterais remercier les gens présent sur #audacious, particulièrement Tony Vroon and John Lindgren, et bien entendu les auteurs du précédent greffon OSS."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"Greffon de sortie OSS4 pour Audacious\n"
+"© Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"Je souhaiterais remercier les gens présent sur #audacious, particulièrement "
+"Tony Vroon and John Lindgren, et bien entendu les auteurs du précédent "
+"greffon OSS."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "Sortie OSS4"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "Listes de lecture PLS"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Décodeur OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2301,162 +2754,246 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Greffon de sortie Audacious PulseAudio \n\nCe programme est un logiciel libre; vous pouvez le redistribuer et/ou le modifier selon les termes de la Licence Publique Générale GNU tel qu'elle est publiée par la Free Software Foundation, en utilisant la version 2 de celle-ci, ou une version ultérieure, à votre discrétion.\n\nCe programme est distribué car potentiellement utile, mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties de COMMERCIALISATION ou d'ADAPTATION DANS UN BUT SPÉCIFIQUE. \nReportez-vous à la Licence Publique Générale GNU pour plus de détails.\n\nVous devez avoir reçu une copie de la Licence Publique Générale GNU en même temps que ce programme ; si ce n’est pas le cas, écrivez à la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+msgstr ""
+"Greffon de sortie Audacious PulseAudio \n"
+"\n"
+"Ce programme est un logiciel libre; vous pouvez le redistribuer et/ou le "
+"modifier selon les termes de la Licence Publique Générale GNU tel qu'elle "
+"est publiée par la Free Software Foundation, en utilisant la version 2 de "
+"celle-ci, ou une version ultérieure, à votre discrétion.\n"
+"\n"
+"Ce programme est distribué car potentiellement utile, mais SANS AUCUNE "
+"GARANTIE, ni explicite ni implicite, y compris les garanties de "
+"COMMERCIALISATION ou d'ADAPTATION DANS UN BUT SPÉCIFIQUE. \n"
+"Reportez-vous à la Licence Publique Générale GNU pour plus de détails.\n"
+"\n"
+"Vous devez avoir reçu une copie de la Licence Publique Générale GNU en même "
+"temps que ce programme ; si ce n’est pas le cas, écrivez à la Free Software "
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "Sortie PulseAudio"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Greffon de convertisseur de taux d’échantillonnage pour Audacious\n© Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Greffon de convertisseur de taux d’échantillonnage pour Audacious\n"
+"© Copyright 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Sauter/répéter les échantillons"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Interpolation linéaire"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Interpolation sinus cardinal rapide"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Interpolation sinus cardinal moyenne"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Interpolation sinus cardinal la meilleure"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Conversion"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Méthode :"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Taux:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Mappage de taux"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Utiliser les mappages de taux"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz :"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz :"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22,05 kHz :"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz :"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz :"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz :"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz :"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Convertisseur de taux d’échantillonnage"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Modifier le mot de passe"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "OK. Scrobble pour l'utilisateur : %s"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Permission refusée."
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Accéder au lien suivant pour permettre à Audacious de scrobbler vos "
+"lectures :"
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Gardez cette fenêtre ouverte et cliquez sur « Vérifier les permissions » de "
+"nouveau.\n"
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Services"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"Pas d'inquiétude. Vos scrobbles sont sauvegardés sur votre ordinateur.\n"
+"Ils seront transmis dès qu'Audacious en aura la permission."
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Problème de réseau."
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Nom d'utilisateur :"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+"Il a eu un problème lors du contact de Last.fm. Ressayer de nouveau plus "
+"tard."
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Mot de passe :"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Vérification en cours..."
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "Adresse URL Scrobbler :"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "Véri_fier les permissions"
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_Révoquer les permissions"
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Vous devez autoriser Audacious a envoyer vos écoutes à votre compte Last."
+"fm.\n"
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Le greffon scrobbler n'a pu être démarré.\n"
+"\n"
+"Il y a peut-être un problème avec votre installation."
+
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Greffon Audacious AudioScrobbler\n\nCréé à l'origine par Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
+msgstr ""
+"Greffon Scrobbler 2.0 pour Audacious par Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Remerciements à John Lindgren pour m'avoir donné un coup de main au début de "
+"ce projet.\n"
+"\n"
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious utilise maintenant la nouvelle méthode d'envoi de données de Last."
+"fm. \n"
+"Veuillez vérifier les propriétés du greffon Scrobbler 2.0."
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "Greffon de sortie SDL pour Audacious\n© Copyright 2010 John Lindgren"
+msgstr ""
+"Greffon de sortie SDL pour Audacious\n"
+"© Copyright 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "Sortie SDL"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
-msgstr "Bibliothèque"
+msgstr "Médiathèque"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Artiste inconnu"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Album inconnu"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\n dans %s par %s"
+msgstr ""
+"%s\n"
+" dans %s par %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d album"
 msgstr[1] "%d albums"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2464,10 +3001,14 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d morceau"
-msgstr[1] "%s\n %s, %d morceaux"
+msgstr[0] ""
+"%s\n"
+" %s, %d morceau"
+msgstr[1] ""
+"%s\n"
+" %s, %d morceaux"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2475,76 +3016,83 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d morceau par %s"
-msgstr[1] "%s\n %d morceaux par %s"
+msgstr[0] ""
+"%s\n"
+" %d morceau par %s"
+msgstr[1] ""
+"%s\n"
+" %d morceaux par %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Créer une liste de lecture"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Ajouter à la liste de lecture"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Rechercher dans la médiathèque"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Pour importer votre médiathèque dans Audacious, choisissez un dossier, puis utilisez l'icône de rafraîchissement."
+msgstr ""
+"Pour importer votre médiathèque dans Audacious, choisissez un dossier, puis "
+"utilisez l'icône de rafraîchissement."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Veuillez patienter…"
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Choisissez un dossier"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Outil de recherche"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Interface Winamp Classic"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Lecteur"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Police de caractères de la fenêtre principale du lecteur :"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Liste de lecture"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Police de caractères de la liste de lecture"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Polices de caractères"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr "Utiliser des polices de caractères bitmap (seul ASCII est pris en charge)"
+msgstr ""
+"Utiliser des polices de caractères bitmap (seul ASCII est pris en charge)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Faire défiler le titre dans les deux sens"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Thème"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Préférences de l'interface"
 
@@ -2600,7 +3148,7 @@
 msgid "Presets"
 msgstr "Préréglages"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Charger un préréglage"
 
@@ -2613,7 +3161,7 @@
 msgid "Load equalizer preset"
 msgstr "Charger le réglage de l'égaliseur"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Enregistrer le préréglage"
 
@@ -2625,7 +3173,7 @@
 msgid "Save equalizer preset"
 msgstr "Enregistrement du réglage de l'égaliseur"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Effacer un préréglage."
 
@@ -2633,739 +3181,761 @@
 msgid "Delete auto-preset"
 msgstr "Effacer le réglage automatique"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Aller à %d:%-2.2d/%d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume : %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance : %d%% gauche"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Balance : centre"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance : %d%% droite"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Menu des options"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Annuler « Toujours au premier plan »"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Activer « Toujours au premier plan »"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Informations sur le fichier"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Menu des visualisations"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Mode « Fichier unique »."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Mode « Liste de lecture »."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Arrêter après le titre en cours de lecture."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "N'arrête pas après le morceau en cours.."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Point de répétition A activé."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Point de répétition B activé."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Points de répétition effacés."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Défilement automatique du titre"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Arrêter après le morceau en cours"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Pics"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Répéter"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Lecture aléatoire"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Ne pas avancer dans la liste de lecture"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Montrer le lecteur"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Montrer l'éditeur de liste de lecture"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Montrer l'égaliseur"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Toujours au premier plan"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Afficher sur tous les bureaux"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Enrouler le lecteur"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Enrouler la liste de lecture"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Enrouler l'égaliseur"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analyseur"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Oscilloscope"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Spectrogramme"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Arrêt"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Feu"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Lignes verticales"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Lignes"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Barres"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Oscilloscope à points"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Oscilloscope en lignes"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Oscilloscope en vagues"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Glace"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Lissé"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "La plus lente"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lente"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Moyenne"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Rapide"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "La plus rapide"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Temps écoulé"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Temps restant"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pause"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Précédent"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Suivant"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Visualisations"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Mode de visualisation"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Mode analyseur"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Mode oscilloscope"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Mode spectrogramme"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Mode VU en fenêtre réduite"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Retombée de l'analyseur"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Retombée des pics"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Liste de lecture"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Amorcer la liste de lecture"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Nouvelle liste"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Sélectionner la prochaine liste de lecture"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Sélectionner la liste de de lecture"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Supprimer la liste de lecture"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Importer la liste de lecture"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Importe un fichier de liste de lecture dans la liste active."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Exporter la liste de lecture"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Enregistre la liste de lecture active."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Actualiser la liste"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Actualise les métadonnées associées à une entrée de la liste de lecture."
+msgstr ""
+"Actualise les métadonnées associées à une entrée de la liste de lecture."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Gestionnaire de listes de lecture"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Gestionnaire de files d'attente"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Affichage"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Interface"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Préférences de l'interface"
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Ajouter une adresse Internet..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Ajoute une piste distante à la liste de lecture."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Ajouter des fichiers..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Ajoute des fichiers à la liste de lecture."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Chercher et sélectionner"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Recherche dans la liste de lecture et sélectionne des entrées en fonction de critères définis."
+msgstr ""
+"Recherche dans la liste de lecture et sélectionne des entrées en fonction de "
+"critères définis."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Inverser la sélection"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Inverse les entrées sélectionnées et les non sélectionnées."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Sélectionne toutes les entrées de la liste de lecture."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Ne rien sélectionner"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Annule la sélection de toutes les entrées de la liste."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Effacer toutes les entrées"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Efface toutes les entrées de la liste de lecture."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Vider la file d'attente"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Vide la file d'attente associée à cette liste de lecture."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Effacer les fichiers non disponibles"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Efface de la liste de lecture les fichiers non disponibles."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Effacer les doublons"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Par titre"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Efface les doublons de la liste de lecture en fonction de leur titre."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Par nom de fichier"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Efface les doublons de la liste de lecture en fonction de leur nom de fichier."
+msgstr ""
+"Efface les doublons de la liste de lecture en fonction de leur nom de "
+"fichier."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Par chemin d'accès + nom de fichier"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Efface les doublons de la liste de lecture en fonction de leur chemin d'accès complet."
+msgstr ""
+"Efface les doublons de la liste de lecture en fonction de leur chemin "
+"d'accès complet."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Ne garder que la sélection"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Efface les entrées non sélectionnées de la liste de lecture."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Effacer la sélection"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Efface les entrées sélectionnées de la liste de lecture."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Mélanger aléatoirement la liste"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Mélange aléatoirement la liste de lecture."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Inverser la liste"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Inverse l'ordre de la liste de lecture."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Trier la liste"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Trie la liste par titre."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Par album"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Trie la liste, en fonction du nom de l'album."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Par artiste"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Trie la liste par artiste."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Trie la liste par nom de fichier."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Trie la liste par chemin d'accès complet."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Par date"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Trie la liste par date de modification."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Par numéro de piste"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Trie la liste par numéro de piste."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Trier la sélection"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Fichier"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Services des greffons"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Afficher les détails de la piste"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Affiche les informations relatives au morceau."
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "À propos d'Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Lire le fichier"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Charger et lire un fichier."
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Lire un emplacement"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Lire les média depuis l'emplacement sélectionné."
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Services des greffons"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Préférences"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Ouvrir la fenêtre des préférences."
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Ferme Audacious."
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Marquer une boucle A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Effacer la boucle A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Aller au fichier"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Aller au temps"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Mise en file d'attente"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Active/désactive l'entrée dans la file d'attente de la liste de lecture."
+msgstr ""
+"Active/désactive l'entrée dans la file d'attente de la liste de lecture."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Copier"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Couper"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Coller"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Charger"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importer"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Enregistrer"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Préréglage"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Chargement automatique d'un préréglage"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Charge automatiquement un préréglage"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Charger le préréglage par défaut dans l'égaliseur."
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Remise à zéro"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Mise à zéro des niveaux de l'égaliseur."
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "À partir d'un fichier"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Charger un préréglage à partir d'un fichier."
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "À partir d'un fichier EQF de WinAMP"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Charger un préréglage à partir d'un fichier EQF de WinAMP"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Préréglages de WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importer les préréglages de WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Enregistrer le préréglage automatique."
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Enregistrer le préréglage par défaut."
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Dans un fichier"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Enregistrer le préréglage dans un fichier."
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Dans un fichier EQF pour WinAMP"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Enregistrer le préréglage dans un fichier EQF pour WinAMP"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Effacer un préréglage automatique."
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Chercher des entrées dans la liste de lecture active"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Le choix des entrées de la liste de lecture s'effectue au moyen des champs ci-dessous. La syntaxe utilisée est celle des expressions rationnelles et n'est pas sensible à la casse.\nSi vous ne savez pas comment fonctionnent les expressions rationnelles, indiquez simplement une expression littérale de ce que vous cherchez."
+msgstr ""
+"Le choix des entrées de la liste de lecture s'effectue au moyen des champs "
+"ci-dessous. La syntaxe utilisée est celle des expressions rationnelles et "
+"n'est pas sensible à la casse.\n"
+"Si vous ne savez pas comment fonctionnent les expressions rationnelles, "
+"indiquez simplement une expression littérale de ce que vous cherchez."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Titre : "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album : "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Atiste : "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Nom du fichier : "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Effacer la sélection précédente avant d'effectuer la recherche"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Mettre automatiquement dans la file d'attente les entrées trouvées"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Créer une nouvelle liste de lecture à partir des entrées trouvées"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Éditeur de liste de lecture d'Audacious"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d sur %d)"
@@ -3383,81 +3953,124 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Impossible de créer le répertoire (%s) : %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Basé sur le greffon xmms_sndfile :\n"
+"© Copyright 2000, 2002 Erik de Castro Lopo\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Adapté pour Audacious par Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Basé sur le greffon xmms_sndfile :\n© Copyright 2000, 2002 Erik de Castro Lopo\n\nAdapté pour Audacious par Tony Vroon <chainsaw@gentoo.org>\n\nCe programme est un logiciel libre; vous pouvez le redistribuer et/ou le modifier selon les termes de la Licence Publique Générale GNU tel qu'elle est publiée par la Free Software Foundation, en utilisant la version 2 de celle-ci, ou une version ultérieure, à votre discrétion.\n\nCe programme est distribué car potentiellement utile, mais SANS AUCUNE GARANTIE, ni explicite ni implicite, y compris les garanties de COMMERCIALISATION ou d'ADAPTATION DANS UN BUT SPÉCIFIQUE. \nReportez-vous à la Licence Publique Générale GNU pour plus de détails.\n\nVous devez avoir reçu une copie de la Licence Publique Générale GNU en même temps que ce programme ; si ce n’est pas le cas, écrivez à la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+"Ce programme est un logiciel libre; vous pouvez le redistribuer et/ou le "
+"modifier selon les termes de la Licence Publique Générale GNU tel qu'elle "
+"est publiée par la Free Software Foundation, en utilisant la version 2 de "
+"celle-ci, ou une version ultérieure, à votre discrétion.\n"
+"\n"
+"Ce programme est distribué car potentiellement utile, mais SANS AUCUNE "
+"GARANTIE, ni explicite ni implicite, y compris les garanties de "
+"COMMERCIALISATION ou d'ADAPTATION DANS UN BUT SPÉCIFIQUE. \n"
+"Reportez-vous à la Licence Publique Générale GNU pour plus de détails.\n"
+"\n"
+"Vous devez avoir reçu une copie de la Licence Publique Générale GNU en même "
+"temps que ce programme ; si ce n’est pas le cas, écrivez à la Free Software "
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Greffon Sndfile"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "À propos du greffon de sortie Sndio"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Greffon de sortie Sndio\n\nÉcrit par Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Greffon de sortie Sndio\n"
+"\n"
+"Écrit par Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Format non pris en charge"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Un format non pris en charge par le périphérique audio a été demandé.\n\nVeuillez essayer à nouveau avec le serveur sndiod(1) en fonction."
+msgstr ""
+"Un format non pris en charge par le périphérique audio a été demandé.\n"
+"\n"
+"Veuillez essayer à nouveau avec le serveur sndiod(1) en fonction."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "Périphérique sndio"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(vide implique par défaut)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Annuler"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Changement de morceau"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Commande à exécuter lorsqu'Audacious commence un nouveau morceau."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Commande :"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Commande à exécuter lorsque la lecture d'un morceau se termine."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Commande à exécuter lorsqu'Audacious atteint la fin de la liste de lecture."
+msgstr ""
+"Commande à exécuter lorsqu'Audacious atteint la fin de la liste de lecture."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Commande à exécuter lorsque le titre d'un morceau change (par exemple le titre d'un flux en réseau)."
+msgstr ""
+"Commande à exécuter lorsque le titre d'un morceau change (par exemple le "
+"titre d'un flux en réseau)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3474,35 +4087,91 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Vous pouvez utiliser les variables suivantes qui seront remplacées avant l'appel de la commande à exécuter (toutes ne sont pas utiles pour la fonction « fin de liste de lecture ») :\n\n%F : Fréquence (en Hertz)\n%c : Nombre de canaux\n%f : Nom du fichier (chemin complet)\n%l : Durée (en millisecondes)\n%n ou %s : Nom du morceau\n%r : Taux d'encodage (en bit par seconde)\n%t : Position dans la liste de lecture (%02d)\n%p : Lecture en cours (1 ou 0)\n%a : Artiste\n%b : Album\n%T : Titre de la piste"
+msgstr ""
+"Vous pouvez utiliser les variables suivantes qui seront remplacées avant "
+"l'appel de la commande à exécuter (toutes ne sont pas utiles pour la "
+"fonction « fin de liste de lecture ») :\n"
+"\n"
+"%F : Fréquence (en Hertz)\n"
+"%c : Nombre de canaux\n"
+"%f : Nom du fichier (chemin complet)\n"
+"%l : Durée (en millisecondes)\n"
+"%n ou %s : Nom du morceau\n"
+"%r : Taux d'encodage (en bit par seconde)\n"
+"%t : Position dans la liste de lecture (%02d)\n"
+"%p : Lecture en cours (1 ou 0)\n"
+"%a : Artiste\n"
+"%b : Album\n"
+"%T : Titre de la piste"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Les arguments passés à la commande doivent être mis entre guillemets \" \".\nNe pas le faire entraîne un risque de sécurité."
+msgstr ""
+"Les arguments passés à la commande doivent être mis entre "
+"guillemets \" \".\n"
+"Ne pas le faire entraîne un risque de sécurité."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Commandes"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Greffon de ré-échantillonnage SoX pour Audacious\n"
+" Copyright 2013 Michał Lipski\n"
+"\n"
+"Basé sur le greffon de conversion du taux d'échantillonnage :\n"
+"Copyright 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Rapide"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Bas"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Haut"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Très haut"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Qualité :"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "Ré-échantillonneur SoX"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Vitesse et hauteur"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Vitesse : "
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Hauteur : "
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Vitesse et hauteur"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3511,94 +4180,115 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "Greffon d'icône de notification\n\n© Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n© Copyright 2010 Michał Lipski <tallica@o2.pl>\n\nCe greffon ajoute une icône de contrôle d'Audacious dans la zone de notification de votre gestionnaire de fenêtre."
+msgstr ""
+"Greffon d'icône de notification\n"
+"\n"
+"© Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"© Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Ce greffon ajoute une icône de contrôle d'Audacious dans la zone de "
+"notification de votre gestionnaire de fenêtre."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Action lors du défilement à la molette"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Changement du volume"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Changement du morceau en cours"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Autres options"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Désactiver l'affichage d'information au survol"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Réduire dans la zone de notification"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avancer dans la liste de lecture en roulant la molette vers le haut"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Icône de notification"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Greffon de stéréo additionnelle\n\nPar Johan Levin, 1999"
+msgstr ""
+"Greffon de stéréo additionnelle\n"
+"\n"
+"Par Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Stéréo additionnelle"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Stéréo additionnelle"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Générateur de tonalités : "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "Générateur de signal sinusoïdal par Håvard Kvålen <havardk@xmms.org>\nModifié par Daniel J. Peng <danielpeng@bigfoot.com>\n\nPour l'utiliser, ajouter une URL : signal://fréquence1;fréquence2;fréquence3;...\nPar exemple. tone://2000;2005 pour jouer une note à 2 000 Hz en même temps qu'une note à 2 005 Hz"
+msgstr ""
+"Générateur de signal sinusoïdal par Håvard Kvålen <havardk@xmms.org>\n"
+"Modifié par Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Pour l'utiliser, ajouter une URL : signal://fréquence1;fréquence2;"
+"fréquence3;...\n"
+"Par exemple. tone://2000;2005 pour jouer une note à 2 000 Hz en même temps "
+"qu'une note à 2 005 Hz"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Générateur de fréquences musicales "
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "Greffon d'entrée-sortie sur les fichiers pour Audacious\n© Copyright 2009-2012 John Lindgren\n\nCE GREFFON EST NÉCESSAIRE. NE PAS LE DÉSACTIVER."
+msgstr ""
+"Greffon d'entrée-sortie sur les fichiers pour Audacious\n"
+"© Copyright 2009-2012 John Lindgren\n"
+"\n"
+"CE GREFFON EST NÉCESSAIRE. NE PAS LE DÉSACTIVER."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Greffon d'entrée/sortie des fichiers"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Karaoké"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3617,46 +4307,75 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Greffon de décodage Ogg Vorbis d'Audacious\n\nBasé sur le greffon Ogg Vorbis de la fondation Xiph.org\nhttp://www.xiph.org/\n\nCode d'origine par :\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nAvec les contributions de :\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Greffon de décodage Ogg Vorbis d'Audacious\n"
+"\n"
+"Basé sur le greffon Ogg Vorbis de la fondation Xiph.org\n"
+"http://www.xiph.org/\n"
+"\n"
+"Code d'origine par :\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Avec les contributions de :\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Décodeur Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr "Lecteur de fichiers au format Vortex par Sashnov Alexander <sashnov@ngs.ru>\nBasé sur in_vtx.dll par Roman Sherbakov <v_soft@microfor.ru>\nGreffon Audacious par Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Lecteur de fichiers au format Vortex par Sashnov Alexander <sashnov@ngs.ru>\n"
+"Basé sur in_vtx.dll par Roman Sherbakov <v_soft@microfor.ru>\n"
+"Greffon Audacious par Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Décodeur VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr " perte (hybride)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "avec perte"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "© Copyright 2006 William Pitcock <nenolod@nenolod.net>\n\nUne partie du code du greffon a été écrite par Miles Egan"
+msgstr ""
+"© Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Une partie du code du greffon a été écrite par Miles Egan"
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Décodeur WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Décodeur 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listes de lecture XSPF"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - choix du fichier"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Trier la sél_ection"

audacious-plugins-3.3.4.tar.bz2/po/gl.po -> audacious-plugins-3.4.2.tar.bz2/po/gl.po Changed

@@ -1,593 +1,666 @@
 # Galician translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# <mbouzada@gmail.com>, 2012.
-# <mbouzada@gmail.com>, 2012.
-# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2012.
+# mbouzada <mbouzada@gmail.com>, 2012
+# mbouzada <mbouzada@gmail.com>, 2013
+# mbouzada <mbouzada@gmail.com>, 2012
+# mbouzada <mbouzada@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-17 12:59+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-04 12:40+0000\n"
 "Last-Translator: mbouzada <mbouzada@gmail.com>\n"
-"Language-Team: Galician\n"
+"Language-Team: Galician (http://www.transifex.com/projects/p/audacious/"
+"language/gl/)\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "son envolvente"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Descodificador AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "secuenciado"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (reprodutor AdLib)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "Un engadido que se pode empregar para comezar a reprodución nun momento determinado.\n\nEscrito orixinalmente por Adam Feakin e Stodden Daniel."
+msgstr ""
+"Un engadido que se pode empregar para comezar a reprodución nun momento "
+"determinado.\n"
+"\n"
+"Escrito orixinalmente por Adam Feakin e Stodden Daniel."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarma"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Esta é a súa chamada de atención."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "Aceptar"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Configuración da alarma"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Hora"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Hora\n"
+" Alarma ás:\n"
+" A hora na que se activa a alarma.\n"
+"\n"
+" Deter despois de:\n"
+" A alarma detense despois deste tempo.\n"
+" (se o cadro de diálogo de activación non está pechado)\n"
+"\n"
+"\n"
+"Días\n"
+" Día:\n"
+" Seleccione os días nos que se activará a alarma.\n"
+"\n"
+" Hora:\n"
+" Escolla a hora da alarma para cada día, \n"
+" ou seleccione o botón de activación para usar\n"
+" a hora predeterminada.\n"
+"\n"
+"\n"
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minutos"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Volume\n"
+" Atenuación:\n"
+" Atenuación do volume ata o volume escollido\n"
+" para esta cantidade de tempo.\n"
+"\n"
+" Inicial:\n"
+" Comezo da atenuación deste volume.\n"
+"\n"
+" Final:\n"
+" O volume no que se deterá a atenuación. Se o tempo\n"
+" de atenuación é 0, entón o volumen axustase a este e\n"
+" comeza a soar.\n"
+"\n"
+"\n"
+"Opcións:\n"
+" Orde adicional:\n"
+" Executar esta orde no momento da alarma.\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Silencio despois de:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+"Lista de reprodución:\n"
+" Cargue esta lista de reproducción. De non indicarse\n"
+" unha lista de reprodución, empregara a actual.\n"
+" Tamén pode introducir aquí un enderezo URL dun fluxo\n"
+" MP3/Ogg\n"
+"\n"
+" Lembranza:\n"
+" Amosa un aviso cando se apaga a alarma,\n"
+" escriba a mensaxe na caixa e acenda o\n"
+" botón de activación se quere que se amose. "
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Alarma as (predeterminado):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Esta é a súa chamada de atención."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Seleccione os días para que salte a alarma"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "O seu recordatorio para hoxe é..."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Predeterminado"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Lembranza"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Día"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "luns"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "martes"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "mércores"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "xoves"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "venres"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "sábado"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "domingo"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "luns"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Configuración da alarma"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Hora"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Alarma as (predeterminado):"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Silencio despois de:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "horas"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minutos"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Seleccione os días para que salte a alarma"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Día"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Predeterminado"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Dias"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Esvaecemento"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "segundos"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Actual"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
-msgstr "Comezar en"
+msgstr "Inicial"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Final"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Actual"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Orde adicional"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "activar"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Lista de reprodución (opcional)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Escolla a lista de reprodución"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Lembranza"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Usar lembranza"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Opcións"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Que significan estas opcións?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nHora\n Alarma en: \n O tempo para que se inicie a alarma.\n\n Sienciar despois de: \n Deter a alarma transcorrido este tempo.\n (se o diálgo do espertador non está pechado)\n\n\nDías\n Día:\n Seleccione os días para activar a alarma.\n\n Hora:\n Escolla a hora da alarma en cada día,\n ou seleccione o botón de activación para usar\n a hora predeterminada.\n\n\nVolume\n Atenuación: \n Incrementa o volume ao nivel inficado\n durante este tempo.\n\n Comezar con: \n Start fading from this volume.\n\n Final: \n O volume no que se deterá o incremento.\n Se o tempo de atenuación é 0 porá o volume\n a este nivel e iniciará a reprodución.\n\n\nOpcións:\n Orde adicional:\n Executar esta orde na hora da alarma.\n\n Lista de reprodución: \n Cargue esta lista de reprodución para reproducila.\n Se non se indica unha lista, empregarase as cancións\n da lista actual.\n Tamén pode indicar o URL dun fluxo mp3/ogg.\n\n Recordatorio:\n Amosar un aviso cando se activa a alarma,\n escriba o recordatorio na caixa e active o\n botón para que sexa amosado o aviso.\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Axuda"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "A súa lembranza para hoxe é..."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Grazas"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Portada"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Dispositivo PCM predeterminado"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Dispositivo mesturador predeterminado"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Preferencias do engadido de saída ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Dispositivo PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Dispositivo mesturador:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Elemento mesturador:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Evitar as crebas por falta de recursos"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "Engadido de saída ALSA para Audacious\nCopyright 2009-2012 John Lindgren\n\nO meu agradecemento para William Pitcock, autor do engadido de saída NG de ALSA, cuxo código serviu de referencia cando o manual de ALSA non foi abondo."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"Engadido de saída ALSA para Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"O meu agradecemento para William Pitcock, autor do engadido de saída NG de "
+"ALSA, cuxo código serviu de referencia cando o manual de ALSA non foi abondo."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "Saída ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "Engadido AMIDI (Reprodutor MIDI)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Non ten seleccionado ningún porto secuenciador para a reprodución MIDI. Pode facelo nas preferencias do engadido MIDI."
+msgstr ""
+"Non ten seleccionado ningún porto secuenciador para a reprodución MIDI. "
+"Pode facelo nas preferencias do engadido MIDI."
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "Engadido AMIDI (Reprodutor MIDI)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Infraestrutura ALSA"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Esta infraestrutura envía accións MIDI a un grupo de portos secuenciadores ALSA definidos polo usuario. A interface do secuenciador ALSA é moi versátil, pode fornecer portos para sintetizadores hardware (p. ex. emu10k1) mais tamén sintetizadores software, dispositivos externos, etc.\nEsta infraestrutura non produce son, as accións MIDI son manexadas directamente polos dispositivos/programas tras os portos ALSA; por exemplo, as accións MIDI enviadas a un sintetizador hardware serán reproducidas directamente.\nInfraestrutura escrita por Giacomo Lozito."
+msgstr ""
+"Esta infraestrutura envía accións MIDI a un grupo de portos secuenciadores "
+"ALSA definidos polo usuario. A interface do secuenciador ALSA é moi "
+"versátil, pode fornecer portos para sintetizadores hardware (p. ex. emu10k1) "
+"mais tamén sintetizadores software, dispositivos externos, etc.\n"
+"Esta infraestrutura non produce son, as accións MIDI son manexadas "
+"directamente polos dispositivos/programas tras os portos ALSA; por exemplo, "
+"as accións MIDI enviadas a un sintetizador hardware serán reproducidas "
+"directamente.\n"
+"Infraestrutura escrita por Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Infraestrutura FluidSynth"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Esta infraestrutura produce son ao enviar accións MIDI a FluidSynth, un sintetizador software en tempo real baseado na especificación SoundFont2 (www.fluidsynth.org).\nO son producido podese manipular mediante os módulos de efectos e é procesado polo módulo de saída seleccionado.\nInfraestrutura escrita por Giacomo Lozito."
+msgstr ""
+"Esta infraestrutura produce son ao enviar accións MIDI a FluidSynth, un "
+"sintetizador software en tempo real baseado na especificación SoundFont2 "
+"(www.fluidsynth.org).\n"
+"O son producido podese manipular mediante os módulos de efectos e é "
+"procesado polo módulo de saída seleccionado.\n"
+"Infraestrutura escrita por Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Porto"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Nome do cliente"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Nome do porto"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Portos de saída ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Tarxeta de son: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Control de mesturas:"
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Axustes do mesturador"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "Infraestrutura\nALSA"
+msgstr ""
+"Infraestrutura\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "Engadido AMIDI - Información da infraestrutura"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Selección da infraestrutura"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Configuración da reprodución"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transposición: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Cambio de batería: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Configuración avanzada"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "calcular a lonxitude dos ficheiros MIDI na lista de reprodución"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "extraer comentarios desde o ficheiro MIDI (de estar dispoñíbel)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "extraer letras desde o ficheiro MIDI (de estar dispoñíbel)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "Engadido\nAMIDI"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "Engadido AMIDI - seleccione un ficheiro"
+msgstr ""
+"Engadido\n"
+"AMIDI"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Configuración do engadido AMIDI "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "Engadido AMIDI - seleccione un ficheiro SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Configuración de SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Nome de ficheiro"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Cargar SF cando se inicie o reprodutor"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "na primeira reprodución de ficheiros MIDI"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Configuración do sintetizador"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "ganancia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "usar predeterminado"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "valor:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "polifonía"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "reverberación"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "si"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "non"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "coros"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "taxa de mostraxe"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "personalizado"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Infraestrutura\nFluidSynth"
+msgstr ""
+"Infraestrutura\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " Información MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Duración (mseg.):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Num. de pistas"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "variábel"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Div. tempo:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " Comentarios e letras MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* non hai comentarios dispoñíbeis neste ficheiro MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* non hai letras dispoñíbeis neste ficheiro MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 incorrecto)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Sobre o engadido AMIDI"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "Engadido AMIDI"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -608,7 +681,26 @@
 "\n"
 "Tony Vroon\n"
 "for the good help with alpha testing"
-msgstr "\nReprodutor musical modular MIDI\nhttp://www.develia.org/projects.php?p=amidiplug\n\nEscrito por Giacomo Lozito\n<james@develia.org>\n\nO noso especial agradecemento a...\n\nClemens Ladisch e Jaroslav Kysela\npolos magníficos programas aplaymidi e amixer; xa\nque eran moi necesarios xunto coa documentación\nde alsa-lib, a fin de coñecer mellor a API de ALSA\n\nAlfredo Spadafina\npolo fermoso logotipo do teclado MIDI\n\nTony Vroon\npola gran axuda coas probas da alfa"
+msgstr ""
+"\n"
+"Reprodutor musical modular MIDI\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"Escrito por Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"O noso especial agradecemento a...\n"
+"\n"
+"Clemens Ladisch e Jaroslav Kysela\n"
+"polos magníficos programas aplaymidi e amixer; xa\n"
+"que eran moi necesarios xunto coa documentación\n"
+"de alsa-lib, a fin de coñecer mellor a API de ALSA\n"
+"\n"
+"Alfredo Spadafina\n"
+"polo fermoso logotipo do teclado MIDI\n"
+"\n"
+"Tony Vroon\n"
+"pola gran axuda coas probas da alfa"
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
@@ -640,7 +732,9 @@
 
 #: src/aosd/aosd_trigger.c:75
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "Activa as notificacións OSD cando se reproduce un elemento da lista de reprodución."
+msgstr ""
+"Activa as notificacións OSD cando se reproduce un elemento da lista de "
+"reprodución."
 
 #: src/aosd/aosd_trigger.c:79
 msgid "Title Change"
@@ -651,7 +745,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Activa as notificacións OSD cando, durante a reprodución, o título da canción cambia mais o nome do ficheiro é o mesmo. Isto es útil, principalmente, para amosar os cambios de título nos fluxos da Internet"
+msgstr ""
+"Activa as notificacións OSD cando, durante a reprodución, o título da "
+"canción cambia mais o nome do ficheiro é o mesmo. Isto es útil, "
+"principalmente, para amosar os cambios de título nos fluxos da Internet"
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -667,7 +764,9 @@
 
 #: src/aosd/aosd_trigger.c:92
 msgid "Triggers OSD when playback is unpaused."
-msgstr "Activa as notificacións OSD cando a reinicia a reprodución despois dunha pausa"
+msgstr ""
+"Activa as notificacións OSD cando a reinicia a reprodución despois dunha "
+"pausa"
 
 #: src/aosd/aosd_ui.c:168
 msgid "Placement"
@@ -783,12 +882,17 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Non se detectou un administrador de composición;\na non ser que saiba que ten un en execución, active un administrador de composición ou as notificacións OSD non funcionarán correctamente"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Non se detectou un administrador de composición;\n"
+"a non ser que saiba que ten un en execución, active un administrador de "
+"composición ou as notificacións OSD non funcionarán correctamente"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
-msgstr "Para a falsa transparencia non fai falta un administrador de compòsición"
+msgstr ""
+"Para a falsa transparencia non fai falta un administrador de compòsición"
 
 #: src/aosd/aosd_ui.c:837
 msgid "Transparency"
@@ -847,47 +951,47 @@
 msgid "Misc"
 msgstr "Miscelánea"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "Listas de reprodución ASXv1/ASXv2"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de reprodución do Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Cor"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Alcance do desenfoque"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Preferencias de Bauer estereofónico a Binaural"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Nivel de alimentación:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Cortar frecuencia:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Predefinicións:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Bauer estereofónico a Binaural (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Analizador de espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -897,233 +1001,247 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> e outros.\n\nMoitas grazias aos desenvolvedores de libcdio <http://www.gnu.org/software/libcdio/>\ne aos desenvolvedores de libcddb <http://libcddb.sourceforge.net/>.\n\nGrazas tamén a Tony Vroon por guiarme e orientarme.\n\nEste foi un proxecto do Google Summer of Code 2007."
+msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> e outros.\n"
+"\n"
+"Moitas grazias aos desenvolvedores de libcdio <http://www.gnu.org/software/"
+"libcdio/>\n"
+"e aos desenvolvedores de libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Grazas tamén a Tony Vroon por guiarme e orientarme.\n"
+"\n"
+"Este foi un proxecto do Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Velocidade de lectura:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Anular o dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Empregar o CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Empregar a CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Empregar HTTP no canto de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Ruta:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Porto:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Engadido de CD de son"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Non foi posíbel iniciar o subsistema cdio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI incorrecto %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Non se atopa a pista %d"
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr "A pista %d é unha pista de datos"
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Non foi posíbel abrir a saída de son."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Produciuse un erro ao ler o CD de son"
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "CD de son"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Non foi posíbel abrir o dispositivo do CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "Non foi posíbel atopar unha unidade de CD de son."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Non foi posíbel rematar a inicialización da unidade de CD aberta."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Non foi posibel obter o primeiro/último número de la pista."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Non é posíbel ler o inicio/fin LSN para a pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Non foi posíbel crear a conexión coa CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Produciuse un erro ao consultar o servidor CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Produciuse un erro ao consultar o servidor CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Non foi posíbel ler a información de CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "A unidade está baleira."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Tipo de disco non admitido."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Reproducir o CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Engadir un CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Elementos do menú do CD de son"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Compresión"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Centrar o volume:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Intervalo dinámico:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Engadido de compresión de rango dinámico para Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Engadido de compresión de rango dinámico para Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Compresor de intervalo dinámico"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Descodificador de música dunha consola de xogos"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Xeral"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Reprodución"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Graves:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "segs."
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Agudos:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Duración predeterminada da canción:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
-msgstr "Múltiple mostraxe"
+msgstr "Mostraxe múltipla"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
-msgstr "Activar a múltiple mostraxe de son"
+msgstr "Activar a múltipla mostraxe de son"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
-msgstr "Taxa de múltiple mostraxe:"
+msgstr "Taxa de múltipla mostraxe:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignorar a lonxitude das etiquetas SPC"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Aumentar a reverberación"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "A duración predeterminada canción, expresada en segundos, empregase para as cancións que non fornecen información da duración (é dicir pistas cíclicas)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"A duración predeterminada canción, expresada en segundos, empregase para as "
+"cancións que non fornecen información da duración (é dicir pistas cíclicas)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1131,88 +1249,108 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "Motor decodificador de m úsica na consola basaedo en Game_Music_Emu 0.5.2\nFormatos admitidos: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n\nEngadido para Audacious por:\nWilliam Pitcock <nenolod@dereferenced.org>\nShay Green <gblargg@gmail.com>"
+msgstr ""
+"Motor decodificador de m úsica na consola basaedo en Game_Music_Emu 0.5.2\n"
+"Formatos admitidos: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Engadido para Audacious por:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "Produciuse un fallo na atenuación cruzada xa que existen cancións cun número diferente de canles. Pode empregar o «Mesturador de canles» para converter as cancións ao mesmo número de canle."
+msgstr ""
+"Produciuse un fallo na atenuación cruzada xa que existen cancións cun número "
+"diferente de canles. Pode empregar o «Mesturador de canles» para converter "
+"as cancións ao mesmo número de canle."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Produciuse un fallo na atenuación cruzada xa que existen cancións con diferente taxa de mostraxe. Pode empregar o «Convertedor de taxa de mostraxe» para converter as cancións á mesma taxa de mostraxe."
+msgstr ""
+"Produciuse un fallo na atenuación cruzada xa que existen cancións con "
+"diferente taxa de mostraxe. Pode empregar o «Convertedor de taxa de "
+"mostraxe» para converter as cancións á mesma taxa de mostraxe."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Engadido Crossfade para Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Engadido Crossfade para Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Atenuación cruzada"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Sobreposición:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Atenuación cruzada"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intensidade:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Engadido de plano de referencia"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Realimentación"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Volume:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Engadido Echo\nPor Johan Levin, 1999\n\nSurround echo por Carl van Schaik, 1999"
+msgstr ""
+"Engadido Echo\n"
+"Por Johan Levin, 1999\n"
+"\n"
+"Surround echo por Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1220,9 +1358,15 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Engadido de decodificación multi-formato do son empregando\na infraestrutura multimedia FFmpeg (http://www.ffmpeg.org/)\n\nEngadido para Audacious por:\nWilliam Pitcock <nenolod@nenolod.net>\nMatti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Engadido de decodificación multi-formato do son empregando\n"
+"a infraestrutura multimedia FFmpeg (http://www.ffmpeg.org/)\n"
+"\n"
+"Engadido para Audacious por:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Engadido FFmpeg"
 
@@ -1290,7 +1434,21 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Este programa é software libre, pode redistribuílo e/ou modificalo\nbaixo os termos da Licenza Pública Xeral de GNU segundo é publicada\npola Free Software Foundation, ben na versión 2 da Licenza, ou\n(á súa escolla) calquera versión posterior.\n\nEste programa distribúese coa esperanza de que sexa útil,\nmais SEN NINGUNHA GARANTÍA, incluso sen a garantía implícita de\nCOMERCIALIZACIÓN ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR.\nConsulte a GNU General Public License para obter máis detalles.\n\nDebería ter recibido unha copia da Licenza Pública Xeral de GNU\nxunto con este programa, de non ser así, escriba á Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"Este programa é software libre, pode redistribuílo e/ou modificalo\n"
+"baixo os termos da Licenza Pública Xeral de GNU segundo é publicada\n"
+"pola Free Software Foundation, ben na versión 2 da Licenza, ou\n"
+"(á súa escolla) calquera versión posterior.\n"
+"\n"
+"Este programa distribúese coa esperanza de que sexa útil,\n"
+"mais SEN NINGUNHA GARANTÍA, incluso sen a garantía implícita de\n"
+"COMERCIALIZACIÓN ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR.\n"
+"Consulte a GNU General Public License para obter máis detalles.\n"
+"\n"
+"Debería ter recibido unha copia da Licenza Pública Xeral de GNU\n"
+"xunto con este programa, de non ser así, escriba á Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1304,11 +1462,13 @@
 msgid "Joint Stereo"
 msgstr "Estéreo solapado"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1356,7 +1516,7 @@
 msgid "Error protection"
 msgstr "Protección contra erros"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Calidade"
 
@@ -1436,542 +1596,624 @@
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Configuración do codificador Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Nivel de calidade (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "sen perdas"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Código orixinal de\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Código orixinal de\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Descodificador FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "Engadido GIO para Audacious\nCopyright 2009-2012 John Lindgren"
+msgstr ""
+"Engadido GIO para Audacious\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Engadido GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analizador de espectro OpenGL para Audacious\n"
+"Copyright 2013 Christophe Budé e John Lindgren\n"
+"\n"
+"Baseado no engadido de XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, e "
+"4Front Technologies\n"
+"\n"
+"Liceza: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Analizador de espectro OpenGL"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Engadido de atallos do Gnome\nPermite controlar o reproductor cos atallos de GNOME.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"Engadido de atallos do Gnome\n"
+"Permite controlar o reproductor cos atallos de GNOME.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Atallos do Gnome"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Interprete"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Ano"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Álbum"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Pista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Xénero"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Posición na cola"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Duración"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Ruta ao ficheiro"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Título personalizado"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Taxa de bits"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Escoller columnas"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Dispoñíbel:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Escollido:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Ancorar á esquerda"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Ancorar á dereita"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Ancorar enriba"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Ancorar abaixo"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Desancorar"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Desactivar"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Abrir ficheiros..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Abrir un _URL..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Engadir ficheiros..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Engadir un U_RL..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Buscar unha biblioteca"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "So_bre..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Preferencias ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Saír"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "_Pausa"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Deter"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "A_nterior"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "Se_guinte"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "Repe_tir"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "Ao c_hou"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "N_on avanzar na lista de reprodución"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "_Deter despois desta canción"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Parar _despois desta canción"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "_Información da canción"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Saltar no _tempo"
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "Saltar á _canción"
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Polo _número de pista"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Estabelecer o punto de repetición _A"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Estabelecer o punto de repetición _B"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "_Limpar os puntos de repetición"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Polo _título"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "Por_ nome de ficheiro"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "Por _ruta do ficheiro"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Polo _número de pista"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Polo _interprete"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Polo á_lbum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "Por ál_bum"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Pola _data de publicación"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "Por _duración"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Pola _ruta do ficheiro"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Polo título _personalizado"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "Orden _inversa"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "Ao c_hou"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Reproducir esta lista"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Actualizar"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Eliminar os ficheiros _non dispoñíbeis"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Ordenar os seleccionados"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Retirar _duplicados"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Eliminar os ficheiros _non dispoñíbeis"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Novo"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Cambiar o _nome..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Pechar"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importar..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Exportar..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Xestor da _lista de reprodución:"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Xestor da _cola"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "_Subir o volume"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "_Baixar o volume"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Ecualizador"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_fectos"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Interface"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Visualizacións"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Amosar a barra de _menú"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Amosar a barra de i_nformación"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Amosar a barra de vis_ualización"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Amosar a barra de e_stado"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Amosar o tempo _restante"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Amosar os _botóns de peche"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Amosar as ca_beceiras de columna"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Escoller _columnas..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "A_vanzar ao cambiar de canción"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Lista de reprodución"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "Saí_da"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Por na cola/retirar da cola"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "C_ortar"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "Cambiar o _nome..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Almacenando no búfer..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Erro"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canle"
 msgstr[1] "%d canles"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr "Pista anterior"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pausar/Reiniciar"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Parar"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "Pista seguinte"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
 msgstr "Avanzar 5 segundos"
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
 msgstr "Retroceder 5 segundos"
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
 msgstr "Silenciar"
 
-#: src/hotkey/gui.c:80
-msgid "Volume Up"
+#: src/hotkey/gui.c:78
+msgid "Volume up"
 msgstr "Subir o volume"
 
-#: src/hotkey/gui.c:81
-msgid "Volume Down"
+#: src/hotkey/gui.c:79
+msgid "Volume down"
 msgstr "Baixar o volume"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Saltar ao ficheiro"
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
+msgstr "Ir ao ficheiro"
 
-#: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Cambiar as xanelas do reprodutor"
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr "Cambiar a(s) xanela(s) de reprodución"
 
-#: src/hotkey/gui.c:84
+#: src/hotkey/gui.c:82
 msgid "Show On-Screen-Display"
 msgstr "Mostrar as notificacións OSD"
 
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
+msgstr "Conmutar a repetición"
+
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
+msgstr "Conmutar a reprodución ao chou"
+
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Conmutar o modo repetir"
+msgid "Toggle stop after current"
+msgstr "Conmutar a parada despois da actual"
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Conmutar a orden ao chou"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+msgid "Raise player window(s)"
 msgstr "Elevar as xanelas do reprodutor"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(ningún)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Non se recomenda asociar os botóns principais do rato sen modificadores.\n\nQuere continuar?"
+msgstr ""
+"Non se recomenda asociar os botóns principais do rato sen modificadores.\n"
+"\n"
+"Quere continuar?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Asociar botóns do rato"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Configuración global de atallos de teclado do engadido"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Prema unha combinación de teclas dentro do campo de texto.\nTamén pode asociar botóns do rato."
+msgstr ""
+"Prema unha combinación de teclas dentro do campo de texto.\n"
+"Tamén pode asociar botóns do rato."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Teclas rápidas:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Acción"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Teclas asociadas:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1984,104 +2226,130 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "Engadido de atallos globais\nControlar o reproductor con combinacións de teclas globais ou con teclas multimedia.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nColaboradores:\nCopyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n Bryn Davies <curious@ihug.com.au>,\n Jonathan A. Davis <davis@jdhouse.org>,\n Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"Engadido de atallos globais\n"
+"Controlar o reproductor con combinacións de teclas globais ou con teclas "
+"multimedia.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Colaboradores:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Teclas rápidas globais"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Baseado en xmms-jack, por Chris Morgan:\nhttp://xmms-jack.sourceforge.net/\n\nPortado a Audacious por Giacomo Lozito"
+msgstr ""
+"Baseado en xmms-jack, por Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Portado a Audacious por Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "Saída JACK"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Configuración de %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Configuración do servidor LADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Rutas dos módulos:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Separe as múltiples rutas con dous puntos.\nEstas rutas empréganse ademais de LADSPA_PATH.\nTras engadir as novas rutas, prema Intro para buscar novos engadidos."
+msgstr ""
+"Separe as múltiples rutas con dous puntos.\n"
+"Estas rutas empréganse ademais de LADSPA_PATH.\n"
+"Tras engadir as novas rutas, prema Intro para buscar novos engadidos."
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Engadidos dispoñíbeis:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Activar"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Engadidos activados:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Configuración"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "LADSPA Host para Audacious\nCopyright 2011 John Lindgren"
+msgstr ""
+"LADSPA Host para Audacious\n"
+"Copyright 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "Servidor LADSPA"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: a compatibilidade de LIRC non foi iniciada\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: non foi posíbel ler o ficheiro de configuración LIRC\n%s: consulte a documentación do LIRC\n%s: como crear un ficheiro de configuración válido\n"
+msgstr ""
+"%s: non foi posíbel ler o ficheiro de configuración LIRC\n"
+"%s: consulte a documentación do LIRC\n"
+"%s: como crear un ficheiro de configuración válido\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: tentando volver a conectar...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: orde descoñecida «%s»\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: desconectado de LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: tentará volver a conectar cada %d segundos...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2095,155 +2363,325 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "Un sinxelo engadido para controlar o Audacious empregando o daemon de control remoto LIRC\n\nAdaptado para Audacious por:\nTony Vroon <chainsaw@gentoo.org>\nJoonas Harjumäki <jharjuma@gmail.com>\n\nBaseado no engadido de LIRC para XMMS por:\nCarl van Schaik <carl@leg.uct.ac.za>\nChristoph Bartelmus <xmms@bartelmus.de>\nAndrew O. Shadoura <bugzilla@tut.by>\n\nPara obter máis información sobre LIRC, consulte http://lirc.org."
+msgstr ""
+"Un sinxelo engadido para controlar o Audacious empregando o daemon de "
+"control remoto LIRC\n"
+"\n"
+"Adaptado para Audacious por:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Baseado no engadido de LIRC para XMMS por:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Para obter máis información sobre LIRC, consulte http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Conexión"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Volver conectar co servidor LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Agardar antes de volver conectar:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "Engadido LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Non hai letras dispoñíbeis"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Non é posibel obter %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Non é posíbel analizar %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Buscando letras ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Faltan os metadatos da canción"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Conectando con lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "Engadido LyricWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "Listas de reprodución M3U"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Xerador de tacto: %d ppm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Xerador de tacto: %d ppm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "Un xerador de tacto por Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nPara empregalo, engada un URL: tact://pulsos*num/den\np.ex. tact://77 para reproducir a 77 pulsos por minuto\nou tact://60*3/4 to para reproducir a 60 ppm en 3/4 tactos"
+msgstr ""
+"Un xerador de tacto por Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Para empregalo, engada un URL: tact://pulsos*num/den\n"
+"p.ex. tact://77 para reproducir a 77 pulsos por minuto\n"
+"ou tact://60*3/4 to para reproducir a 60 ppm en 3/4 tactos"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Xerador de tacto"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Engadido Channel Mixer para Audacious\nCopyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+"Engadido Channel Mixer para Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Mesturador de canles"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Canles de saída:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Mesturador de canles"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Engadido MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Resolución"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bit"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bit"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Canles"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Mostraxe múltipla"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Máis próximo (o máis rápido)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Lineal (rápido)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Spline (bo)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Polifase (o mellor)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Taxa da mostraxe"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Nivel:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "límite de corte:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Reverberación"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Énfase de graves"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Son envolvente"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Preamplificación"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Varios"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Sobremostraxe"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Redución de ruído"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Reproducir os MOD de Amiga"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Contador de repeticións:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Para repetir sempre, estabelecer o contador de repeticións en -1."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (modulo reprodutor)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Son envolvente"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "Engadido MPG123"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "Servidor MPRIS 2"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Engadido Neon HTTP/HTTPS"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious non está a reproducir nada."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Engadido de notificacións para Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren e Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Baseado no libnotify-aosd por Maximilian Bogner:\nhttp://www.mbogner.de/projects/libnotify-aosd/\n\nCopyright (C) 2010 Maximilian Bogner\nCopyright (C) 2011 John Lindgren\n\nEste engadido é software libre, pode redistribuílo e/ou modificalo\nbaixo os termos da Licenza Pública Xeral de GNU segundo é publicada\npola Free Software Foundation, ben na versión 3 da Licenza, ou\n(á súa escolla) calquera versión posterior.\n\nEste engadido distribúese coa esperanza de que sexa útil,\nmais SEN NINGUNHA GARANTÍA, incluso sen a garantía implícita de\nCOMERCIALIZACIÓN ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR.\nConsulte a GNU General Public License para obter máis detalles.\n\n\nDebería ter recibido unha copia da Licenza Pública Xeral de GNU xunto\ncon este programa, de non ser así, consulte <http://www.gnu.org/licenses/>."
+"Este engadido é software libre, pode redistribuílo e/ou modificalo\n"
+"baixo os termos da Licenza Pública Xeral de GNU segundo é publicada\n"
+"pola Free Software Foundation, ben na versión 3 da Licenza, ou\n"
+"(á súa escolla) calquera versión posterior.\n"
+"\n"
+"Este engadido distribúese coa esperanza de que sexa útil,\n"
+"mais SEN NINGUNHA GARANTÍA, incluso sen a garantía implícita de\n"
+"COMERCIALIZACIÓN ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR.\n"
+"Consulte a GNU General Public License para obter máis detalles.\n"
+"\n"
+"Debería ter recibido unha copia da Licenza Pública Xeral de GNU xunto\n"
+"con este programa, de non ser así, consulte <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Amosar os controis de reprodución"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Amosar sempre a notificación"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Notificacións de escritorio"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Amosar"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Seguinte"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Dispositivo predeterminado"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Dispositivo de son:"
 
@@ -2268,22 +2706,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "Engadido de saída OSS4 para Audacious\nCopyright 2010-2012 Michał Lipski\n\nGustaríame darlle as grazas á xente de #audacious, sobre todo a Tony Vroon e a John Lindgren e por suposto aos autores do anterior engadido de OSS."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"Engadido de saída OSS4 para Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"Gustaríame darlle as grazas á xente de #audacious, sobre todo a Tony Vroon "
+"e a John Lindgren e por suposto aos autores do anterior engadido de OSS."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "Saída OSS4"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "Listas de reprodución PLS"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Descodificador OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2301,162 +2745,241 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Engadido de saída PulseAudio para Audacious\n\nEste programa é software libre, pode redistribuílo e/ou modificalo\nbaixo os termos da Licenza Pública Xeral de GNU segundo é publicada\npola Free Software Foundation, ben na versión 2 da Licenza, ou\n(á súa escolla) calquera versión posterior.\n\nEste programa distribúese coa esperanza de que sexa útil,\nmais SEN NINGUNHA GARANTÍA, incluso sen a garantía implícita de\nCOMERCIALIZACIÓN ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR.\nConsulte a GNU General Public License para obter máis detalles.\n\nDebería ter recibido unha copia da Licenza Pública Xeral de GNU\nxunto con este programa, de non ser así, escriba á Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"Engadido de saída PulseAudio para Audacious\n"
+"\n"
+"Este programa é software libre, pode redistribuílo e/ou modificalo\n"
+"baixo os termos da Licenza Pública Xeral de GNU segundo é publicada\n"
+"pola Free Software Foundation, ben na versión 2 da Licenza, ou\n"
+"(á súa escolla) calquera versión posterior.\n"
+"\n"
+"Este programa distribúese coa esperanza de que sexa útil,\n"
+"mais SEN NINGUNHA GARANTÍA, incluso sen a garantía implícita de\n"
+"COMERCIALIZACIÓN ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR.\n"
+"Consulte a GNU General Public License para obter máis detalles.\n"
+"\n"
+"Debería ter recibido unha copia da Licenza Pública Xeral de GNU\n"
+"xunto con este programa, de non ser así, escriba á Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "Saída PulseAudio"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Engadido Sample Rate Converter para Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Engadido Sample Rate Converter para Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Omitir/repetir as mostraxes"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Interpolación lineal "
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Interpolación de sincronía rápida"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Interpolación de sincronía media"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Mellor interpolación de sincronía"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Conversión"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Taxa:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Taxa de asignacións"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Empregar a taxa de asignacións"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Convertedor de taxa de mostraxe"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Cambiar contrasinal"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "Aceptar. Scrobbling para o usuario: %s"
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Servizos"
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Permiso denegado"
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Acceda á seguinte ligazón para permitirlle a Audacious enviar o rexistro das "
+"súas escoitas:"
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Usuario:"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Manteña aberta esta xanela e prema outra vez en «Comprobación de permisos».\n"
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"No se preocupe. Os seus rexistros de escoitas gardanse no seu computador.\n"
+"Só se enviarán se Audacious llelo permite."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Problema na rede."
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "Houbo un problema ao contactar con Last.fm. Ténteo de novo máis tarde."
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Contrasinal:"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Comprobando..."
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "URL de Scrobbler:"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "C_omprobación de permisos"
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_Revogar o permiso"
+
+#: src/scrobbler2/config_window.c:221
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Ten que autorizar a súa conta en Last.fm para que poida seguir (scrobble) as "
+"súas pistas.\n"
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Non foi posíbel iniciar o engadido de Scrobbler.\n"
+"Semella que hai un problema de instalación."
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Engadido do Audacious, Scrobbler 2.0 por Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Gracias a John Lindgren por botarme unha man no comenzo deste proxecto.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Engadido Audacious AudioScrobbler\n\nCreado orixinalmente por Audun Hove <audun@nlc.no> e Pipian <pipian@pipian.com>"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious está a empregar unha versión mellorada do Scrobbler de Last.fm .\n"
+"Comprobe as preferencias para o engadido do Scrobbler."
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "Engadido SDL Output para Audacious\nCopyright 2010 John Lindgren"
+msgstr ""
+"Engadido SDL Output para Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "Saída SDL"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Interprete descoñecido"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Álbum descoñecido"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\n en %s por %s"
+msgstr ""
+"%s\n"
+" en %s por %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d álbum"
 msgstr[1] "%d álbumes"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2464,10 +2987,14 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d canción"
-msgstr[1] "%s\n %s, %d cancións"
+msgstr[0] ""
+"%s\n"
+" %s, %d canción"
+msgstr[1] ""
+"%s\n"
+" %s, %d cancións"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2475,76 +3002,82 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d canción por %s"
-msgstr[1] "%s\n %d cancións por %s"
+msgstr[0] ""
+"%s\n"
+" %d canción por %s"
+msgstr[1] ""
+"%s\n"
+" %d cancións por %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Crear unha lista de reprodución"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Engadir á lista de reprodución"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Buscar unha fonoteca"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Para importar a súa fonoteca en Audacious, escolla un cartafol e prema na icona «Actualizar»."
+msgstr ""
+"Para importar a súa fonoteca en Audacious, escolla un cartafol e prema na "
+"icona «Actualizar»."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Agarde..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Escolla un cartafol"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Ferramenta de buscas"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Interface clásica do Winamp"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Reprodutor:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Seleccione o tipo de letra da xanela principal do reprodutor:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_lista de reprodución:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Seleccione o tipo de letra da lista de reprodución:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "Tipo de _letra:"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Empregar tipos de letra de mapa de bits (só admiten ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Desprazar o título da canción en ambas direccións"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Tema"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Preferencias da interface"
 
@@ -2600,7 +3133,7 @@
 msgid "Presets"
 msgstr "Axustes"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Cargar o axustes"
 
@@ -2613,7 +3146,7 @@
 msgid "Load equalizer preset"
 msgstr "Cargar o axuste do ecualizador"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Gardar o axustes"
 
@@ -2625,7 +3158,7 @@
 msgid "Save equalizer preset"
 msgstr "Gardar o axuste do ecualizador"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Eliminar o axuste"
 
@@ -2633,739 +3166,757 @@
 msgid "Delete auto-preset"
 msgstr "Eliminar o axuste automático"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Ir a %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balance: %d%% esquerda"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Balance: centro"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balance: %d%% dereita"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Menú de opcións"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Desactivar «Sempre enriba»"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Activar «Sempre enriba»"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Caixa de información do ficheiro"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Menú de visualización"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Modo único."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Modo da lista de reprodución"
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Parar despois da canción."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Non parar despois da canción."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Repetir o punto de axuste A."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Repetir o punto de axuste B."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Repetir os puntos limpados"
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Desprazamento automático do nome da canción"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Parar ao rematar a canción actual"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Picos"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Ao chou"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Non avanzar na lista de reprodución"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Amosar o reprodutor"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Amosar o editor de listas de reprodución"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Amosar o ecualizador"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Sempre enriba"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Poñer en todos os espazos de traballo"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Enrolar o reprodutor"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Enrolar o editor de listas de reprodución"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Enrolar o ecualizador"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analizador"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Campo"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Marca de voz"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Apagado"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Lume"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Liñas verticais"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Liñas"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Barras"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Campo de puntos"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Campo de liñas"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Campo sólido"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Xeo"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Suave"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Máis lento"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Medio"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Máis rápido"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Tempo transcorrido"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Tempo restante"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Seguinte"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Visualización"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Modo de visualización"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Modo analizador"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Modo de campo"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Modo marca de voz"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Modo WindowShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Caída do analizador"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Caída dos picos"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Lista de reprodución"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Reproducir a lista"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Nova lista de reprodución"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Seguinte lista de reprodución"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Lista de reprodución anterior "
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Eliminar a lista de reprodución"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Importar lista de reprodución"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Carga un ficheiro de listas na lista de reprodución seleccionada."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Exportar lista de reprodución"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Garda a lista de reprodución seleccionada."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Actualizar a lista"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Actualiza os metadatos asociados cunha entrada da lista de reprodución."
+msgstr ""
+"Actualiza os metadatos asociados cunha entrada da lista de reprodución."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Xestor da lista de reprodución"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Xestor da cola"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Interface"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Preferencias da interface..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Engadir un enderezo da Internet..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Engadir unha pista remota á lista reprodución."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Engadir ficheiros..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Engade ficheiros á lista de reprodución."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Buscar e seleccionar"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Busca na lista de reprodución e selecciona as entradas que cumpren un criterio específico."
+msgstr ""
+"Busca na lista de reprodución e selecciona as entradas que cumpren un "
+"criterio específico."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Inverter a selección"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Inverte as entradas seleccionadas e as non seleccionadas."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Selecciona todos os elementos da lista de reprodución."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Non seleccionar nada"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Desmarca todos os elementos da lista de reprodución."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Retirar todo"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Retirar todas as entradas da lista de reprodución."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Limpar a cola"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Limpa a cola asociada con esta lista de reprodución."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Retirar os ficheiros non dispoñíbeis"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Retirar os ficheiros non dispoñíbeis da lista de reprodución."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Retirar os duplicados"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Polo título"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Retira as entradas duplicadas da lista de reprodución polo título."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Polo nome de ficheiro"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Retira as entradas duplicadas da lista de reprodución polo nome do ficheiro."
+msgstr ""
+"Retira as entradas duplicadas da lista de reprodución polo nome do ficheiro."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Pola ruta e o nome de ficheiro"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Retira as entradas duplicadas da lista de reprodución pola ruta competa."
+msgstr ""
+"Retira as entradas duplicadas da lista de reprodución pola ruta competa."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Retirar os NON seleccionados"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Retirar as entradas NON seleccionadas da lista de reprodución."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Retirar os seleccionados"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Retirar as entradas seleccionadas da lista de reprodución."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Lista ao chou"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Ordenar ao chou a lista de reprodución"
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Lista inversa"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Inverte a orde da lista de reprodución"
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Ordenar a lista"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Ordenar a lista polo título"
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Polo álbum"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Ordenar a lista polo álbum"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Polo interprete"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Ordenar a lista polo interprete"
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Ordenar a lista polo nome de ficheiro"
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Ordenar a lista pola ruta completa do ficheiro"
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Pola data"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Ordenar a lista pola data de modificación."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Polo número de pista"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Ordenar a lista polo número de pista."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Ordenar os seleccionados"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Ficheiro"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Servizos de engadidos"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Ver detalles da pista"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Ver detalles da pista"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Sobre Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Reproducir un ficheiro"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Cargar e reproducir un ficheiro"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Reproducir unha localización"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Reproducir o medio da localización seleccionada"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Servizos de engadidos"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Abrir a xanela de preferencias"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Saír do Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Estabelecer A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Limpar A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Saltar ao ficheiro"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Saltar no tempo"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Conmutar a cola"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Activa/desactiva as entradas na cola da lista de reprodución."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Cargar"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importar"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Gardar"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Axuste"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Carga automática dun axuste"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Carga automática dun axuste"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Cargar o axuste predeterminado no ecualizador"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Cero"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Estabelecer o axuste de niveis do ecualizador a cero"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Desde un ficheiro"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Cargar o axuste desde un ficheiro"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Desde o ficheiro EQF do Winamp"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Cargar o axuste desde o ficheiro EQF do Winamp"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Axustes do WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importar os axustes do WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Gardar a carga automática dun axuste"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Gardar o axuste predeterminado"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "A un ficheiro"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Gardar os axustes nun ficheiro"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Nun ficheiro EQF do Winamp"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Gardar o axuste nun ficheiro EQF do Winamp"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Eliminar a carga automática dun axuste"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Buscar entradas na lista de reprodución activa"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Seleccione entradas na lista de reprodución indicando un ou máis campos. Os campos empregan sintaxe de expresións regulares, sen distinguir maiúsculas de minúsculas. Se non sabe como funcionan as expresións regulares, escriba só a parte del literal que quere buscar."
+msgstr ""
+"Seleccione entradas na lista de reprodución indicando un ou máis campos. Os "
+"campos empregan sintaxe de expresións regulares, sen distinguir maiúsculas "
+"de minúsculas. Se non sabe como funcionan as expresións regulares, escriba "
+"só a parte del literal que quere buscar."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Título: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Álbum: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Interprete: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Nome do ficheiro: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Limpar a selección previa antes de buscar"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Conmutar automaticamente a cola para as entradas coincidentes"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Crear unha nova lista de reprodución coas entradas coincidentes"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Editor de listas de reprodución do Audacious"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
@@ -3383,81 +3934,125 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Non foi posíbel crear o directorio (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Engadido daseado no xmms_sndfile:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Adaptado para Audacious por Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Engadido daseado no xmms_sndfile:\nCopyright (C) 2000, 2002 Erik de Castro Lopo\n\nAdaptado para Audacious por Tony Vroon <chainsaw@gentoo.org>\n\nEste programa é software libre, pode redistribuílo e/ou modificalo\nbaixo os termos da Licenza Pública Xeral de GNU segundo é publicada\npola Free Software Foundation, ben na versión 2 da Licenza, ou\n(á súa escolla) calquera versión posterior.\n\nEste programa distribúese coa esperanza de que sexa útil,\nmais SEN NINGUNHA GARANTÍA, incluso sen a garantía implícita de\nCOMERCIALIZACIÓN ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR. Consulte a GNU General Public License para obter máis detalles.\n\nDebería ter recibido unha copia da Licenza Pública Xeral de GNU xunto\ncon este programa, de non ser así, escriba á Free Software Foundation, Inc.,\n51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"Este programa é software libre, pode redistribuílo e/ou modificalo\n"
+"baixo os termos da Licenza Pública Xeral de GNU segundo é publicada\n"
+"pola Free Software Foundation, ben na versión 2 da Licenza, ou\n"
+"(á súa escolla) calquera versión posterior.\n"
+"\n"
+"Este programa distribúese coa esperanza de que sexa útil,\n"
+"mais SEN NINGUNHA GARANTÍA, incluso sen a garantía implícita de\n"
+"COMERCIALIZACIÓN ou IDONEIDADE PARA UN PROPÓSITO PARTICULAR. Consulte a GNU "
+"General Public License para obter máis detalles.\n"
+"\n"
+"Debería ter recibido unha copia da Licenza Pública Xeral de GNU xunto\n"
+"con este programa, de non ser así, escriba á Free Software Foundation, "
+"Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Engadido Sndfile"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Sobre o engadido de saída Sndio"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Engadido de saída Sndio Output\n\nEscrito por Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Engadido de saída Sndio Output\n"
+"\n"
+"Escrito por Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Formato non admitido"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Foi solicitado un formato non admitido polo dispositivo de son.\n\nTenteo de novo co servidor sndiod(1) en execución."
+msgstr ""
+"Foi solicitado un formato non admitido polo dispositivo de son.\n"
+"\n"
+"Tenteo de novo co servidor sndiod(1) en execución."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "Dispositivo «sndio»"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(como predeterminado medio baleiro)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Aceptar"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Cambio de canción"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Orde que executar cando Audacious reproduce unha canción nova."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Orde:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Orde que executar na fin dunha canción."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Orde que executar cando Audacious chega á fin dunha lista de reprodución."
+msgstr ""
+"Orde que executar cando Audacious chega á fin dunha lista de reprodución."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Orde que executar cando o título cambia para una canción (é dicir, títulos de fluxos da rede)"
+msgstr ""
+"Orde que executar cando o título cambia para una canción (é dicir, títulos "
+"de fluxos da rede)"
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3474,35 +4069,91 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Pode empregar os formatos descritos embaixo, que\nserán substituídos antes da invocación da orde\n(non todos poden ser empregados para a orde fin\nda lista de reprodución):\n\n%F: frecuencia (en hertzios)\n%c: número de canles\n%f: nome do ficheiro (ruta completa)\n%l: duración (em ms)\n%n ou %s: nome da canción\n%r: taxa (en bits por segundo)\n%t: posición na lista de reprodución (%02d)\n%p: reproducíndose actualmente (1 ou 0)\n%a: interprete\n%b: álbum\n%T: título da pista"
+msgstr ""
+"Pode empregar os formatos descritos embaixo, que\n"
+"serán substituídos antes da invocación da orde\n"
+"(non todos poden ser empregados para a orde fin\n"
+"da lista de reprodución):\n"
+"\n"
+"%F: frecuencia (en hertzios)\n"
+"%c: número de canles\n"
+"%f: nome do ficheiro (ruta completa)\n"
+"%l: duración (em ms)\n"
+"%n ou %s: nome da canción\n"
+"%r: taxa (en bits por segundo)\n"
+"%t: posición na lista de reprodución (%02d)\n"
+"%p: reproducíndose actualmente (1 ou 0)\n"
+"%a: interprete\n"
+"%b: álbum\n"
+"%T: título da pista"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Os parámetros enviados á consola deberíanse delimitar con comiñas. Doutro xeito existe un risco de seguranza."
+msgstr ""
+"Os parámetros enviados á consola deberíanse delimitar con "
+"comiñas. Doutro xeito existe un risco de seguranza."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Ordes"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Engadido SoX Resampler para Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Baseado no engadido Sample Rate Converter:\n"
+"Copyright 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Rápido"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Baixa"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Alta"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Moi alta"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Calidade:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "SoX Resampler"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Velocidade e ton"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Ton:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Velocidade e ton"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3511,94 +4162,114 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "Engadido de icona de estado\n\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nEste engadido fornece unha icona de estado, situada na\nárea de información do sistema do xestor de xanelas."
+msgstr ""
+"Engadido de icona de estado\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Este engadido fornece unha icona de estado, situada na\n"
+"área de información do sistema do xestor de xanelas."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Acción coa roda do rato"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Cambiar o volume"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Cambiar a cancion que se está a reproducir"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Outras configuracións"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Desactivar a xanela emerxente"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Pechar na área de notificación"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avanzar na lista de reprodución ao desprazar cara arriba"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Icona de estado"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Engadido Extra Stereo\n\nPor Johan Levin, 1999"
+msgstr ""
+"Engadido Extra Stereo\n"
+"\n"
+"Por Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Extra estéreo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Extra estéreo"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Xerador de tons: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "Xerador sinoidal de ton por Håvard Kvålen <havardk@xmms.org>\nModificado por Daniel J. Peng <danielpeng@bigfoot.com>\n\nPara empregalo, engada un URL: tone://frecuencia1;frecuencia2;frecuencia3;...\np.ex. tone://2000;2005 para reproducir un ton de 2000 Hz e un ton de 2005 Hz"
+msgstr ""
+"Xerador sinoidal de ton por Håvard Kvålen <havardk@xmms.org>\n"
+"Modificado por Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Para empregalo, engada un URL: tone://frecuencia1;frecuencia2;"
+"frecuencia3;...\n"
+"p.ex. tone://2000;2005 para reproducir un ton de 2000 Hz e un ton de 2005 Hz"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Xerador de tons"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "Engadido de E/S para Audacious\nCopyright 2009-2012 John Lindgren\n\nESTE ENGADIDO É NECESARIO. NON O DESACTIVE."
+msgstr ""
+"Engadido de E/S para Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"ESTE ENGADIDO É NECESARIO. NON O DESACTIVE."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Engadido File I/O"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Supresión de voz"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3617,46 +4288,76 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Decodificador Ogg Vorbis de Audacious\n\nBasado no engadido Ogg Vorbis da Xiph.org Foundation:\nhttp://www.xiph.org/\n\nCódigo orixinal de:\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nCoas colaboracións de:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Decodificador Ogg Vorbis de Audacious\n"
+"\n"
+"Basado no engadido Ogg Vorbis da Xiph.org Foundation:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Código orixinal de:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Coas colaboracións de:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Descodificador de Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr " Reprodutor do formato de ficheiro Vortex por Sashnov Alexander <sashnov@ngs.ru>\nBaseado no in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\nEngadido de Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+" Reprodutor do formato de ficheiro Vortex por Sashnov Alexander <sashnov@ngs."
+"ru>\n"
+"Baseado no in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Engadido de Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Descodificador VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "con perdas (híbrido)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "con perdas"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n\nUnah parte do código do engadido foi feita por Miles Egan."
+msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Unah parte do código do engadido foi feita por Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Descodificador WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Descodificador 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Lista de reprodución XML compartíbel (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "Engadido AMIDI - seleccione un ficheiro"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Ordenar a s_elección"

audacious-plugins-3.3.4.tar.bz2/po/hu.po -> audacious-plugins-3.4.2.tar.bz2/po/hu.po Changed

@@ -1,592 +1,589 @@
 # Hungarian translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Peter Polonkai <polesz@nedudu.hu>, 2010.
-# Péter Polonkai <polesz@nedudu.hu>, 2011-2012.
+# Péter Polonkai <polesz@nedudu.hu>, 2010
+# Péter Polonkai <polesz@nedudu.hu>, 2011-2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-29 19:25+0000\n"
-"Last-Translator: Péter Polonkai <polesz@nedudu.hu>\n"
-"Language-Team: Hungarian\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-04 12:38+0000\n"
+"Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
+"Language-Team: Hungarian (http://www.transifex.com/projects/p/audacious/"
+"language/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "sztereó"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "térhatású"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "AAC Dekóder"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr ""
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib Lejátszó)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Riasztás"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Ez egy ébresztési hívás."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Riasztási beállítások"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Idő"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "óra"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "perc"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Csendes ezután:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Riasztás (alapértelmezett):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Ez egy ébresztési hívás."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Válassza ki a riasztás napját a következőekből"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Alapértelmezett"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Emlékeztető"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Nap"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Hétfő"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Kedd"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Szerda"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Csütörtök"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Péntek"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Szombat"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Vasárnap"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Hétfő"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Riasztási beállítások"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Idő"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Riasztás (alapértelmezett):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Csendes ezután:"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "óra"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "perc"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Válassza ki a riasztás napját a következőekből"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Nap"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Alapértelmezett"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Napok"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Elhalványulás"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "másodperc"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Hangerő"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Jelenlegi"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Kezdjük a"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Vége"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Jelenlegi"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "További parancs"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "engedélyez"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Lejátszólista (opcionális)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Lejátszólista választása"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Emlékeztető"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Emlékeztető használata"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Opciók"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Mit jelentenek ezek a lehetőségek?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Súgó"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Mégsem"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Mai emlékeztető.."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Köszönöm"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Album borító"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Alapértelmezett PCM eszköz"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Alapértelmezett keverő eszköz"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA Kimeneti bővítmény beállítások"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "PCM eszköz:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Keverő eszköz:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Mixer elem:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "ALSA kimenet"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (MIDI Lejátszó)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
 msgstr ""
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI Lejátszó)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "ALSA háttér-szolgáltatás"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "FludSynth háttér-szolgáltatás"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Port"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Kliens neve"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Port neve"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "ALSA kimeneti portok"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Hangkártya:"
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Keverő szabályozás:"
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Keverő beállítások"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "ALSA\nháttér-szolgáltatás"
+msgstr ""
+"ALSA\n"
+"háttér-szolgáltatás"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - backend információ"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Backend választás"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Lejátszási beállítások"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transzponálás:"
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Haladó beállítások"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "előre kiszámítani a MIDI fájlok hosszát a lejátszólistában"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "extra megjegyzések a MIDI fájlból (ha van)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "dalszöveg kibontása a MIDI fájból (ha elérhető)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nbővítmény"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - fájl választás"
+msgstr ""
+"AMIDI\n"
+"bővítmény"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - SoundFont fájl választás"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "SoundFont beállítások"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Méret (byte)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "SF betöltése a lejátszó indításakor"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Szintetizátor beállítások"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "erősítés"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "legyen alapértelmezett"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "érték:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "polifonikus"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "visszhang"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "igen"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "nem"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "kórus"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "mintavételi frekvencia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "egyéb"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
 msgstr "FluidSynth háttér-szolgáltatás"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Név"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " MIDI Információ "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formátum:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Hossz (msec):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Sáv sorszáma:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "változó"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Kezdeti idő"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI Megjegyzések és Dalszövegek "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* nem található megjegyzés ehhez a MIDI fájlhoz *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* nem található dalszöveg ehhez a MIDI fájlhoz *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (érvénytelen UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -782,8 +779,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Kompozít kezelő nem érzékelhető;\nha tudja, hogy van egy futó kompozít kezelő, kérjük aktiválja, egyébként az OSD nem fog megfelelően működni"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Kompozít kezelő nem érzékelhető;\n"
+"ha tudja, hogy van egy futó kompozít kezelő, kérjük aktiválja, egyébként az "
+"OSD nem fog megfelelően működni"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -846,47 +847,47 @@
 msgid "Misc"
 msgstr "Egyéb"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "ASXv1/ASXv2 lejátszólisták"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious lejátszólisták (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Szín"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Szolid szkóp"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr ""
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr ""
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Vágási frekvencia:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr ""
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Spektrum analizátor"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -898,231 +899,232 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Eszköz"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Olvasási sebesség:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Eszköz felülírása:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metaadat"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "CD-Text használata"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "CDDB használata"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Hasznájon HTTP helyett CDDBP protokollt"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Szerver:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Elérési út:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Audio CD bővítmény"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "A cdio alrendszer inicializálása sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Érvénytelen URI: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "%d sáv nem található."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Ez adatsáv: %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Az audio kimenet megnyitása sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Hiba az audio CD olvasásakor."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "A CD eszköz %s megnyitása sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Sikertelen a cddb kapcsolat létrehozása."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "A meghajtó üres."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Nem támogatott lemez típus."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "CD lejátszása"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "CD Hozzáadása"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Audio CD menüelemek"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Tömörítés"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Közép hangerő:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Dinamikus tartomány:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr ""
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Játék Konzol Zene Dekóder"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Általános"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Lejátszás"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Basszus:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "mp"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Magas:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Alapértelmezett szám hossz:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Újra mintavételezés"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Engedélyezi az audio újra mintavételezést"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Újra mintavételezési arány:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr ""
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Visszhang növelése"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
 msgstr ""
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1132,86 +1134,92 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Átfedés"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Átfedés"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intenzitás:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Visszhang"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Késleltetés:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Visszajelzés:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Hangerő:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Visszhang bővítmény\nÍrta Johan Levin, 1999\n\nSurround visszhang írta Carl van Schaik, 1999"
+msgstr ""
+"Visszhang bővítmény\n"
+"Írta Johan Levin, 1999\n"
+"\n"
+"Surround visszhang írta Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Visszhang"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1221,7 +1229,7 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg bővítméyn"
 
@@ -1303,11 +1311,13 @@
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Sztereó"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Monó"
 
@@ -1355,7 +1365,7 @@
 msgid "Error protection"
 msgstr "Hiba védelem"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Minőség"
 
@@ -1435,41 +1445,63 @@
 msgid "Tags"
 msgstr "Címkék"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis kódoló beállítások"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Minőségi szint (0-10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Eredeti kód szerzője\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Eredeti kód szerzője\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "FLAC dekódoló"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "GIO bővítmény az Audacious-hoz\nCopyright 2009-2012 John Lindgren"
+msgstr ""
+"GIO bővítmény az Audacious-hoz\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "GIO bővítmény"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
@@ -1477,500 +1509,543 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Gnome rövidítések"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Bejegyzés száma"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Cím"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Előadó"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Év"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Sáv"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Műfaj"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Várakozási sor pozíció"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Hossz"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Fájl elérési útja"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Egyéni cím"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Bitráta"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Oszlopok választása"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Elérhető:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Választott:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Balra rögzít"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Jobbra rögzít"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Felülre rögzít"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Alulra rögzít"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Rögzítés feloldása"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Letiltás"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "Fájl_ok megnyitása ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "_URL megnyitása ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "Fájlok hozzá_adása ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "U_RL hozzáadása ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "Kere_sés a gyűjteményben"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "_Névjegy ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Beállítások ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Lejátszás"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "_Szünet"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Megállítás"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "Elő_ző"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Következő"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "_Ismétlés"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "_Véletlenszerű"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "_Ne legyen léptetés a lejátszólistában"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Megállítás _az aktuális szám után"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "Dal _információ ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Ugrás _időre ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "Ugrás _dalra ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Sáv szeri_nt"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Cím szerin_t"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Sáv szeri_nt"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Elő_adó szerint"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "A_lbum szerint"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "_Dátum szerint"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "_Fájl útvonal szerint"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "_Egyedi cím szerint"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "Fo_rdított sorrend"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "Véletlensze_rű sorrend"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr ""
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Frissítés"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "_Nem elérhető fájlok törlése"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "Rendezé_s"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Kijelöltek rendezése"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "_Nem elérhető fájlok törlése"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Új"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Át_nevezés ..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Bezár"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importálás ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Exportálás ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "_Lejátszólista kezelő ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "_Várakozási sor kezelő ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "Hangerő _fel"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "Hangerő _le"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Hangszínszabályzó"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_ffektusok"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Felület"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Megjelenítés"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "_Menü sor mutatása"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "I_nfo sor mutatása"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Inf_ormációs sáv mutatása"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "_Státusz sor mutatása"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "_Bezárás gomb mutatása"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "O_szlop fejlécek mutatása"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "_Válasszon oszlopokat ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Számváltáskor scro_llozik"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Fájl"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "L_ejátszás"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Lejátszólista"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Szervizek"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Kimenet"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Nézet"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "_Kivágás"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Másolás"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Beillesztés"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Mind kivál_aszt"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "Átneve_zés ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "GTK+ felület"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Pufferelés ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Hiba"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d csatorna"
 msgstr[1] "%d csatorna"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Előző szám"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Lejátszás"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Szünet/Folytatás"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Leállít"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Következő szám"
+msgid "Rewind 5 seconds"
+msgstr ""
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Vissza 5 másodperccel"
+msgid "Mute"
+msgstr "Némítás"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Előre 5 másodperccel"
+msgid "Volume up"
+msgstr ""
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Némítás"
+msgid "Volume down"
+msgstr ""
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Hangerő fel"
+msgid "Jump to file"
+msgstr ""
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Hangerő le"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Ugrás fájlhoz"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "On-Screen-Display mutatása"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Lejátszó ablak(ok) váltása"
+msgid "Toggle repeat"
+msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "On-Screen-Display mutatása"
+msgid "Toggle shuffle"
+msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Ismétlés váltása"
+msgid "Toggle stop after current"
+msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Véletlenszerű lejátszás váltása"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(nincs)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Egér gombok hozzárendelése"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr ""
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Gyorsbillentyűk:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Művelet:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Billentyű kötések:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1985,11 +2060,11 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Általános gyorsbillentyűk"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
@@ -1997,62 +2072,64 @@
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "JACK kimenet"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s Beállítások"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr ""
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Modul útvonalak:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
 msgstr ""
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Elérhető bővítmények:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Engedélyez"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Engedélyezett modulok:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Beállítások"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "LADSPA gép"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: nem sikerült a LIRC támogatás inicializálni\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2060,27 +2137,27 @@
 "%s: how to create a proper config file\n"
 msgstr ""
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: újracsatlakozás...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: ismeretlen parancs \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr ""
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr ""
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2096,67 +2173,67 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Kapcsolat"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Újracsatlakozás a LIRC szerverhez"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Várjon az újracsatlakozás előtt:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "LIRC bővítmény"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Nincs elérhető zeneszöveg"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Nem sikerült letölteni: %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Nem sikerült értelmezni: %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Zeneszöveg keresése ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Érvénytelen a dal metaadata"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Kapcsolódás a lyrics.wikia.com helyhez ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki bővítmény"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "M3U lejátszólisták"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact generátor: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact generátor: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2165,84 +2242,218 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr ""
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Csatorna keverő"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Kimeneti csatornák:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Csatorna keverő"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "MMS bővítmény"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Modul lejátszó)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Térhatású"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "MPG123 bővítmény"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 szerver"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS bővítmény"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Leállítva"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Az Audacious nem játszik."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Asztali értesítések"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Szünet"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Következő"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Alapértelmezett eszköz"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Audio eszköz:"
 
@@ -2267,22 +2478,23 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "PLS lejásztólisták"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2302,160 +2514,200 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "PulseAudio kimenet"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr ""
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Lineáris interpoláció"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Átalakítás"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Módszer: "
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr ""
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr ""
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr ""
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr ""
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Jelszó megváltoztatása"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Szolgáltatások"
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Felhasználónév:"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Jelszó:"
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "Scrobbler URL:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
 msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr ""
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Gyűjtemény"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Ismeretlen Előadó"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Ismeretlen Album"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
 msgstr ""
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d album"
 msgstr[1] "%d album"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2463,10 +2715,14 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n%s, %d dal"
-msgstr[1] "%s\n%s, %d dal"
+msgstr[0] ""
+"%s\n"
+"%s, %d dal"
+msgstr[1] ""
+"%s\n"
+"%s, %d dal"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2477,73 +2733,73 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Lejátszólista létrehozása"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "Lejátszólistához hozzá_ad"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Keresés a gyűjteményben"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Kérem várjon ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Mappa választás"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr ""
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Lejátszó:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Főablak betűtípus kiválasztás:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Lejátszólista:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Válassza ki a lejátszólista betűkészletét:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Betűkészletek"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Bitmap fontok használata (csak ASCII támogatása)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "A dal címe mindkét irányba mozog"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Bőr"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Felület beállítások"
 
@@ -2599,7 +2855,7 @@
 msgid "Presets"
 msgstr "Profilok"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Előre beállított betöltése"
 
@@ -2612,7 +2868,7 @@
 msgid "Load equalizer preset"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr ""
 
@@ -2624,7 +2880,7 @@
 msgid "Save equalizer preset"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr ""
 
@@ -2632,739 +2888,753 @@
 msgid "Delete auto-preset"
 msgstr ""
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Tekerés %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hangerő: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balansz: %d%% bal"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Balansz: közép"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balansz: %d%% jobb"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Beállítások menü"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Tiltja a 'Mindig felül' opciót"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Engedélyezi a 'Mindig felül' opciót"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Fájl Információs doboz"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Megjelenítési menü"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Egyszerű mód."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Lejátszólista mód."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Leállítás az aktuális dal után."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Nincs leállítás az aktuális dal után."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Dal címének scrollozása"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Leállítás az aktuális dal után"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Csúcsérték"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Ismétlés"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Véletlenszerű"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Ne legyen léptetés a lejátszólistában"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Lejátszó mutatása"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Lejátszólista szerkesztő mutatása"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Hangszínszabályzó mutatása"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Mindig felül"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Minden munkaterületre elhelyez"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Lejátszó felgördítése"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Lejátszólista szerkesztő felgördítése"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Hangszínszabályzó felgördítése"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analizátor"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Szkóp"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Voiceprint"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Kikapcsolva"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Szokásos"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Tűz"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Függőleges vonalak"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Vonalak"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Csíkok"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Pont szkóp"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Vonal szkóp"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Szolid szkóp"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Jég"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Sima"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Lasabb"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lassú"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Közepes"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Gyors"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Leggyorsabb"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Eltelt idő"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Hátralévő idő"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Szünet"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Előző"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Következő"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Megjelenítés"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Megjelenítési mód"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Analizátor mód"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Szkóp mód"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Voiceprint Mód"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr ""
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Analizátor kikapcsolása"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Csúcsérték ki"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Lejátszólista"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Lejátszólista lejátszása"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Új lejátszólista"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "A következő lejátszólista kijelölése"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Az előző lejátszólista kijelölése"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Lejátszólista törlése"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Lejátszólista importálása"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Lejátszólista betöltése a kiválasztott lejátszólistába."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Lejátszólista exportálása"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Kiválasztott lejátszólista mentése."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Lista frissítése"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "A lejátszólista elemek metaadatainak frissítése."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Lejátszólista kezelő"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Várakozási sor kezelő"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Nézet"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Felület"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Felület beállítások ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Internetes cím hozzáadása ..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Távoli sávok hozzáadása a lejátszólistához."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Fájlok hozzáadása ..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Fájlok hozzáadása a lejátszólistához."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Keresés és választ"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Keres a lejátszási listán és kiválasztja azokat a lista bejegyzéseket amik megfelelnek a meghatározott kritériumoknak."
+msgstr ""
+"Keres a lejátszási listán és kiválasztja azokat a lista bejegyzéseket amik "
+"megfelelnek a meghatározott kritériumoknak."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Kijelölés megfordítása"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Megfordítja a kiválasztásokat."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Mindet kijelöl"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Minden szám kiválasztása a lejátszólistán."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Nincs kijelölés"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Minden kijelölés megszüntetése a lejátszólista elemein."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Összes törlése"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Minden elem eltávolítása a lejátszólistáról."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Várólista törlése"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Törli a várakozási sorral kapcsolatos listát."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Elérhetetlen fájlok törlése"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Törölje az elérhetetlen fájlokat a lejátszólistáról."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Kettőzöttek eltávolítása"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Cím szerint"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "A többszörösen felvett elemek törlése a lejátszólistáról cím alapján."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Fájlnév szerint"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "A többszörösen felvett elemekt törlése a lejátszólistáról fájlnév alapján."
+msgstr ""
+"A többszörösen felvett elemekt törlése a lejátszólistáról fájlnév alapján."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Útvonal + fájlnév szerint"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "A többszörösen felvett elemekt törlése a lejátszólistáról teljes elérési út alapján."
+msgstr ""
+"A többszörösen felvett elemekt törlése a lejátszólistáról teljes elérési út "
+"alapján."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Nem kiválasztottak törlése"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Minden nem kiválasztott elem törlése a lejátszólistáról."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Kijelölt törlése"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Kijelölt elemek törlése a lejátszólistáról"
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Véletlenszerű lista"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Lejátszólista véletlenszerű keverése."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Fordított lista"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Megfordítja a lejátszólistát."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Lista rendezése"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Lista rendezése cím alapján."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Album szerint"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Lista rendezése album szerint."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Előadó szerint"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Lista rendezése előadók szerint."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "A lista rendezése fájlok neve szerint."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Lista rendezése teljes útvonal alapján."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Dátum alapján"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "A lista rendezése a módosítás ideje szerint"
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "A dal sorszáma szerint"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Lista rendezése a szám sorszáma alapján."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Kijelöltek rendezése"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Fájl"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Bővítmények karbantartása"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Szám részleteinek megjelenítése"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Szám részleteinek megjelenítése"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Audacious névjegye"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Fájl lejátszáa"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Megyitja és lejátsza a fájlt"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Hely lejátszása"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Média lejátszása a kiválasztott helyről"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Szolgáltatások kezelése"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Beállítások"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Tulajdonságok ablak megnyitása"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Kilépés az Audaciousból"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Beállítás A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Törlés A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Ugrás fájlhoz"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Ugrás a megadott időre"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Várakozási sor váltása"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Engedélyezi/letiltja az elemek lejátszólista várósorba helyezését."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Másolás"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Kivágás"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Betöltés"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importálás"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Mentés"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Előre beállított"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Előre beállított automatikus betöltése"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Nulla"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Legyen minden hangszínszabályozó értéke nulla"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Fájlból"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Fájlba"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Elemek keresése az aktív lejátszólistában"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Cím:"
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album:"
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Előadó:"
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Fájlnév:"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Az előző kiválasztások törlése keresés előtt"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Automatikusan várólistára kerülnek a talált elemek"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Hozzon létre új lejátszólistát az egyező elemekből"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Audacious lejátszólista szerkesztő"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d / %d)"
@@ -3382,81 +3652,97 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nem lehet létrehozni a könyvtárat (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 msgstr ""
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Nem támogatott formátum"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
 msgstr ""
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "sndio eszköz"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr ""
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Mégsem"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Szám váltás"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Parancs futtatása ha az Audacious elindít egy új számot."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Parancs:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Parancs futtatása a dal végén."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Parancs futtatása amikor Audacious elér a lejátszási lista végéhez."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr "Parancs futtatása ha a dal cím változik (pl. hálózati stream-címek)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3475,33 +3761,66 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Parancsok"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3512,63 +3831,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Hangerő váltás"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Váltja a lejátszott dalt"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Egyéb beállítások"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Felugró ablakok tiltása"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Extra Sztereó"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Hang generátor:"
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3577,11 +3896,11 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr ""
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -3589,15 +3908,15 @@
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr ""
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3618,44 +3937,47 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr ""
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr ""
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr ""
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr ""
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - fájl választás"

audacious-plugins-3.3.4.tar.bz2/po/id_ID.po -> audacious-plugins-3.4.2.tar.bz2/po/id_ID.po Changed

@@ -1,603 +1,614 @@
 # Indonesian translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# <aftian@yahoo.com>, 2012.
-# <andika@gmail.com>, 2012.
-# Ardjuna <Asyura.x@gmail.com>, 2012.
-# <astrojim.blankon@gmail.com>, 2012.
-# <bu0ncu3@yahoo.com>, 2012.
-# <kokabiel9@gmail.com>, 2012.
-# <martadinata666@gmail.com>, 2012.
-# Mohamad Hasan Al Banna <se7entime@gmail.com>, 2012-2013.
-# <pri_yess@yahoo.com>, 2012.
-# Rahman Yusri Aftian <aftian@yahoo.com>, 2012-2013.
-# <xunilresu@gmail.com>, 2012.
-# <yudi.al@gmail.com>, 2012.
-# <yustrizal24@gmail.com>, 2012.
-msgid ""
-msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+# Rahman Yusri Aftian <aftian@yahoo.com>, 2012
+# Andika Triwidada <andika@gmail.com>, 2012
+# Ardjuna <Asyura.x@gmail.com>, 2013
+# Ardjuna <Asyura.x@gmail.com>, 2012
+# mijortsa <astrojim.blankon@gmail.com>, 2012
+# <bu0ncu3@yahoo.com>, 2012
+# mascatur <satyafree@gmail.com>, 2013
+# <kokabiel9@gmail.com>, 2012
+# martadinata666 <martadinata666@gmail.com>, 2012
+# Mohamad Hasan Al Banna <se7entime@gmail.com>, 2012-2013
+# <pri_yess@yahoo.com>, 2012
+# Rahman Yusri Aftian <aftian@yahoo.com>, 2012-2013
+# operamaniac <rizkiaulia.r@gmail.com>, 2013
+# xunilresu <xunilresu@gmail.com>, 2012
+# <yudi.al@gmail.com>, 2012
+# <yustrizal24@gmail.com>, 2012
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2013-01-07 11:57+0000\n"
-"Last-Translator: Mohamad Hasan Al Banna <se7entime@gmail.com>\n"
-"Language-Team: Indonesian\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-15 13:29+0000\n"
+"Last-Translator: operamaniac <rizkiaulia.r@gmail.com>\n"
+"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/"
+"audacious/language/id_ID/)\n"
+"Language: id_ID\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "stereo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "surround"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Dekoder AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr ""
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Pemutar AdLib)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Ini adalah panggilan bangun Anda."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Pengaturan Alarm "
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Waktu"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "jam"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "j"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "menit"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Diam setelah:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Alarm pada (baku):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Ini adalah panggilan bangun Anda."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Pilih hari untuk alarm datang pada"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Bawaan"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Pengingat"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Hari"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Senin"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Kamis"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
-msgstr "Jum'at"
+msgstr "Jumat"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Minggu"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Senin"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Pengaturan Alarm "
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Waktu"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Bunyikan alarm pada (bawaan):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "j"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Diam setelah:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "jam"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "menit"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Pilih hari aktivasi alarm"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Hari"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Bawaan"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Hari"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
-msgstr "Kabur"
+msgstr "Memudar"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "detik"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Sekarang"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Dimulai dari"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Paripurna"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Sekarang"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Perintah Tambahan"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "gunakan"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Daftar lagu (pilihan)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Pilih daftar lagu"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Pengingat"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Gunakan pengingat"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Pilihan"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
-msgstr "Apa yang dimaksud dengan opsi ini ?"
-
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
+msgstr "Apa yang dimaksud dengan opsi ini?"
 
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Bantuan"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Batal"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Pengingat Anda untuk hari ini adalah..."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Terima kasih"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Sampul Album"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
-msgstr "Perangkat PCM baku"
+msgstr "Perangkat PCM standar"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
-msgstr "Perangkat mixer baku"
+msgstr "Perangkat mixer standar"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Preferensi Pengaya Keluaran ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Perangkat PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
-msgstr "Perangkat Pencampur:"
+msgstr "Perangkat mixer:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
-msgstr "Elemen pencampur:"
+msgstr "Elemen mixer:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
-msgstr "Bekerja sekitar pemutusan drain"
+msgstr "Antisipasi pemutusan saluran"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "Keluaran ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (Pemutar MIDI)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Anda belum memilih port sequencer apapun untuk pemutaran MIDI.\nAnda bisa melakukannya di preferensi pengaya MIDI."
+msgstr ""
+"Anda belum memilih port sekuenser untuk pemutaran MIDI. Anda dapat "
+"melakukannya melalui menu preferensi pengaya MIDI."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (Pemutar MIDI)"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
-msgstr "Backend ALSA "
+msgstr "Ujung-belakang ALSA "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Bagian ini mengirim perintah MIDI pada kelompok dari user yang terpilih oleh lokasi pengurut ALSA. Antarmuka pengurut ALSA sangat berguna untuk menyediakan lokasi kartu suara, dan yang lainnya.\nBagian ini tidak menghasilkan suara, perintah MIDI secara langsung, diatur dari perangkat keras/lunak di belakang lokasi ALSA; sebagai contoh, perintah MIDI dikirim ke perangkat keras akan secara langsung dimainkan.\nBagian dasar ini ditulis oleh Giacomo Lozito."
+msgstr ""
+"Bagian ini mengirim perintah MIDI pada kelompok dari user yang terpilih "
+"oleh lokasi pengurut ALSA. Antarmuka pengurut ALSA sangat berguna untuk "
+"menyediakan lokasi kartu suara, dan yang lainnya.\n"
+"Bagian ini tidak menghasilkan suara, perintah MIDI secara langsung, diatur "
+"dari perangkat keras/lunak di belakang lokasi ALSA; sebagai contoh, perintah "
+"MIDI dikirim ke perangkat keras akan secara langsung dimainkan.\n"
+"Bagian dasar ini ditulis oleh Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "FluidSynth Backend"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Port"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Nama klien"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Nama port"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Port keluaran ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Kartu suara:"
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Kendali mixer: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Pengaturan mixer"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "Backend\nALSA"
+msgstr ""
+"Backend\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - informasi backend"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Seleksi backend"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Setelan putar kembali"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Ubah nada: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Perpindahan drum: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Pengaturan lanjutan"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "kalkulasi panjang lagu berformat MIDI dalam daftar"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "ekstrak komenttar dari berkas MIDI (jika tersedia)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "ekstrak lirik dari berkas MIDI (jika tersedia)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - Pilih berkas"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Pengaturan AMIDI-Plug"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - pilih berkas SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Pengaturan SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Namaberkas"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Ukuran (bytes)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Muat SF saat pemutar berjalan"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Synthesizer settings"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "mendapatkan"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "Gunakan standar"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "nilai:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "reverb"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "ya"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "tidak"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "paduan suara"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "Contoh laju"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "Penyeragaman"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
 msgstr ""
+"FluidSynth\n"
+"backend"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " MIDI Info "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Panjang(milidetik)"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Waktu Div:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " Info dan Lirik MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* tidak ada komentar yang tersedia di berkas MIDI ini *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* tidak ada lirik yang tersedia di berkas MIDI ini *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 tidak cocok)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Tentang AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr "AMIDI-Plug"
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -661,7 +672,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Tampilkan OSD selama lagu diputar. Judul lagu akan diubah namun tidak dengan nama berkasnya. Umumnya berguna untuk menampilkan perubahan judul saat streaming melalui internet."
+msgstr ""
+"Tampilkan OSD selama lagu diputar. Judul lagu akan diubah namun tidak dengan "
+"nama berkasnya. Umumnya berguna untuk menampilkan perubahan judul saat "
+"streaming melalui internet."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -685,11 +699,11 @@
 
 #: src/aosd/aosd_ui.c:200
 msgid "Relative X offset:"
-msgstr ""
+msgstr "Mengimbangi X relatif:"
 
 #: src/aosd/aosd_ui.c:207
 msgid "Relative Y offset:"
-msgstr ""
+msgstr "Mengimbangi Y relatif:"
 
 #: src/aosd/aosd_ui.c:214
 msgid "Max OSD width:"
@@ -793,8 +807,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
 msgstr ""
+"Manajer gabungan tidak terdeteksi\n"
+"kecuali kalau kamu tahu bahwa kamu punya satu yang berjalan, harap "
+"diaktifkan sebaliknya OSD tidak akan bekerja dengan baik"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -857,47 +875,47 @@
 msgid "Misc"
 msgstr "Misc"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr ""
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Daftar Putar Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr ""
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr ""
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr ""
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr ""
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr ""
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -909,231 +927,234 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metadata"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Gunakan CD-Teks"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Gunakan HTTP daripada CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Pengaya Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Penggerak kosong."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Tipe diska tidak didukung."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Putar CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Tambah CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr ""
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr ""
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Volume tengah:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Jangkauan dinamis:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr ""
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Dekoder Musik Konsol Game"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Umum"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Putar Lagu"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Bass:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "det"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Trebel:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Panjang standar lagu:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Sampel ulang"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Aktifkan fitur sampel ulang"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Tingkat sampel ulang:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Abaikan panjang dari tag SPC"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Tingkatkan reverb"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "Panjang lagu (dalam detik) digunakan untuk lagu yang tidak ditentukan panjangnya secara spesifik (trek berulang-ulang)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Panjang lagu (dalam detik) digunakan untuk lagu yang tidak ditentukan "
+"panjangnya secara spesifik (trek berulang-ulang)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1143,74 +1164,76 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Echo"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr ""
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr ""
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr ""
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
@@ -1218,11 +1241,11 @@
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1232,7 +1255,7 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Pengaya FFmpeg"
 
@@ -1282,7 +1305,7 @@
 
 #: src/filewriter/filewriter.c:506
 msgid "Prepend track number to filename"
-msgstr ""
+msgstr "Tambahkan nomor jalur di nama berkas"
 
 #: src/filewriter/filewriter.c:515
 msgid ""
@@ -1314,11 +1337,13 @@
 msgid "Joint Stereo"
 msgstr "Gabung stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1332,7 +1357,7 @@
 
 #: src/filewriter/mp3.c:737
 msgid "Output Samplerate:"
-msgstr ""
+msgstr "Keluaran Samplerate:"
 
 #: src/filewriter/mp3.c:765
 msgid "(Hz)"
@@ -1340,7 +1365,7 @@
 
 #: src/filewriter/mp3.c:772
 msgid "Bitrate / Compression ratio:"
-msgstr ""
+msgstr "Bitrate / Rasio kompresi:"
 
 #: src/filewriter/mp3.c:796
 msgid "Bitrate (kbps):"
@@ -1360,13 +1385,13 @@
 
 #: src/filewriter/mp3.c:889
 msgid "Enforce strict ISO complience"
-msgstr ""
+msgstr "Memaksakan dengan ketat pemenuhan ISO"
 
 #: src/filewriter/mp3.c:900
 msgid "Error protection"
 msgstr "Pengaman kesalahan"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Kualitas"
 
@@ -1392,7 +1417,7 @@
 
 #: src/filewriter/mp3.c:1030
 msgid "Strictly enforce minimum bitrate"
-msgstr ""
+msgstr "Memaksakan dengan ketat bitrate terendah"
 
 #: src/filewriter/mp3.c:1042
 msgid "ABR Options:"
@@ -1404,11 +1429,11 @@
 
 #: src/filewriter/mp3.c:1080
 msgid "VBR quality level:"
-msgstr ""
+msgstr "Tingkat kualitas VBR:"
 
 #: src/filewriter/mp3.c:1099
 msgid "Don't write Xing VBR header"
-msgstr ""
+msgstr "Jangan menulis header Xing VBR"
 
 #: src/filewriter/mp3.c:1112
 msgid "VBR/ABR"
@@ -1432,7 +1457,7 @@
 
 #: src/filewriter/mp3.c:1167
 msgid "Force addition of version 2 tag"
-msgstr ""
+msgstr "Memaksa tambahan tag versi 2"
 
 #: src/filewriter/mp3.c:1177
 msgid "Only add v1 tag"
@@ -1446,19 +1471,19 @@
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Pengaturan Enkoder Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Tingkat kualitas (0-10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1466,21 +1491,37 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Dekoder FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Pengaya GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
@@ -1488,499 +1529,547 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr ""
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Masukkan angka"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Judul"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Artis"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Tahun"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Track"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Aliran"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Posisi antri"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Panjang"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
-msgstr ""
+msgstr "Tempat Berkas"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Nama berkas"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Title pilihan"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Pilih kolom"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Tersedia:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Terpilih:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Dok dikiri"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Dok dikanan"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Dok diatas"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Dok dibawah"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Tidak didok"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Nonaktifkan"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Buka Berkas..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Buka _URL..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Tambah Berkas ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Tambah U_RL..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr ""
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "Te_ntang..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Prefensu"
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Putar"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Paus_e"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "Se_belumnya"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "Sela_njutnya"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "_Ulangi"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "_Acak"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
-msgstr ""
+msgstr "N_o Kemajuan Playlist"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Berhenti_Setelah Lagu Ini"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "Informasi_Lagu..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Loncat ke _Waktu..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "_Loncat ke Lagu..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Oleh No_Track"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Oleh_Judul"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Oleh No_Track"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Oleh_Artis"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Oleh_Album"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Oleh _Tanggal Release"
 
-#: src/gtkui/menus.c:192
-msgid "By _File Path"
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
+msgid "By _File Path"
+msgstr "Berdasarkan tempat"
+
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
-msgstr ""
+msgstr "By _Judul Terkustomisasi"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "B_alik Urutan"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "_Acak Urutan"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr ""
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "Sega_rkan"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr ""
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "Uru_tkan"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Urutkan yang Terpilih"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr ""
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Baru"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Keluar"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Import..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Export..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
-msgstr ""
+msgstr "_Manajer Antrian ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "Volume _Naik"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "Volume _Turun"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Equalizer"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_fek"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "T_ampilan"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Visualisasi"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Perlihatkan Bar _Menu"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Perlihatkan _Bar Info"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Perlihatkan Bar _Status"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr ""
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
-msgstr ""
+msgstr "Tunjukkan Kolom _Headers"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Pilih _Kolom"
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
-msgstr ""
+msgstr "Gulir saat Perubahan Lagu"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Berkas"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
-msgstr ""
+msgstr "_Pemutaran"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "Daftar P_utar"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Layanan"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Keluaran"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Lihat"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
-msgstr ""
+msgstr "_Antre/Tidak Antre"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "Potong"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Salin"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Tempel"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Pilih _Semua"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Ubah nama ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Tampilan GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] ""
+msgstr[0] "%d kanal"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Trek Sebelumnya"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Putar"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Jeda/Mulai Lagi"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Berhenti"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
+msgid "Rewind 5 seconds"
 msgstr ""
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Maju 5 Detik"
+msgid "Mute"
+msgstr "Diam"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+msgid "Volume up"
 msgstr ""
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Diam"
+msgid "Volume down"
+msgstr ""
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Volume Naik"
+msgid "Jump to file"
+msgstr ""
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Volume Turun"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Lompat ke Berkas"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Tunjukkan On-Screen-Display"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+msgid "Toggle repeat"
 msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
+msgid "Toggle shuffle"
 msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
+msgid "Toggle stop after current"
 msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
+msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr ""
-
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(kosong)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
+"Tidak direkomendasikan untuk mengikat mouse utama tanpa modifikasi.\n"
+"\n"
+"Apakah anda ingin meneruskan?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
-msgstr ""
+msgstr "Mengikat tombol mouse"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
-msgstr ""
+msgstr "Konfigurasi Plugin Global Hotkey"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
+"Tekan kombinasi tombol didalam bidang teks.\n"
+"Kamu juga dapat mengikat tombol mouse."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
-msgstr ""
+msgstr "Hotkeys:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
-msgstr ""
+msgstr "Aksi:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
-msgstr ""
+msgstr "Kunci Pengikat:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1995,11 +2084,11 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
@@ -2007,62 +2096,68 @@
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "Keluaran Jack"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s Pengaturan"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
-msgstr ""
+msgstr "Pengaturan Host LADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
-msgstr ""
+msgstr "Modul path:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
 msgstr ""
+"Pisahkan kelipatan path dengan tanda titik dua.\n"
+"Path tersebut dapat dicari sebagai tambahan untuk LADSPA_PATH.\n"
+"Setelah menambahkan path baru, tekan Enter untuk mengamati plugin baru.</"
+"small>"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Pengaya tersedia:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Gunakan"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Pengaya digunakan:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr ""
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr ""
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2070,27 +2165,27 @@
 "%s: how to create a proper config file\n"
 msgstr ""
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: mencoba menyambung...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: perintah tidak diketahui \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: terputus dari LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: mencoba menyambung tiap %d detik...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2106,67 +2201,67 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Sambungan"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Menyambung kembali ke server LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Tunggu sebelum menyambung kembali:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "Pengaya LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Tidak ada lirik tersedia"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Mencari lirik ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Menyambungkan ke lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr ""
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr ""
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
-msgstr ""
+msgstr "Penghasil Tact: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
-msgstr ""
+msgstr "Penghasil Tact: %d bpm %d%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2175,90 +2270,224 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr ""
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
-msgstr ""
+msgstr "Keluaran kanal:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Pengaya MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "Pengaya MPG123"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "Server MPRIS 2"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Pengaya Neon HTTP/HTTPS"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Berhenti"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious berhenti"
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Pemberitahuan Destop"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Istirahat"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Selanjutnya"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
-msgstr ""
+msgstr "1. Alat bawaan"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Perangkat suara:"
 
 #: src/oss4/plugin.c:77
 msgid "Use alternate device:"
-msgstr ""
+msgstr "Gunakan alat alternatif"
 
 #: src/oss4/plugin.c:81
 msgid "Save volume between sessions."
@@ -2266,7 +2495,7 @@
 
 #: src/oss4/plugin.c:83
 msgid "Enable format conversions made by the OSS software."
-msgstr ""
+msgstr "Izinkan pembuatan konversi format oleh perangkat lunak OSS"
 
 #: src/oss4/plugin.c:85
 msgid "Enable exclusive mode to prevent virtual mixing."
@@ -2277,22 +2506,23 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "Keluaran OSS4"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr ""
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2312,159 +2542,199 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr ""
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr ""
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Metode"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr ""
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr ""
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr ""
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr ""
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Ganti Kata Kunci"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Layanan"
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Nama pengguna:"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Kata sandi:"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "Alamat Scrobbler"
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr ""
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr ""
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr ""
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Artis Tidak Diketahui"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Album Tidak Diketahui"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
 msgstr ""
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d album"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2474,7 +2744,7 @@
 " %s, %d songs"
 msgstr[0] ""
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2484,79 +2754,79 @@
 " %d songs by %s"
 msgstr[0] ""
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Buat Daftar Putar"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Tambah ke Daftar Putar"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr ""
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Mohon tunggu ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Pilih Folder"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Alat Pencari"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Tampilan Winamp Klasik"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "Pemutar:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
-msgstr ""
+msgstr "Pilih font jendela player utama:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
-msgstr ""
+msgstr "_Playlist:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Pilih huruf daftar putar"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "Huruf"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Gunakan huruf bitmap (hanya dukungan ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "Gulir judul lagu dalam kedua arah"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
-msgstr ""
+msgstr "_Kulit"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Pengaturan Tampilan"
 
 #: src/skins/ui_equalizer.c:328
 msgid "Preamp"
-msgstr ""
+msgstr "Preamp"
 
 #: src/skins/ui_equalizer.c:332
 msgid "31 Hz"
@@ -2604,11 +2874,11 @@
 
 #: src/skins/ui_equalizer.c:890
 msgid "Presets"
-msgstr ""
+msgstr "Presets"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
-msgstr ""
+msgstr "Muat preset"
 
 #: src/skins/ui_equalizer.c:988
 msgid "Load auto-preset"
@@ -2619,7 +2889,7 @@
 msgid "Load equalizer preset"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr ""
 
@@ -2631,7 +2901,7 @@
 msgid "Save equalizer preset"
 msgstr ""
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr ""
 
@@ -2639,739 +2909,748 @@
 msgid "Delete auto-preset"
 msgstr ""
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
-msgstr ""
+msgstr "Volume: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Keseimbangan: %d%% left"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Keseimbangan: tengah"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Keseimbangan: %d%% kanan"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Menu Opsi"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
-msgstr ""
+msgstr "Nonaktifkan 'Always On Top'"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
-msgstr ""
+msgstr "Bolehkan 'Always On Top'"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
-msgstr ""
+msgstr "Kotak Info Berkas"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Menu Visualisasi"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
-msgstr ""
+msgstr "mode Single."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
-msgstr ""
+msgstr "mode Playlist."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Berhenti setelah lagu"
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Tidak berhenti setelah lagu"
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr ""
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Berhenti setelah lagu ini"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
-msgstr ""
+msgstr "Puncak"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Ulang"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Acak"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
-msgstr ""
+msgstr "Tidak ada kemajuan Playlist"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Munculkan Pemutar"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Munculkan Perubah Daftar Lagu"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Munculkan Equalizer"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
-msgstr ""
+msgstr "Selalu di Atas"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
-msgstr ""
+msgstr "Masukan kesemua layar kerja"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
-msgstr ""
+msgstr "Gulung Player keatas"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
-msgstr ""
+msgstr "Gulung Editor Playlist keatas"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
-msgstr ""
+msgstr "Gulung Equalizer keatas"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
-msgstr ""
+msgstr "Analyzer"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
-msgstr ""
+msgstr "Cakupan"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
-msgstr ""
+msgstr "Voiceprint"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Mati"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Api"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Garis Vertikal"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Garis"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Batang"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
-msgstr ""
+msgstr "Cakupan titik"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
-msgstr ""
+msgstr "Cakupan Garis"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
-msgstr ""
+msgstr "Cakupan Solid"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Es"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Halus"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Paling Lambat"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lambat"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Sedang"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Cepat"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Paling Cepat"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Waktu Berjalan"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Waktu Tersisa"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Istirahat"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Sebelumnya"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Selanjutnya"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Visualisasi"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Model Visualisasi"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Model Analyzer"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Model Scope"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Model Voiceprint"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
-msgstr ""
+msgstr "Mode WindowsShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
-msgstr ""
+msgstr "Analyzer Falloff"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
-msgstr ""
+msgstr "Puncak Falloff"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Daftar Putar"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Putar Daftar Lagu"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Daftar Lagu Baru"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Pilih Daftar Lagu Selanjutnya"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Pilih Daftar Lagu Sebelumnya"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Hapus Daftar Lagu"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Impor Daftar Putar"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Muat Daftar Putar kedalam daftar putar terpilih"
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Ekspor Daftar Putar"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Simpan daftar lagu terpilih."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Segarkan daftar"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Segarkan asosiaso metadata dengan isi daftar putar"
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Manajer Daftar Putar"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Manajer Antrian"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Lihat"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Tampilan"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Pengaturan Tampilan ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Tambah Alamat Internet..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
-msgstr ""
+msgstr "Tambah jalur remote ke playlist"
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Tambah Berkas..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Tambah berkas ke daftar lagu"
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Cari dan Pilih"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "Cari daftar putar dan pilih daftar putar berdasarkan kriteria"
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Balik Pilihan"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Balik isi yang terpilih dan yang tidak terpilih"
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Pilih Semua"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Pilih semua isi daftar putar"
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Jangan Pilih Apapun"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Batal pilih semua isi daftar putar"
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Hapus Semua"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Hapus semua isi dari daftar putar"
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Bersihkan Antrian"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Hapus antrian yang terasosiasi dengan daftar putar ini"
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Hapus File yang Tidak Tersedia"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Hapus File yang Tidak Tersedia dari daftar putar"
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Hapus Duplikat"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Dari Judul"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Hapus isi yang terduplikasi dari daftar putar berdasar judul"
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Dari Nama berkas"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Hapus isi yang terduplikasi dari daftar putar berdasar nama file"
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
-msgstr ""
+msgstr "Oleh Path + Nama Berkas"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr ""
+msgstr "Hapus duplikasi entri dari playlist oleh path penuh playlist."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
-msgstr ""
+msgstr "Hapus yang tidak Terpilih"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
-msgstr ""
+msgstr "Hapus entri yang tidak terpilih dari playlist."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Hapus Yang Dipilih"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
-msgstr ""
+msgstr "Hapus entri yang terpilih dari playlist."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
-msgstr ""
+msgstr "Acak Daftar"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
-msgstr ""
+msgstr "Acak Playlist."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
-msgstr ""
+msgstr "Balikkan Daftar"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
-msgstr ""
+msgstr "Balikkan playlist."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Urutkan Daftar"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Urutkan daftar dari judul"
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Dari Album"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Urutkan daftar dari album"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Dari Artis"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Urutkan daftar dari artis"
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
-msgstr ""
+msgstr "Urutkan daftar dari nama berkas."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
-msgstr ""
+msgstr "Urutkan daftar dari nama path penuh."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Dari Tanggal"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
-msgstr ""
+msgstr "Urutkan daftar dari waktu modifikasi."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Oleh Nomor Trek"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
-msgstr ""
+msgstr "Urutkan daftar dari nomor jalur."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
-msgstr ""
+msgstr "Urutkan yang Terpilih"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Berkas"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
-msgstr ""
+msgstr "Layanan Plugin"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
-msgstr ""
+msgstr "Lihat Detail Jalur"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
-msgstr ""
+msgstr "Lihat detail jalur"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Tentang Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Mainkan Berkas"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
-msgstr ""
+msgstr "Muat dan mainkan berkas"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Mainkan Folder"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
-msgstr ""
+msgstr "Mainkan media dari lokasi yang dipilih"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
-msgstr ""
+msgstr "Layanan plugin"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Pengaturan"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Buka jendela pengaturan"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Keluar Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Set A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Bersihkan A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Lompat ke Berkas"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Lompat ke Waktu"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
-msgstr ""
+msgstr "Beralih Antrian"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
-msgstr ""
+msgstr "Aktifkan/Nonaktifkan entri di antrian playlist."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Salin"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Potong"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Tempel"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Buka"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Impor"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Simpan"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
-msgstr ""
+msgstr "Preset"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
-msgstr ""
+msgstr "muat-otomatis preset"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
-msgstr ""
+msgstr "Muat otomatis-muat preset"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
-msgstr ""
+msgstr "Muat preset bawaan kedalam equalizer"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Kosong"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
-msgstr ""
+msgstr "Set level preset equalizer ke nol"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Dari berkas"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Ke berkas"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr ""
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Judul: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Artis: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Nama berkas: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr ""
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d of %d)"
@@ -3389,81 +3668,97 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr ""
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 msgstr ""
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Format tidak didukung"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
 msgstr ""
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr ""
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr ""
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Batal"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr ""
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Perintah saat Audacious memainkan lagu baru."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Perintah:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr ""
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Perintah saat Audacious mencapai akhir daftar lagu."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3482,33 +3777,66 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Perintah"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3519,63 +3847,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr ""
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr ""
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr ""
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr ""
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Ikon Status"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr ""
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3584,11 +3912,11 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr ""
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -3596,15 +3924,15 @@
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr ""
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3625,44 +3953,47 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Dekoder Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Dekoder VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Dekoder WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Dekoder 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - Pilih berkas"

audacious-plugins-3.3.4.tar.bz2/po/it.po -> audacious-plugins-3.4.2.tar.bz2/po/it.po Changed

@@ -3,591 +3,660 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# <davros74@gmail.com>, 2012.
-# Jacopo Lorenzetti <jacopo.jl@gmail.com>, 2011-2012.
-# Jacopo Lorenzetti <jacopol@cyan.xubiq.com>, 2012.
+# davros74 <davros74@gmail.com>, 2012
+# Federico.Torsello <federico421@hotmail.it>, 2013
+# Jacopo Lorenzetti <jacopo.jl@gmail.com>, 2011-2012
+# Jacopo Lorenzetti <jacopol@cyan.xubiq.com>, 2012-2013
+# Marco91, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-19 09:49+0000\n"
-"Last-Translator: davros74 <davros74@gmail.com>\n"
-"Language-Team: Italian\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-08-19 08:03+0000\n"
+"Last-Translator: Marco91\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/audacious/"
+"language/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "stereo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "surround"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Decodificatore AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
-msgstr ""
+msgstr "sequenziato"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Riproduttore AdLib)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
+"Un plugin che può essere usato per iniziare l'esecuzione in un certo "
+"momento.\n"
+"\n"
+"Originariamente scritto da Adam Feakin e Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Sveglia"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Questa è la tua sveglia."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Impostazioni sveglia"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Ora"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "ore"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minuti"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Tempo\n"
+"Allarme a:\n"
+"Tempo per l'arrivo dell'allarme.\n"
+"\n"
+"Pausa dopo:\n"
+"Ferma l'allarme dopo questa quantità di tempio.\n"
+"(se la finestra di dialogo di sveglia non è chiusa)\n"
+"\n"
+"\n"
+"Giorni\n"
+"Giorno:\n"
+"Seleziona i giorni in cui attivare l'allarme.\n"
+"\n"
+"Tempo:\n"
+"Scegli il tempo per l'allarme di ogni giorno,\n"
+"oppure scegli l'interruttore per usare il tempo\n"
+"predefinito.\n"
+"\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Ferma dopo:"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Volume\n"
+"Dissolvenza:\n"
+"Dissolvi il volume al volume scelto\n"
+"per questa quantità di tempo.\n"
+"\n"
+"Inizia a:\n"
+"Inizia dissolvenza da questo volume..\n"
+"\n"
+"Finale:\n"
+"Il volume per fermare la dissolvenza. Se il tempo di\n"
+"dissolvenza è 0 allora imposta il volume a questo e inizia\n"
+"ad avviare.\n"
+"\n"
+"\n"
+"Opzioni:\n"
+"Comando addizionale:\n"
+"Avvia questo comando al tempo di allarme.\n"
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+"Lista di riproduzione:\n"
+"Carica quasta lista di riproduzione. Se non è data\n"
+"alcuna lista di riproduzione, verrà usata quella corrente.\n"
+"L'URL di un flusso mp3/ogg\n"
+"può anche essere inserito qui.\n"
+"\n"
+"Promemoria:\n"
+"Mostra un promemoria quando sispegne l'allarme.\n"
+"Seleziona l'allarme nella casella e accendi\n"
+"l'interruttore se vuoi che venga mostrato."
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Sveglia alle (predefinita):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Questa è la tua sveglia."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Scegliere i giorni in cui attivare la sveglia"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Il tuo promemoria per oggi è..."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Predefinita"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Promemoria"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Giorno"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Lunedì"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Martedì"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Mercoledì"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Giovedì"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Venerdì"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Sabato"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Domenica"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Lunedì"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Impostazioni sveglia"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Ora"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Sveglia alle (predefinita):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Ferma dopo:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "ore"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minuti"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Scegliere i giorni in cui attivare la sveglia"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Giorno"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Predefinita"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Giorni"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Dissolvenza"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "secondi"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Attuale"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Inizia a"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Finale"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Attuale"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Comando aggiuntivo"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "abilita"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Playlist (opzionale)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Seleziona una lista di riproduzione"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Promemoria"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Usa promemoria"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Opzioni"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Cosa significano queste opzioni?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Aiuto"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Annulla"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Il tuo promemoria di oggi è…"
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Grazie"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Copertina Album"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Dispositivo PCM predefinito"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Dispositivo mixer predefinito"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Preferenze del plugin di uscita ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Dispositivo PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Dispositivo mixer:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Elemento mixer:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Aggira interruzione per esaurimento risorse"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
+"ALSA Output Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"I miei ringraziamenti a William Pitcock, autore dell'ALSA Output Plugin NG, "
+"il cui codice serve come riferimento quando il manuale ALSA non è "
+"sufficiente."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "Uscita ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "Plug-in AMIDI (Riproduttore MIDI)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Non hai selezionato alcuna porta del sequencer per la riproduzione MIDI. Puoi farlo nelle preferenze del plugin MIDI."
+msgstr ""
+"Non hai selezionato alcuna porta del sequencer per la riproduzione MIDI. "
+"Puoi farlo nelle preferenze del plugin MIDI."
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "Plug-in AMIDI (Riproduttore MIDI)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Backend ALSA "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Questo backend invia eventi MIDI a un gruppo di porte del sequencer ALSA scelte dall'utente. L'interfaccia del sequencer ALSA è molto versatile, può fornire porte per sintetizzatori hardware delle schede audio (emu10k1) ma anche per sintetizzatori software, dispositivi esterni, ecc.\nQuesto backend non produce audio, gli eventi MIDI sono gestiti direttamente dai dispositivi/programmi dietro le porte ALSA; ad esempio, gli eventi MIDI inviati al sintetizzatore hardware saranno riprodotti direttamente.\nBackend scritto da Giacomo Lozito."
+msgstr ""
+"Questo backend invia eventi MIDI a un gruppo di porte del sequencer ALSA "
+"scelte dall'utente. L'interfaccia del sequencer ALSA è molto versatile, può "
+"fornire porte per sintetizzatori hardware delle schede audio (emu10k1) ma "
+"anche per sintetizzatori software, dispositivi esterni, ecc.\n"
+"Questo backend non produce audio, gli eventi MIDI sono gestiti direttamente "
+"dai dispositivi/programmi dietro le porte ALSA; ad esempio, gli eventi MIDI "
+"inviati al sintetizzatore hardware saranno riprodotti direttamente.\n"
+"Backend scritto da Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Backend FluidSynth "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Questo backend produce audio inviando eventi MIDI a FluidSynth, un sintetizzatore software in tempo reale basato sulla specifica SoundFont2 (www.fluidsynth.org).\nL'audio prodotto può essere manipolato tramite i plugin di effetto del lettore e viene elaborato dal plugin di uscita selezionato.\nBackend scritto da Giacomo Lozito."
+msgstr ""
+"Questo backend produce audio inviando eventi MIDI a FluidSynth, un "
+"sintetizzatore software in tempo reale basato sulla specifica SoundFont2 "
+"(www.fluidsynth.org).\n"
+"L'audio prodotto può essere manipolato tramite i plugin di effetto del "
+"lettore e viene elaborato dal plugin di uscita selezionato.\n"
+"Backend scritto da Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Porta"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Nome del client"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Nome della porta"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Porte di uscita ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Scheda audio: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Controllo mixer: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Impostazioni mixer"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
 msgstr "Backend ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - informazioni backend"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Selezione backend"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Impostazioni di riproduzione"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Trasponi: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Spostamento percussioni: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Impostazioni avanzate"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "precalcola durata dei file MIDI nella playlist"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "estrai commenti dal file MIDI (se disponibili)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "estrai testi dal file MIDI (se disponibili)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - seleziona file"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Impostazioni del plugin-in AMIDI"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - seleziona file SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Impostazioni SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Nome del file"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Dimensioni (byte)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Carica SF all'avvio del lettore"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Carica SF sul primo file MIDI riprodotto"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Impostazioni sintetizzatore"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "guadagno"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "usa predefinito"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "valore:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "Polifonia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "riverbero"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "sì"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "no"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "chorus"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "frequenza di campionamento"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "personalizzata "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
 msgstr "Backend FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " Informazioni MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Durata (msec):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Numero di tracce: "
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "variabile"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Suddivisione temporale:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " Commenti e testi MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* nessun commento disponibile in questo file MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* nessun testo disponibile in questo file MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 non valido)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Informazioni sul plug-in AMIDI"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr ""
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI-Plug "
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -609,10 +678,29 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"\n"
+"Riproduttore musicale MIDI modulare\n"
+"http://www.develia.org/projects.php?p=amidiplug⏎\n"
+"\n"
+"scritto da Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"Ringraziamenti speciali a...\n"
+"\n"
+"Clemens Ladisch e Jaroslav Kysela⏎\n"
+"per i loro bei programmi aplaymidi e amixer; questi\n"
+"erano realmente utili, insieme con alsa-lib docs, allo scopo di\n"
+"imparare di più sull'API ALSA\n"
+"\n"
+"Alfredo Spadafina\n"
+"per il bel logo midi della tastiera\n"
+"\n"
+"Tony Vroon\n"
+"per il buono aiuto nell alfa test"
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
-msgstr ""
+msgstr "Audacious OSD "
 
 #: src/aosd/aosd.c:37
 msgid "AOSD (On-Screen Display)"
@@ -651,7 +739,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Visualizza l'OSD quando, durante la riproduzione, il titolo del brano cambia ma il nome del file è lo stesso. È utile principalmente per visualizzare i cambi di titolo negli stream su internet."
+msgstr ""
+"Visualizza l'OSD quando, durante la riproduzione, il titolo del brano cambia "
+"ma il nome del file è lo stesso. È utile principalmente per visualizzare i "
+"cambi di titolo negli stream su internet."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -783,8 +874,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Compositing manager non rilevato;\na meno che tu non sappia di averne uno in esecuzione, per favore attiva un compositing manager altrimenti l'OSD non funzionerà correttamente"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Compositing manager non rilevato;\n"
+"a meno che tu non sappia di averne uno in esecuzione, per favore attiva un "
+"compositing manager altrimenti l'OSD non funzionerà correttamente"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -847,47 +942,47 @@
 msgid "Misc"
 msgstr "Varie"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "Liste di riproduzione ASXv1/ASXv2"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Lista di riproduzione Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Colore"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Preferenze Bauer da Stereofonico a Binaurale"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Livello di alimentazione:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Frequenza di taglio:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Preimpostazioni:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Bauer da Stereofinico a Binaurale (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Analizzatore di spettro"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -898,232 +993,247 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> e altri.\n"
+"\n"
+"Molte grazie agli sviluppatori libcdio <http://www.gnu.org/software/libcdio/"
+">\n"
+"e agli sviluppatori libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Grazie anche a Tony Vroon per avermi fatto da tutor e guidato.\n"
+"\n"
+"Questo era un progetto Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Velocità di lettura: "
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Ignora dispositivo: "
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metadati"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Usa CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Usa CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Usa HTTP invece di CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Server: "
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Percorso: "
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Porta: "
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
-msgstr ""
+msgstr "Plugin CD Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
-msgstr ""
+msgstr "Errore nell'inizializzazione del sottosistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
-msgstr ""
+msgstr "URI %s non valido."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
-msgstr ""
+msgstr "Traccia %d non trovata."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "La traccia %d è una traccia dati."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
-msgstr ""
+msgstr "Errore nell'apertura dell'output audio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "Errore durante la lettura del CD Audio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "CD Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr ""
+msgstr "Errore nell'apertura del lettore CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
-msgstr ""
+msgstr "Nessuna unità CD audio adatta trovata."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "Errore alla fine dell'inizializzazione dell'unità CD aperta."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "Errore nella ricerca del primo/ultimo numero della traccia."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "Impossibile leggere inizio/fine dell'LNS per la traccia %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
-msgstr ""
+msgstr "Errore nella creazione della connessione al cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "Errore nella richiesta al server CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "Errore nella richiesta al server CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
-msgstr ""
+msgstr "Errore nella lettura delle informazioni del cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Il drive è vuoto."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Tipo di disco non supportato."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Riproduci CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Aggiungi CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
-msgstr ""
+msgstr "Voci di menu CD Audio"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Compressione"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Volume centrale:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Gamma dinamica:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Dynamic Range Compression Plugin per Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
-msgstr ""
+msgstr "Compressione gamma dinamica"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Decodificatore musica console giochi"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Generale"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Riproduzione"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Bassi:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "sec"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Alti:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Durata brano predefinita:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Ricampionamento"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Abilita ricampionamento audio"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Frequenza di ricampionamento:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignora durata specificata nei tag SPC"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Aumenta riverbero"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "La durata brano predefinita, espressa in secondi, è utilizzata per i brani che non forniscono informazioni sulla durata (tracce che si ripetono ciclicamente)"
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"La durata brano predefinita, espressa in secondi, è utilizzata per i brani "
+"che non forniscono informazioni sulla durata (tracce che si ripetono "
+"ciclicamente)"
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1132,87 +1242,107 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Motore del decodificatore musica console basato su Game_Music_Emu 0.5.2\n"
+"Formati supportati: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Plugin di Audacious prodotto da:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
+"La dissolvenza incrociata non è riuscita poiché i brani avevano un numero di "
+"canali differente. Puoi usare il Mixer Canale per convertire i brani allo "
+"stesso numero di canali."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
+"La dissolvenza incrociata non è riuscita poiché i brani avevano differenti "
+"frequenze di campionamento. Puoi usare il Convertitore frequenza di "
+"campionamento per convertire i brani alla stessa frequenza."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Crossfade Plugin per Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
-msgstr ""
+msgstr "Dissolvenza incrociata"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
-msgstr ""
+msgstr "Sovrapposizione:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
-msgstr ""
+msgstr "Dissolvenza incrociata"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intensità: "
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
-msgstr ""
+msgstr "Crystalizer"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
-msgstr ""
+msgstr "Plugin Cue Sheet"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Ritardo: "
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Feedback: "
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Volume: "
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
+"Echo Plugin\n"
+"Realizzato da Johan Levin, 1999\n"
+"\n"
+"Echo surround realizzato da Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
-msgstr ""
+msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1221,14 +1351,20 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
+"Il multi-format audio decoding plugin per Audacious usa\n"
+"il framework multimediale FFmpeg (http://www.ffmpeg.org/)\n"
+"\n"
+"Plugin Audacious realizzato da:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
-msgstr ""
+msgstr "Plugin FFmpeg"
 
 #: src/filewriter/filewriter.c:409
 msgid "FileWriter Configuration"
-msgstr ""
+msgstr "Configurazione di FileWriter"
 
 #: src/filewriter/filewriter.c:421
 msgid "Output file format:"
@@ -1291,10 +1427,25 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 msgstr ""
+"Il programma è un software gratuito; puoi ridistribuirlo e/o modificarlo\n"
+"sotto i termini della licenza GNU General Public License come pubblicato "
+"dalla\n"
+"Free Software Foundation; sia la versione 2 della Licenza, sia\n"
+"(a propria scelta) qualsiasi altra versione.\n"
+"\n"
+"Questo programma è distribuito nella speranza che sarà utile,\n"
+"ma SENZA ALCUNA GARANZIA; anche senza l'implicita garanzia di\n"
+"COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedi la\n"
+"GNU General Public License per maggiori dettagli.\n"
+"\n"
+"Dovresti aver ricevuto una copia della licenza GNU General Public License\n"
+"insieme al programma; se così non fosse, scrivi alla Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
-msgstr ""
+msgstr "Plugin FileWriter"
 
 #: src/filewriter/mp3.c:37 src/filewriter/mp3.c:748
 msgid "Auto"
@@ -1304,11 +1455,13 @@
 msgid "Joint Stereo"
 msgstr "Joint stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1356,7 +1509,7 @@
 msgid "Error protection"
 msgstr "Protezione dagli errori"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Qualità"
 
@@ -1436,542 +1589,626 @@
 msgid "Tags"
 msgstr "Tag"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Configurazione del codificatore Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Livello di qualità (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
-msgstr ""
+msgstr "senza perdita"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
+"Codice originale realizzato da\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
-msgstr ""
+msgstr "Decodificatore FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
+"GIO Plugin per Audacious\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
+msgstr "Plugin GIO"
+
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
+"OpenGL Spectrum Analyzer per Audacious\n"
+"Copyright 2013 Christophe Budé e John Lindgren\n"
+"\n"
+"Basato sul plugin XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"Licenza: GPLv2+"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL Spectrum Analyzer"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
+"Gnome Shortcut Plugin\n"
+"Ti permette di controllare il riproduttore con i tasti di scelta rapida di "
+"Gnome.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
-msgstr ""
+msgstr "Scorciatoie Gnome"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Numero elemento"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Titolo"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Anno"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Traccia"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Genere"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Posizione nella coda"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Durata"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Percorso del file"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Titolo personalizzato"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Scegli colonne"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Disponibili:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Selezionate:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Aggancia a sinistra"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Aggancia a destra"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Aggancia in alto"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Aggancia in basso"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Sgancia"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Disabilita"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Apri file…"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Apri _URL…"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "A_ggiungi file…"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Aggiungi U_RL…"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Libreria di Ricerca"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "I_nformazioni su…"
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Preferenze…"
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Esci"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Riproduci"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Interro_mpi"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Ferma"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "Pre_cedente"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Successiva"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "Ripe_ti"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "C_asuale"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "N_on avanzare nella playlist"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
 msgstr "Ferma _dopo questo brano"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "Informazioni sul _brano…"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Salta alla _posizione…"
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "Sa_lta al brano…"
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Per _numero di traccia"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Imposta Punto di Ripetizione _A"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Imposta Punto di Ripetizione _B"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "_Cancella Punti di Ripetizione"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Per _titolo"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "Da _Nome del file"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "Da _Percorso del File"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Per _numero di traccia"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Per _artista"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Per a_lbum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "Da Al_bum"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Per _data di pubblicazione"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "Da _Lunghezza"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Per percorso del _file"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Per titolo _personalizzato"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "Ordine in_verso"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "Ordine _casuale"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Riproduci questa lista"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "A_ggiorna"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Ri_muovi file non disponibili"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Ordina"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Ordina selezionati"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Rimuovi _Duplicati"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Ri_muovi file non disponibili"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Nuova"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Rin_omina ..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importa…"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Esporta…"
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Gestione_Liste di riproduzione ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Gestione co_da…"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "_Alza volume"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "A_bbassa volume"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Equalizzatore"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_ffetti"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Interfaccia"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Visualizzazioni"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Mostra barra dei _menu"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Mostra barra i_nformazioni"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostra barra di vis_ualizzazione informazioni"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Mostra barra di _stato"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Mostra Tempo _Rimasto"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Mostra Pulsanti di _Chiusura"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Mostra in_testazioni di colonna"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Scegli _colonne…"
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Sco_rri al cambiare del brano"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_File"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Riproduzione"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Playlist"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Servizi"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Uscita"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Visualizza"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "Inserisci/rimuovi dalla _coda"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "T_aglia"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "C_opia"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Seleziona _tutti"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Rinomina ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Interfaccia GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Buffering…"
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Errore"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canale"
 msgstr[1] "%d canali"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr "Traccia precedente"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Riproduci"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Interrompi/riprendi"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Ferma"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "Traccia successiva"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
 msgstr "Avanza di 5 secondi"
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
 msgstr "Riavvolgi di 5 secondi"
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
 msgstr "Silenzia"
 
-#: src/hotkey/gui.c:80
-msgid "Volume Up"
+#: src/hotkey/gui.c:78
+msgid "Volume up"
 msgstr "Alza volume"
 
-#: src/hotkey/gui.c:81
-msgid "Volume Down"
+#: src/hotkey/gui.c:79
+msgid "Volume down"
 msgstr "Abbassa volume"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
 msgstr "Salta al file"
 
-#: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr ""
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr "Mostra/nascondi finestra(e) di riproduzione"
 
-#: src/hotkey/gui.c:84
+#: src/hotkey/gui.c:82
 msgid "Show On-Screen-Display"
 msgstr "Mostra On-screen-display"
 
-#: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
 msgstr "Attiva/disattiva ripetizione"
 
-#: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Attiva/disattiva riproduzione casuale"
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
+msgstr "Attiva/disattiva shuffle"
 
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr ""
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr "Attiva/Disattiva lo stop dopo la corrente"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
+msgstr "Mostra finestra(e) di riproduzione"
+
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Non è consigliabile associare i pulsanti primari del mouse senza modificatori.\n\nVuoi continuare?"
+msgstr ""
+"Non è consigliabile associare i pulsanti primari del mouse senza "
+"modificatori.\n"
+"\n"
+"Vuoi continuare?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Associazione pulsanti del mouse"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Configurazione plugin Tasti di scelta rapida globali"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Premi una combinazione di tasti all'interno di un campo di testo.\nPuoi anche associare i pulsanti del mouse."
+msgstr ""
+"Premi una combinazione di tasti all'interno di un campo di testo.\n"
+"Puoi anche associare i pulsanti del mouse."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Tasti di scelta rapida:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Azione:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Tasto associato:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1985,103 +2222,130 @@
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
+"Global Hotkey Plugin\n"
+"Controlla il riproduttore con combinazioni di tasti globali o tasti "
+"multimediali.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributori:⏎\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+"Bryn Davies <curious@ihug.com.au>,\n"
+"Jonathan A. Davis <davis@jdhouse.org>,\n"
+"Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
-msgstr ""
+msgstr "Hotkeys globali"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
+"Basato su xmms-jack, da Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Converito per Audacious da Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
-msgstr ""
+msgstr "Uscita JACK"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Impostazioni %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Impostazioni Host LADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Percorsi dei moduli:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Separa più percorsi con i due punti.\nLa ricerca viene effettuata in questi percorsi in aggiunta a LADSPA_PATH.\nDopo aver aggiunto nuovi percorsi, premi Invio per ricercare nuovi plugin."
+msgstr ""
+"Separa più percorsi con i due punti.\n"
+"La ricerca viene effettuata in questi percorsi in aggiunta a LADSPA_PATH.\n"
+"Dopo aver aggiunto nuovi percorsi, premi Invio per ricercare nuovi plugin.</"
+"small>"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Plugin disponibili:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Abilita"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Plugin abilitati:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
+"LADSPA Host per Audacious\n"
+"Copyright 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
-msgstr ""
+msgstr "Host LADSPA"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: non posso inizializzare il supporto LIRC\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: non posso leggere il file di configurazione LIRC \n %s: fare riferimento alla documentazione di LIRC \n %s: come creare un file di configurazione appropriato\n"
+msgstr ""
+"%s: non posso leggere il file di configurazione LIRC\n"
+"%s: fare riferimento alla documentazione di LIRC\n"
+"%s: come creare un file di configurazione appropriato\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: tento la riconnessione...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: comando sconosciuto \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: disconnesso da LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: tento la riconnessione ogni %d secondi...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2096,68 +2360,81 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
+"Un semplice plugin per controllare Audacious usando il demone per il "
+"controllo remoto LIRC \n"
+"\n"
+"Adattato per Audacious da:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Basato sul plugin XMMS LIRC da:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Per maggiori informazioni su LIRC, vedi http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Connessione"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Riconnetti al server LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
-msgstr ""
+msgstr "Attesa prima della riconnessione:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
-msgstr ""
+msgstr "Plugin LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Nessun testo disponibile"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Impossibile recuperare %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Impossibile analizzare %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Ricerca testi ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Metadata brano mancante"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Connessione a lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
-msgstr ""
+msgstr "Plugin LyricWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
-msgstr ""
+msgstr "Playlists M3U"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Metronomo: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Metronomo: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2165,85 +2442,243 @@
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
+"Un Generatore di Tact realizzato da Martin Strauss <mys@faveve.uni-stuttgart."
+"de>⏎\n"
+"\n"
+"Per usarlo, aggiungi un URL: tact://beats*num/den\n"
+"ad esempio tact://77 per avviare 77 battiti al minuto\n"
+"o tact://60*3/4 per avviare 60 bpm in 3/4 tact"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Generatore Tact"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"Channel Mixer Plugin per Audacious⏎\n"
+"Copyright 2011-2012 John Lindgren e Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Mixer Canale"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Canali in uscita:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Mixer Canale"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
-msgstr ""
+msgstr "Plugin MMS"
+
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Risoluzione"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bit"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bit"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Canali"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Resampling"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Più vicino (più veloce)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Lineare (veloce)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Spline (buono)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Polifase (il migliore)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Frequenza di Sampling"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz:"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz:"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Livello:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Taglio:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Riverbero"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Aumento del Basso"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Surround"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Preamplificatore"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Varie"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Sovracampionamento"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Riduzione del rumore"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Avvia MOD Amiga"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Ripeti"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Contatore di ripetizioni:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Per ripetere per sempre, imposta il contatore di ripetizioni a -1."
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
-msgstr ""
+msgstr "ModPlug (Riproduttore del Modulo)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
-msgstr ""
+msgstr "Plugin MPG123"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
-msgstr ""
+msgstr "Server MPRIS 2"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
-msgstr ""
+msgstr "Plugin Neon HTTP/HTTPS"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Fermato"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious non sta riproducendo."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
-"\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Desktop Notifications Plugin per Audacious⏎\n"
+"Copyright (C) 2010 Maximilian Bogner⏎\n"
+"Copyright (C) 2011-2013 John Lindgren e Jean-Alexandre Anglès d'Auriac⏎\n"
+"\n"
+"Questo plugin è un software gratuito; puoi ridistribuirlo e/o modificarlo "
+"sotto i termini della licenza GNU General Public License come pubblicato "
+"dalla Free Software Foundation; sia la versione 3 della Licenza, sia (a "
+"propria scelta) qualsiasi altra versione.\n"
+"\n"
+"Questo programma è distribuito nella speranza che sarà utile, ma SENZA "
+"ALCUNA GARANZIA; anche senza l'implicita garanzia di COMMERCIABILITÀ o "
+"IDONEITÀ PER UN PARTICOLARE SCOPO. Vedi la GNU General Public License per "
+"maggiori dettagli.\n"
+"\n"
+"Dovresti aver ricevuto una copia della licenza GNU General Public License "
+"insieme al programma; se così non fosse, vedi <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Mostra controlli di riproduzione"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Permette di mostrare le notifiche"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Notifiche Desktop"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Mostra"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Interrompi"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Successivo"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Dispositivo predefinito"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Dispositivo audio:"
 
@@ -2268,22 +2703,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
+"OSS4 Output Plugin per Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"Vorrei ringrazire le persone su #audacious, specialmente Tony Vroon e John "
+"Lindgren e sicuramente gli autori del precedente OSS plugin."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "Uscita OSS4"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
-msgstr ""
+msgstr "Playlist PLS"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr ""
+msgstr "Decodificatore OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2302,161 +2743,242 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 msgstr ""
+"Audacious PulseAudio Output Plugin⏎\n"
+"\n"
+"Il programma è un software gratuito; puoi ridistribuirlo e/o modificarlo\n"
+"sotto i termini della licenza GNU General Public License come pubblicato "
+"dalla\n"
+"Free Software Foundation; sia la versione 2 della Licenza, sia\n"
+"(a propria scelta) qualsiasi altra versione.\n"
+"\n"
+"Questo programma è distribuito nella speranza che sarà utile,\n"
+"ma SENZA ALCUNA GARANZIA; anche senza l'implicita garanzia di\n"
+"COMMERCIABILITÀ o IDONEITÀ PER UN PARTICOLARE SCOPO. Vedi la\n"
+"GNU General Public License per maggiori dettagli.\n"
+"\n"
+"Dovresti aver ricevuto una copia della licenza GNU General Public License\n"
+"insieme al programma; se così non fosse, scrivi alla Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "Uscita PulseAudio"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Sample Rate Converter Plugin per Audacious⏎\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
-msgstr ""
+msgstr "Salta/ripeti gli esempi"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
-msgstr ""
+msgstr "Interpolazione lineare"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
-msgstr ""
+msgstr "Interpolazione di Shannon veloce"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
-msgstr ""
+msgstr "Interpolazione di Shannon media"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
-msgstr ""
+msgstr "Interpolazione di Shannon migliore"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
-msgstr ""
+msgstr "Conversione"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Metodo:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
-msgstr ""
+msgstr "Frequenza:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
-msgstr ""
+msgstr "Mappature della frequenza"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
-msgstr ""
+msgstr "Usa le mappature della frequenza"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
-msgstr ""
+msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
-msgstr ""
+msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
-msgstr ""
+msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
-msgstr ""
+msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
-msgstr ""
+msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
-msgstr ""
+msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
-msgstr ""
+msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Convertitore Sample Rate"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Cambia password"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "OK. Processo di scrobbling per l'utente: %s"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Permesso Negato."
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Accedi al seguente link per permettere ad Audacious di eseguire lo "
+"scrobbling dei tuoi avvii:"
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Mantieni aperta questa finestra e clicca ancora su 'Controlla Permesso'.\n"
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"Non preoccuparti. I tuoi scrobble sono stati salvati sul tuo computer.\n"
+"Loro saranno inviati appena Audacious avrà il permesso di farlo."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Problema di Rete."
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+"C'era un problema nel contattare Last.fm. Per favore riprova più tardi."
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Servizi"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "In controllo..."
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "C_ontrolla Permesso"
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Nome utente:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_Revoca Permesso"
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Password:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Hai bisogno di permettere ad Audacious di eseguire lo scrobbling delle "
+"tracce al tuo account Last.fm.\n"
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "URL Scrobbler:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Lo Scrobbler plugin non può essere avviato.\n"
+"Ci potrebbe essere un problema con l'installazione."
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
+"Audacious Scrobbler Plugin 2.0 realizzato da Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Grazie a John Lindgren per avermi dato una mano all'inizio del progetto.\n"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious adesso sta usando una versione migliorata dello Scrobbler Last."
+"fm.\n"
+"Per favore controlla le impostazioni per il plugin Scrobbler."
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "SDL Output Plugin per Audacious\nCopyright 2010 John Lindgren"
+msgstr ""
+"SDL Output Plugin per Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
-msgstr ""
+msgstr "Uscita SDL"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Libreria"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Artista sconosciuto"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Album sconosciuto"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s \\n su %s di %s"
+msgstr ""
+"%s \n"
+" su %s di %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d album"
 msgstr[1] "%d album"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2464,10 +2986,14 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s \\n\n%s, %d canzone"
-msgstr[1] "%s \\n %s, %d canzoni"
+msgstr[0] ""
+"%s\n"
+" %s, %d canzone"
+msgstr[1] ""
+"%s\n"
+" %s, %d canzoni"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2475,76 +3001,82 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s \\n\n%d canzoni di %s"
-msgstr[1] "%s \\n %d canzoni di %s"
+msgstr[0] ""
+"%s\n"
+" %d canzoni di %s"
+msgstr[1] ""
+"%s\n"
+" %d canzoni di %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Crea playlist"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Aggiungi alla playlist"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Cerca nella libreria"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Per importare la tua musica in Audacious, scegli una cartella e clicca sull'icona \"aggiorna\"."
+msgstr ""
+"Per importare la tua musica in Audacious, scegli una cartella e clicca "
+"sull'icona \"aggiorna\"."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Attendi per favore…"
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Scegli una cartella"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Tool di ricerca"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Interfaccia classica di Winamp"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Lettore:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Seleziona il carattere della finestra principale del lettore:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Playlist:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Seleziona il carattere della playlist:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Caratteri"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Usa caratteri bitmap (supporta solo ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Scorri titolo brano in entrambe le direzioni"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Skin"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Preferenze interfaccia"
 
@@ -2600,7 +3132,7 @@
 msgid "Presets"
 msgstr "Preimpostazioni"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Carica preimpostazione"
 
@@ -2613,7 +3145,7 @@
 msgid "Load equalizer preset"
 msgstr "Carica preimpostazione equalizzatore"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Salva preimpostazione"
 
@@ -2625,7 +3157,7 @@
 msgid "Save equalizer preset"
 msgstr "Salva preimpostazione equalizzatore"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Elimina preimpostazione"
 
@@ -2633,739 +3165,755 @@
 msgid "Delete auto-preset"
 msgstr "Elimina preimpostazione a caricamento automatico"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Vai a %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Bilanciamento: sinistra %d%%"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Bilanciamento: centro"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Bilanciamento: destra %d%%"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Menu opzioni"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Disabilita 'Sempre in primo piano'"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Abilita 'Sempre in primo piano'"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Finestra informazioni file"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Menu visualizzazione"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Modalità singolo."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Modalità playlist."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "La riproduzione si fermerà alla fine del brano."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "La riproduzione non si fermerà alla fine del brano."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Punto di Ripetizione _A impostato"
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Punto di Ripetizione _B impostato"
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Punti di Ripetizione Cancellati"
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Autoscorrimento del nome del brano"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Ferma riproduzione alla fine del brano corrente"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Picchi"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Ripeti"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Casuale"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Non avanzare nella playlist"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Mostra lettore"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Mostra editor della playlist"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Mostra equalizzatore"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Sempre in primo piano"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Visualizza su tutti gli spazi di lavoro"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Riavvolgi lettore"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Riavvolgi editor della playlist"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Riavvolgi equalizzatore"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analizzatore"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Oscilloscopio"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Spettrogramma"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Spento"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normale"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Fuoco"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Linee verticali"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Linee"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Barre"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Oscilloscopio a punti"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Oscilloscopio a linee"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Oscilloscopio pieno"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Ghiaccio"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Morbida"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Molto lenta"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lenta"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Media"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Veloce"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Molto veloce"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Tempo trascorso"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Tempo rimanente"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Interrompi"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Precedente"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Successivo"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Visualizzazione"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Modalità di visualizzazione"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Modalità analizzatore"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Modalità oscilloscopio"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Modalità spettrogramma"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Modalità WindowShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Caduta analizzatore"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Caduta picchi"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Playlist"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Riproduci Liste "
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Nuova playlist"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Seleziona playlist successiva"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Seleziona playlist precedente"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Elimina playlist"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Importa playlist"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Carica un file della playlist all'interno della playlist selezionata."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Esporta playlist"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Salva la playlist selezionata."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Aggiorna lista"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Aggiorna i metadati associati ad un elemento della playlist."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Gestione playlist"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Gestione coda"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Visualizza"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Preferenze dell'interfaccia…"
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Aggiungi indirizzo internet…"
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Aggiunge una traccia remota alla playlist."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Aggiungi file…"
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Aggiunge file alla playlist."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Cerca e seleziona"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Cerca nella playlist e seleziona gli elementi della playlist in base a un criterio specifico."
+msgstr ""
+"Cerca nella playlist e seleziona gli elementi della playlist in base a un "
+"criterio specifico."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Inverti selezione"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Inverte le voci selezionate e non selezionate."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Seleziona tutti"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Seleziona tutti gli elementi della playlist."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Deseleziona tutti"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Deseleziona tutti gli elementi della playlist."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Rimuovi tutti"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Rimuove dalla playlist tutti gli elementi."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Cancella coda"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Cancella la coda associata con questa playlist."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Rimuovi i file non disponibili"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Rimuove dalla playlist i file non disponibili."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Rimuovi i duplicati"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Per titolo"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Rimuove dalla playlist le voci duplicate in base al titolo."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Per nome del file"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Rimuove dalla playlist le voci duplicate in base al nome del file."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Per percorso + nome del file"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Rimuove dalla playlist le voci duplicate in base al loro percorso completo."
+msgstr ""
+"Rimuove dalla playlist le voci duplicate in base al loro percorso completo."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Rimuovi deselezionati"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Rimuove dalla playlist gli elementi deselezionati."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Rimuovi selezionati"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Rimuove dalla playlist gli elementi selezionati."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Riordina casualmente la lista"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Riordina casualmente la playlist."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Inverti lista"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Inverte la playlist."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Ordina lista"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Ordina la lista per titolo."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Per album"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Ordina la lista per album."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Per artista"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Ordina la lista per artista."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Ordina la lista per nome del file."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Ordina la lista in base al percorso completo."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Per data"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Ordina la lista per data di modifica."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Per numero di traccia"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Ordina la lista per numero di traccia."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Ordina selezionati"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "File"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Servizi plugin"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Visualizza dettagli traccia"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Visualizza i dettagli della traccia"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Informazioni su Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Riproduci file"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Carica e riproduce un file"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Riproduci posizione"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Riproduce contenuti dalla posizione selezionata"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Servizi dei plugin"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Apre la finestra delle preferenze"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Esci da Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Imposta A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Cancella A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Salta al file"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Salta alla posizione"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Attivazione/disattivazione coda"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Attiva/disattiva l'elemento nella coda della playlist."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Copia"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Taglia"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Incolla"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Carica"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importa"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Salva"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Preimpostazione"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Preimpostazione a caricamento automatico"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Carica preimpostazione a caricamento automatico"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Carica preimpostazione predefinita all'interno dell'equalizzatore"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Azzera"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Imposta livelli della preimpostazione dell'equalizzatore a zero"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Da file"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Carica preimpostazione da file"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Da un file EQF di WinAMP"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Carica preimpostazione da un file EQF di WinAMP"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Preimpostazioni di WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Imposta preimpostazioni di WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Salva preimpostazione a caricamento automatico"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Salva preimpostazione predefinita"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Su file"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Salva preimpostazione su file"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Su file EQF di WinAMP"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Salva preset su un file EQF di WinAMP"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Elimina preimpostazione a caricamento automatico"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Cerca elementi nella playlist attiva"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Seleziona gli elementi nella playlist compilando uno o più campi. I campi utilizzano la sintassi delle espressioni regolari, senza distinzione tra maiuscole e minuscole. Se non sai come funzionano le espressioni regolari, inserisci semplicemente una porzione letterale di quello che stai cercando."
+msgstr ""
+"Seleziona gli elementi nella playlist compilando uno o più campi. I campi "
+"utilizzano la sintassi delle espressioni regolari, senza distinzione tra "
+"maiuscole e minuscole. Se non sai come funzionano le espressioni regolari, "
+"inserisci semplicemente una porzione letterale di quello che stai cercando."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Titolo: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Nome del file: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Cancella la selezione precedente prima di effettuare la ricerca"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Inserisci automaticamente in coda gli elementi trovati"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Crea una nuova playlist con gli elementi trovati"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Editor della playlist di Audacious"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d di %d)"
@@ -3383,81 +3931,124 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Impossibile creare la directory (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Basato sul plugin xmms_sndfile:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Convertito per Audacious da Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr ""
+"Questo programma è un software gratuito; puoi ridistribuirlo e/o modificarlo "
+"sotto i termini della licenza GNU General Public License come pubblicato "
+"dalla Free Software Foundation; sia la versione 2 della Licenza, sia (a "
+"propria scelta) qualsiasi altra versione.\n"
+"\n"
+"Questo programma è distribuito nella speranza che sarà utile, ma SENZA "
+"ALCUNA GARANZIA; anche senza l'implicita garanzia di COMMERCIABILITÀ o "
+"IDONEITÀ PER UN PARTICOLARE SCOPO. Vedi la GNU General Public License per "
+"maggiori dettagli.\n"
+"\n"
+"Dovresti aver ricevuto una copia della licenza GNU General Public License "
+"insieme al programma; se così non fosse, scrivi alla Free Software "
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
+"USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
-msgstr ""
+msgstr "Plugin Sndfile"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Informazioni sul plugin Sndio Output"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Plugin Sndio Output \\n \\n Scritto da Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Plugin Sndio Output\n"
+"\n"
+"Scritto da Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Formato non supportato"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "E' stato richiesto un formato non supportato dal dispositivo audio.\\n \\n Per favore, riprova con il server sndiod(1) attivato."
+msgstr ""
+"E' stato richiesto un formato non supportato dal dispositivo audio.\n"
+"\n"
+"Per favore, riprova con il server sndiod(1) attivato."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "dispositivo sndio"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(vuoto significa default)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Annulla"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Cambio brano"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Comando da eseguire quando Audacious inizia un nuovo brano."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Comando da eseguire alla fine del brano."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Comando da eseguire quando Audacious raggiunge la fine della playlist."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Comando da eseguire quando cambia il titolo del brano (titoli degli stream di rete)."
+msgstr ""
+"Comando da eseguire quando cambia il titolo del brano (titoli degli stream "
+"di rete)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3474,35 +4065,91 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Puoi usare il seguente formato stringa che\nsarà sostituito prima di chiamare il comando\n(non tutti sono utili per il comando fine-playlist):\n\n%F: Frequenza (in hertz)\n%c: Numero di canali\n%f: Nome file (full path)\n%l: Durata (in milliseconds)\n%n o %s: Nome Brano\n%r: Rate (in bits per secondi)\n%t: Posizione playlist (%02d)\n%p: In riproduzione (1 o 0)\n%a: Artista\n%b: Album\n%T: Nome brano"
+msgstr ""
+"Puoi usare il seguente formato stringa che\n"
+"sarà sostituito prima di chiamare il comando\n"
+"(non tutti sono utili per il comando fine-playlist):\n"
+"\n"
+"%F: Frequenza (in hertz)\n"
+"%c: Numero di canali\n"
+"%f: Nome file (full path)\n"
+"%l: Durata (in milliseconds)\n"
+"%n o %s: Nome Brano\n"
+"%r: Rate (in bits per secondi)\n"
+"%t: Posizione playlist (%02d)\n"
+"%p: In riproduzione (1 o 0)\n"
+"%a: Artista\n"
+"%b: Album\n"
+"%T: Nome brano"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "I parametri passati alla shell dovrebbero essere racchiusi tra virgolette. Fare diversamente costituisce un rischio per la sicurezza."
+msgstr ""
+"I parametri passati alla shell dovrebbero essere "
+"racchiusi tra virgolette. Fare diversamente costituisce un rischio per la "
+"sicurezza."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Comandi"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"SoX Resampler Plugin per Audacious\n"
+"Copyright 2013 Michał Lipski⏎\n"
+"\n"
+"Basato sul Plugin Sample Rate Converter:\n"
+"Copyright 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Veloce"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Basso"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Alto"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Molto Alto"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Qualità:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "SoX Resampler"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Speech and Pitch"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Velocità: "
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Pitch: "
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Speech and Pitch"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3512,64 +4159,74 @@
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Questo plugin fornisce un'icona di stato, posizionata nell'\n"
+"area di notifica del gestore delle finestre di sistema."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Azione Scroll Mouse"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Cambia volume"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Cambia brano in riproduzione"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Altre impostazioni"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Disabilita la finestra popup"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
-msgstr ""
+msgstr "Chiudi nell'area di notifica (system tray)"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avanza nella playlist quando si scorre verso l'alto"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Icona di stato"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
+"Extra Stereo Plugin\n"
+"\n"
+"Realizzato da Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Generatore di toni: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3577,28 +4234,38 @@
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
+"Sine tone generator realizzato da Håvard Kvålen <havardk@xmms.org>⏎\n"
+"Modificato da Daniel J. Peng <danielpeng@bigfoot.com>⏎\n"
+"⏎\n"
+"Per usarlo, aggiungi una URL: tone://frequency1;frequency2;frequency3;...\n"
+"ad esempio tone://2000;2005 per avviare un tono di 2000 Hz e un tono di 2005 "
+"Hz"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Generatore di toni"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
+"File I/O Plugin per Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"QUESTO PLUGIN E' NECESSARIO. NON DISABILITARLO."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Plugin per i file I/O"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Rimozione voce"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3618,45 +4285,75 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Basato sul plugin Xiph.org della Fondazione Ogg Vorbis:\n"
+"http://www.xiph.org/\n"
+"\n"
+"codice originale realizzato da:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Hanno contribuito:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Decodificatore Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
+"Riproduttaro di file in formato vortex realizzato da Sashnov Alexander "
+"<sashnov@ngs.ru>\n"
+"Basato su in_vtx.dll realizzato da Roman Sherbakov <v_soft@microfor.ru>\n"
+"Plugin Audacious realizzato da Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Decodificatore VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
-msgstr ""
+msgstr "senza perdita (ibrido)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
-msgstr ""
+msgstr "con perdita"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Una parte del codice del plugin era di Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Decodificatore WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Decodificatore 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Liste di riproduzione condivisibili XML (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - seleziona file"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Ordinamento S_elezionato"

audacious-plugins-3.3.4.tar.bz2/po/ja.po -> audacious-plugins-3.4.2.tar.bz2/po/ja.po Changed

@@ -1,596 +1,620 @@
 # Japanese translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# <dritan86@gmail.com>, 2012.
-# <hallconnen2+transifex@gmail.com>, 2012.
-# Shuuji Takahashi <shuuji3@gmail.com>, 2012-2013.
-# Warui-chan <>, 2012.
-# キュア読み専™ <hallconnen2+transifex@gmail.com>, 2012.
-# 読み専(先行量産型) <hallconnen2+transifex@gmail.com>, 2013.
+# natird <dritan86@gmail.com>, 2012
+# 読み専(先行量産型) <hallconnen2+transifex@gmail.com>, 2013
+# 読み専(先行量産型) <hallconnen2+transifex@gmail.com>, 2012
+# Shuuji Takahashi <shuuji3@gmail.com>, 2012-2013
+# Warui-chan <>, 2012
+# 読み専(先行量産型) <hallconnen2+transifex@gmail.com>, 2012
+# 読み専(先行量産型) <hallconnen2+transifex@gmail.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2013-01-26 15:43+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-04 13:56+0000\n"
 "Last-Translator: Shuuji Takahashi <shuuji3@gmail.com>\n"
-"Language-Team: Japanese\n"
+"Language-Team: Japanese (http://www.transifex.com/projects/p/audacious/"
+"language/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "モノラル"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "ステレオ"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "サラウンド"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "AAC デコーダ"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "シーケンス"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib プレイヤー)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "設定した時間に再生を開始するためのプラグイン\n\nOriginally written by Adam Feakin and Daniel Stodden."
+msgstr ""
+"設定した時間に再生を開始するためのプラグイン\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "アラーム"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "目覚ましです。"
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "アラームの設定"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "時刻"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "時間"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr " "
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "分"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "静かになるまでの時間:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "アラーム時刻 (デフォルト)"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "目覚ましです。"
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "アラームが鳴る曜日を選んでください"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "今日のリマインダ:"
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "デフォルト"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "リマインダ"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "日"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "月曜日"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "木曜日"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "金曜日"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "土曜日"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "日曜日"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "月曜日"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "アラームの設定"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "時刻"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "アラーム時刻 (デフォルト)"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr " "
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "静かになるまでの時間:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "時間"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "分"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "アラームが鳴る曜日を選んでください"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "日"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "デフォルト"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "日"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "フェード"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "秒"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "音量"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "現在の音量"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "開始"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "終了"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "現在の音量"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "追加コマンド"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "有効"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "プレイリスト (オプション)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "プレイリストを選択"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "リマインダ"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "使用するリマインダ"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "オプション"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "オプションの説明"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\n時刻\n アラーム時刻:\n アラームが鳴る時刻です。\n\n 静かになるまでの時間\n アラームが鳴り止むまでの時間です。\n (めざましダイアログを閉じなかった場合)\n\n\n曜日\n 曜日:\n アラームが鳴る曜日を選択します。\n\n 時刻:\n それぞれの曜日のアラーム時刻を選択するか、トグ\n ルボタンを選択し、デフォルト時刻に設定します。\n\n\n音量:\n フェード:\n この時間をかけて、選択した音量まで音量をフェー\n ドアップします。\n\n 開始:\n この音量からフェードを始めます。\n\n 終了:\n この音量でフェードを終わります。\n\n\nオプション:\n 追加コマンド:\n アラーム時刻になると、このコマンドを実行します。\n\n プレイリスト:\n 曲を再生する時に、このプレイリストをロードしま\n す。プレイリストを指定しなかった場合、\n リストの再生中の曲が使われます。\n mp3 または ogg ストリームの URL を指定すること\n もできます。\n\n リマインダ:\n アラームが止まった時にリマインダを表示します。\n 表示するには、テキストボックスにリマインダを入\n 力し、トグルボタンをオンにしてください。\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "ヘルプ"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "今日のリマインダ:"
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "ありがとうございます"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "アルバムアート"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "デフォルト PCM デバイス"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "デフォルトミキサデバイス"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA 出力プラグインの設定"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "PCM デバイス:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "ミキサデバイス:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "ミキサエレメント"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Work around drain hangup"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "ALSA 出力プラグイン for Audacious\nCopyright 2009-2012 John Lindgren\n\nALSA 出力プラグイン NG の作者 William Pitcock に感謝します。ALSA のマニュアルでは不十分な時に参考にさせてもらいました。"
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"ALSA 出力プラグイン for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"ALSA 出力プラグイン NG の作者 William Pitcock に感謝します。ALSA のマニュアル"
+"では不十分な時に参考にさせてもらいました。"
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "ALSA 出力"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (MIDI プレイヤー)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "MIDI を再生するためのシーケンサ・ポートが選択されていません。MIDI プラグインの設定で選択することができます。"
+msgstr ""
+"MIDI を再生するためのシーケンサ・ポートが選択されていません。MIDI プラグイン"
+"の設定で選択することができます。"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI プレイヤー)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "ALSA バックエンド"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "このバックエンドは、MIDI イベントを、ユーザが選択した ALSA シーケンサ・ポートのグループに送ります。ALSA シーケンサインターフェイスは非常に用途が広く、emu10k1 のようなハードウェアシンセサイザだけでなく、ソフトウェアシンセサイザや外部デバイスなどへのポートもサポートします。\nこのバックエンドはオーディオを生成せず、MIDI イベントは ALSA ポートの背後のデバイスやプログラムから直接取り扱われます。たとえば、ハードウェアシンセサイザに送られた MIDI イベントは直接演奏されます。\nバックエンドは Giacomo Lozito によって書かれました。"
+msgstr ""
+"このバックエンドは、MIDI イベントを、ユーザが選択した ALSA シーケンサ・ポート"
+"のグループに送ります。ALSA シーケンサインターフェイスは非常に用途が広く、"
+"emu10k1 のようなハードウェアシンセサイザだけでなく、ソフトウェアシンセサイザ"
+"や外部デバイスなどへのポートもサポートします。\n"
+"このバックエンドはオーディオを生成せず、MIDI イベントは ALSA ポートの背後のデ"
+"バイスやプログラムから直接取り扱われます。たとえば、ハードウェアシンセサイザ"
+"に送られた MIDI イベントは直接演奏されます。\n"
+"バックエンドは Giacomo Lozito によって書かれました。"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "FluidSynth バックエンド "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "このバックエンドは音声を生成し、MIDI イベントを FluidSynth に送信します。FluidSynth は、SoundFont2 規格に基づいた、リアルタイムソフトウェアシンセサイザです。詳しくは、次のページをご覧ください。www.fluidsynth.org\n生成した音声は、プレイヤーのエフェクトプラグインや出力プラグインで処理することができます。\nバックエンドは、Giacomo Lozito によって書かれました。"
+msgstr ""
+"このバックエンドは音声を生成し、MIDI イベントを FluidSynth に送信します。"
+"FluidSynth は、SoundFont2 規格に基づいた、リアルタイムソフトウェアシンセサイ"
+"ザです。詳しくは、次のページをご覧ください。www.fluidsynth.org\n"
+"生成した音声は、プレイヤーのエフェクトプラグインや出力プラグインで処理するこ"
+"とができます。\n"
+"バックエンドは、Giacomo Lozito によって書かれました。"
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "ポート"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "クライアント名"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "ポート名"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "ALSA 出力ポート"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "サウンドカード: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "ミキサコントロール:"
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "ミキサ設定"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "ALSA\nバックエンド"
+msgstr ""
+"ALSA\n"
+"バックエンド"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - バックエンド情報"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "バックエンド選択"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "演奏設定"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "トランスポーズ: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "ドラムシフト: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "高度な設定"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "プレイリストの MIDI ファイルの長さを前もって計算する"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "MIDI ファイルからコメントを抽出する (可能ならば)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "MIDI ファイルから歌詞を抽出する (可能ならば)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - ファイル選択"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "AMIDI-Plus の設定"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - サウンドフォント ファイルの選択"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "サウンドフォント設定"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "ファイル名"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "サイズ (バイト)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "プレイヤ起動時に SF を読み込む"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "MIDI ファイルの最初の演奏時に SF を読み込む"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "シンセサイザ設定"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "ゲイン"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "デフォルトを使用"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "値:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "ポリフォニ"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "リバーブ"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "はい"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "いいえ"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "コーラス"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "サンプリングレート"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "カスタム "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "FluidSynth\nバックエンド"
+msgstr ""
+"FluidSynth\n"
+"バックエンド"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "名前:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " MIDI 情報 "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "形式:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "長さ (ミリ秒):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "トラック数:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "可変"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "時間軸:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI コメントと歌詞 "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* MIDI ファイル中に有効なコメントがありません *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* MIDI ファイル中に有効な歌詞がありません *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (不正な UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "AMIDI-Plug について"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -611,7 +635,26 @@
 "\n"
 "Tony Vroon\n"
 "for the good help with alpha testing"
-msgstr "\nmodular MIDI 音楽プレイヤ\nhttp://www.develia.org/projects.php?p=amidiplug\n\nwritten by Giacomo Lozito\n<james@develia.org>\n\nスペシャルサンクス\n\nClemens Ladisch と Jaroslav Kysela\n彼らの作った aplaymidi とamixer という素晴らしいプログラムは、\nALSA API について知るために、alsa-lib のドキュメントとともに、大変役に立ちました。\n\nAlfredo Spadafina\n素敵な midi キーボードのロゴを作ってくれました。\n\nTony Vroon\nアルファテストで大変助けてもらいました。"
+msgstr ""
+"\n"
+"modular MIDI 音楽プレイヤ\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"スペシャルサンクス\n"
+"\n"
+"Clemens Ladisch と Jaroslav Kysela\n"
+"彼らの作った aplaymidi とamixer という素晴らしいプログラムは、\n"
+"ALSA API について知るために、alsa-lib のドキュメントとともに、大変役に立ちま"
+"した。\n"
+"\n"
+"Alfredo Spadafina\n"
+"素敵な midi キーボードのロゴを作ってくれました。\n"
+"\n"
+"Tony Vroon\n"
+"アルファテストで大変助けてもらいました。"
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
@@ -654,7 +697,9 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "再生中に、ファイル名が同じでも、曲のタイトルが変更されたときに OSD を表示します。これは、インターネットストリームのタイトル変更を表示するのに便利です。"
+msgstr ""
+"再生中に、ファイル名が同じでも、曲のタイトルが変更されたときに OSD を表示しま"
+"す。これは、インターネットストリームのタイトル変更を表示するのに便利です。"
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -786,8 +831,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Composite マネージャが検出されませんでした;\n動作させているかわからなければ, Composite マネージャを有効にしてください. そうしなければ OSD は正常に動作しないでしょう."
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Composite マネージャが検出されませんでした;\n"
+"動作させているかわからなければ, Composite マネージャを有効にしてください. そ"
+"うしなければ OSD は正常に動作しないでしょう."
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -850,47 +899,47 @@
 msgid "Misc"
 msgstr "その他"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "ASXv1/ASXv2 プレイリスト"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious プレイリスト (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "色"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "ブラー・スコープ"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Bauer Stereophonic-to-Binaural Preferences の設定"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "フェードレベル:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Cut 周波数"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "プリセット:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "バウアー ステレオ-バイノーラル変換 (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "スペクトラムアナライザ"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -900,233 +949,248 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n\nlibcdio developers <http://www.gnu.org/software/libcdio/>\nおよび libcddb developers <http://libcddb.sourceforge.net/>\nに感謝します。\n\nメンタとして導いてくれた Tony Vroon にも感謝します。\n\nこのプラグインは、Google Summer of Code 2007 のプロジェクトです。"
+msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"\n"
+"libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"および libcddb developers <http://libcddb.sourceforge.net/>\n"
+"に感謝します。\n"
+"\n"
+"メンタとして導いてくれた Tony Vroon にも感謝します。\n"
+"\n"
+"このプラグインは、Google Summer of Code 2007 のプロジェクトです。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "デバイス"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "読み込み速度:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "上書きデバイス"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "メタデータ"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "CD-Text を使用する"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "CDDB を使用する"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP の代わりに HTTP を使う"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "サーバー:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "パス:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "ポート:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "オーディオ CD プラグイン"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "cdio サブシステムの初期化に失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "次の URI は無効です。%s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "トラック %d が見つかりません。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr "トラック %d はデータトラックです。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "オーディオ出力のオープンに失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr " オーディオCDの読み込みでエラーが発生しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "オーディオ CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "CDデバイス %s のオープンに失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "オーディオが利用可能なCDドライブが見つかりません。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "オープンされたCDドライブの初期化が完了できませんでした。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "最初または最後のトラックナンバを取得できませんでした。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr "トラック %d の LSN(論理セクタ番号) の開始または終了が読み取れませんでした。"
+msgstr ""
+"トラック %d の LSN(論理セクタ番号) の開始または終了が読み取れませんでした。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "cddb コネクションの作成に失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "CDDB サーバへのクエリに失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "CDDB サーバへのクエリに失敗しました: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "cddb 情報の読み取りに失敗しました: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "ドライブにディスクがありません。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "非対応のディスクです。"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "CD を再生"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "プレイリストに CD を追加"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "オーディオ CD メニュー項目"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "コンプレッション"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "センター音量:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "ダイナミックレンジ:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "ダイナミックレンジ圧縮プラグイン for Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"ダイナミックレンジ圧縮プラグイン for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "ダイナミックレンジコンプレッサ"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "ゲームコンソール音楽デコーダ"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "一般"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "演奏"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "ベース:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "秒"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "トリバル:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "デフォルトの曲の長さ:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "リサンプリング"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "オーディオリサンプリングを有効にする"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "リサンプリングレート:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "SPC タグからの長さを無視する"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "リバーブを増やす"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "秒数で表現されるデフォルトの曲の長さは, 長さ情報を提供しない曲 (例えばループするトラック) に用いられます."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"秒数で表現されるデフォルトの曲の長さは, 長さ情報を提供しない曲 (例えばループ"
+"するトラック) に用いられます."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1134,88 +1198,107 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "コンソール音楽デーコーダエンジン based on Game_Music_Emu 0.5.2\nSupported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n\nAudacious plugin by:\nWilliam Pitcock <nenolod@dereferenced.org>\nShay Green <gblargg@gmail.com>"
+msgstr ""
+"コンソール音楽デーコーダエンジン based on Game_Music_Emu 0.5.2\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "曲のチャンネル数が異なるため、クロスフェードが失敗しました。\n曲を同じチャンネル数にするために、チャンネルミキサが利用できます。"
+msgstr ""
+"曲のチャンネル数が異なるため、クロスフェードが失敗しました。\n"
+"曲を同じチャンネル数にするために、チャンネルミキサが利用できます。"
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "曲のサンプリング周波数が異なるため、クロスフェードが失敗しました。\n曲を同じサンプリング周波数にするために、サンプリング周波数ミキサが利用できます。"
+msgstr ""
+"曲のサンプリング周波数が異なるため、クロスフェードが失敗しました。\n"
+"曲を同じサンプリング周波数にするために、サンプリング周波数ミキサが利用できま"
+"す。"
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "クロスフェードプラグイン for Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"クロスフェードプラグイン for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "クロスフェード"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "オーバーラップ:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "クロスフェード"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "クリスタライザ"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "明るさ:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "クリスタライザ"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Cue シートプラグイン"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "エコー"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "遅延:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "フィードバック:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "音量:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "エコープラグイン\nBy Johan Levin, 1999\n\nサラウンドエコー by Carl van Schaik, 1999"
+msgstr ""
+"エコープラグイン\n"
+"By Johan Levin, 1999\n"
+"\n"
+"サラウンドエコー by Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "エコー"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1223,9 +1306,15 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "マルチフォーマット オーディオデコードプラグイン for Audacious using\nFFmpeg マルチメディアフレームワーク (http://www.ffmpeg.org/)\n\nAudacious plugin by:\nWilliam Pitcock <nenolod@nenolod.net>\nMatti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"マルチフォーマット オーディオデコードプラグイン for Audacious using\n"
+"FFmpeg マルチメディアフレームワーク (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg プラグイン"
 
@@ -1293,7 +1382,21 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1307,11 +1410,13 @@
 msgid "Joint Stereo"
 msgstr "ジョイントステレオ"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "ステレオ"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "モノラル"
 
@@ -1359,7 +1464,7 @@
 msgid "Error protection"
 msgstr "エラー保護"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "音質"
 
@@ -1439,541 +1544,623 @@
 msgid "Tags"
 msgstr "タグ"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis エンコーダ設定"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "品質レベル (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "可逆"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Original code by\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "FLAC デコーダ"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "GIO プラグイン for Audacious\nCopyright 2009-2012 John Lindgren"
+msgstr ""
+"GIO プラグイン for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "GIO プラグイン"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Gnome ショートカットプラグイン\nGnome ショートカットでプレイヤーをコントロールします。\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"Gnome ショートカットプラグイン\n"
+"Gnome ショートカットでプレイヤーをコントロールします。\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Gnome ショートカット"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "リスト番号"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "タイトル"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "アーティスト"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "年"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "アルバム"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "トラック"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "ジャンル"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "キュー番号"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "長さ"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "ファイルパス"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "カスタムタイトル"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "ビットレート"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "列の選択"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "利用可能なもの"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "選択したもの:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "左側にドッキング"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "右側にドッキング"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "上部にドッキング"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "下部にドッキング"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "ドッキングを解く"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "無効"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "ファイルを開く(_O)"
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "URL を開く(_U)"
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "ファイルを追加(_A)"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "URL を追加(_R)"
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "ライブラリを検索(_S)"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "プログラムの情報(_B)"
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "設定(_P)"
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "再生(_P)"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "一時停止(_E)"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "前の曲へ(_V)"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "次の曲へ(_N)"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "リピート(_R)"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "シャッフル(_H)"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "1曲リピート(_O)"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
 msgstr "曲の再生後に停止(_A)"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "曲の情報(_I)"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "指定した時間にジャンプ(_T)"
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "指定した曲にジャンプ(_J)"
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "トラックナンバー(_N)"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "リピートポイントAを設定(_A)"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "リピートポイントBを設定(_B)"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "リピートポイントをクリアする(_C)"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "タイトル(_T)"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "ファイル名(_F)"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "パス(_P)"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "トラックナンバー(_N)"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "アーティスト(_A)"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
 msgstr "アルバム(_L)"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "リリース日(_D)"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "曲の長さ(_L)"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "ファイルパス(_F)"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "カスタムタイトル(_C)"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "逆順にする(_E)"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "ランダムに並べる(_R)"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "このプレイリストを再生する(_P)"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "再読み込み(_R)"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "再生できないファイルを削除する(_U)"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "ソート(_S)"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "選択範囲のソート"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "重複している曲を削除(_D)"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "再生できないファイルを削除する(_U)"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "新しいプレイリスト(_N)"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "名前の変更(_A)"
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "プレイリストを閉じる(_C)"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "インポート(_I)"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "エクスポート(_E)"
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "プレイリストマネージャ(_M)"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "キューマネージャ(_Q)"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "音量を上げる(_U)"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "音量を下げる(_D)"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "イコライザ(_E)"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "エフェクト(_E)"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "インターフェイス(_I)"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "視覚化(_V)"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "メニューバーを表示する(_M)"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "情報バーを表示する(_N)"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "情報バーに視覚効果を表示"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "ステータスバーを表示する(_S)"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "残り時間を表示する(_R)"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "閉じるボタンを表示する(_B)"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "列のヘッダーを表示する(_H)"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "列を選択する(_C)"
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "曲が変わったらスクロールする(_L)"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "再生(_P)"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "プレイリスト(_L)"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "サービス(_S)"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "出力(_O)"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "表示(_V)"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "キュー / アンキュー(_Q)"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "切り取り(_T)"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "すべて選択(_A)"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "名前の変更(_R)"
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "GTK インターフェイス"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "バッファ中 ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "エラー"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d チャンネル"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr "前のトラック"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "再生"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "一時停止/再開"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "停止"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "次のトラック"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
 msgstr "5秒進める"
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
 msgstr "5秒戻す"
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
 msgstr "ミュート"
 
-#: src/hotkey/gui.c:80
-msgid "Volume Up"
+#: src/hotkey/gui.c:78
+msgid "Volume up"
 msgstr "音量を上げる"
 
-#: src/hotkey/gui.c:81
-msgid "Volume Down"
+#: src/hotkey/gui.c:79
+msgid "Volume down"
 msgstr "音量を下げる"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
 msgstr "指定したファイルへ移動"
 
-#: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "プレイヤウィンドウのトグル"
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr "プレイヤウィンドウをトグル"
 
-#: src/hotkey/gui.c:84
+#: src/hotkey/gui.c:82
 msgid "Show On-Screen-Display"
 msgstr "On-Screen-Display を表示する"
 
-#: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
 msgstr "リピートをトグル"
 
-#: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
 msgstr "シャッフルをトグル"
 
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr "現在の曲の再生後に停止する"
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
 msgstr "プレイヤウィンドウを表示する"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(なし)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "修飾キーなしでプライマリ・マウスのボタンに割り当てるのはお勧めしません。\n\n本当によろしいですか？"
+msgstr ""
+"修飾キーなしでプライマリ・マウスのボタンに割り当てるのはお勧めしません。\n"
+"\n"
+"本当によろしいですか？"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "マウスボタンの割り当て"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "グローバルホットキープラグインの設定"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "テキストフィールド内でキーコンビネーションを押してください。\nマウスボタンを組み合わせることもできます。"
+msgstr ""
+"テキストフィールド内でキーコンビネーションを押してください。\n"
+"マウスボタンを組み合わせることもできます。"
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "ホットキー:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "動作:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "キーバインド:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1986,104 +2173,131 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "グローバルホットキープラグイン\nグローバルキーまたはマルチメディアキーでプレイヤーをコントロールします。\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nContributers include:\nCopyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n Bryn Davies <curious@ihug.com.au>,\n Jonathan A. Davis <davis@jdhouse.org>,\n Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"グローバルホットキープラグイン\n"
+"グローバルキーまたはマルチメディアキーでプレイヤーをコントロールします。\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "グローバルホットキー"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Based on xmms-jack, by Chris Morgan:\nhttp://xmms-jack.sourceforge.net/\n\nAudacious へのポート by Giacomo Lozito"
+msgstr ""
+"Based on xmms-jack, by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Audacious へのポート by Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "JACK 出力"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s の設定"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "LADSPA Host の設定"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "モジュールのパス:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "複数のパスはコロンで区切ってください。これらのパス\nが、LADSPA_PATH の他に検索されます。新しいパスを追\n加した後は、新しいプラグインをスキャンするために、\nEnter キーを押してください。"
+msgstr ""
+"複数のパスはコロンで区切ってください。これらのパス\n"
+"が、LADSPA_PATH の他に検索されます。新しいパスを追\n"
+"加した後は、新しいプラグインをスキャンするために、\n"
+"Enter キーを押してください。"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "利用可能なプラグイン:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "有効"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "有効なプラグイン:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "設定:"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "LADSPA ホスト for Audacious\nCopyright 2011 John Lindgren"
+msgstr ""
+"LADSPA ホスト for Audacious\n"
+"Copyright 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "LADSPA ホスト"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: LIRC 機能を初期化できません\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: LIRC の設定ファイルを読み込めません\n%s: LIRC のドキュメントをお読みください\n%s: 正しい設定ファイルの書き方\n\n"
+msgstr ""
+"%s: LIRC の設定ファイルを読み込めません\n"
+"%s: LIRC のドキュメントをお読みください\n"
+"%s: 正しい設定ファイルの書き方\n"
+"\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: 再接続を試みています...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: 不明なコマンド \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: LIRC から切断されました\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: %d 秒毎に再接続を試みます...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2097,155 +2311,313 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "LIRC リモートコントロールデーモンを用いた、シンプルな Audacious コントロールプラグイン\nAdapted for Audacious by:\nTony Vroon <chainsaw@gentoo.org>\nJoonas Harjumäki <jharjuma@gmail.com>\n\nBased on the XMMS LIRC plugin by:\nCarl van Schaik <carl@leg.uct.ac.za>\nChristoph Bartelmus <xmms@bartelmus.de>\nAndrew O. Shadoura <bugzilla@tut.by>\n\nFor more information about LIRC, see http://lirc.org."
+msgstr ""
+"LIRC リモートコントロールデーモンを用いた、シンプルな Audacious コントロール"
+"プラグイン\n"
+"Adapted for Audacious by:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Based on the XMMS LIRC plugin by:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"For more information about LIRC, see http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "接続"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "LIRC サーバーへ再接続する"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "再接続の待機時間:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "LIRC プラグイン"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "歌詞が見つかりません"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "%s が取得できません"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "%s が解析できません"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "歌詞を検索しています ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "曲のメタデータが見つかりません"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "lyrics.wikia.com に接続しています ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki プラグイン"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "M3U プラグイン"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "タクトジェネレータ: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "タクトジェネレータ: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "タクトジェネレータ by Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nこのプラグインを使用するには、URL に次のフォーマットの文字列を入力してください。\n\ntact://beats*num/den\n\n例: \ntact://77 (77bpmのビートを作る)\ntact://60*3/4 (3/4 拍子で 60 bpmのビートを作る)"
+msgstr ""
+"タクトジェネレータ by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"このプラグインを使用するには、URL に次のフォーマットで文字列を入力してくださ"
+"い。\n"
+"\n"
+"tact://beats*num/den\n"
+"\n"
+"例: \n"
+"tact://77 (77bpmのビートを作る)\n"
+"tact://60*3/4 (3/4 拍子で 60 bpmのビートを作る)"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "タクトジェネレータ"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "チャンネルミキサプラグイン for Audacious\nCopyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+"チャンネルミキサプラグイン for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "チャンネルミキサ"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "出力チャンネル:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "チャンネルミキサ"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "MMS プラグイン"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bit"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bit"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "チャンネル"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "リサンプリング"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "サンプリングレート"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "レベル:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "リバーブ"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "バスブースト"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "サラウンド"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "プリアンプ"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "その他"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "ノイズリダクション"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "リピート"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "リピートカウント:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Module Player)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "サラウンド"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "MPG123 プラグイン"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 サーバ"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS プラグイン"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "停止しました"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious は曲を再生していません。"
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
-"\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Based on libnotify-aosd by Maximilian Bogner:\nhttp://www.mbogner.de/projects/libnotify-aosd/\n\nCopyright (C) 2010 Maximilian Bogner\nCopyright (C) 2011 John Lindgren\n\nThis plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n\nThis plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "再生コントロールを表示する"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "常に通知を表示する"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "デスクトップ通知"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "表示する"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "一時停止"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "次の曲"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. デフォルトデバイス"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "オーディオデバイス:"
 
@@ -2263,29 +2635,36 @@
 
 #: src/oss4/plugin.c:85
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr "バーチャルミキシングを防ぐために排他的モード (exclusive mode) を有効にする"
+msgstr ""
+"バーチャルミキシングを防ぐために排他的モード (exclusive mode) を有効にする"
 
 #: src/oss4/plugin.c:108
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "OSS4 出力プラグイン for Audacious\nCopyright 2010-2012 Michał Lipski\n\n#audacious の人々、特に Tony Vroon および John Lindgren、そしてもちろん、OSS plugin の前作者に感謝します。"
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"OSS4 出力プラグイン for Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"#audacious の人々、特に Tony Vroon および John Lindgren、そしてもちろん、OSS "
+"plugin の前作者に感謝します。"
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "OSS4 出力"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "PLS プレイリスト"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 デコーダ"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2303,161 +2682,238 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Audacious PulseAudio 出力プラグイン\n\nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"Audacious PulseAudio 出力プラグイン\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "PulseAudio 出力"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "サンプルレート変換プラグイン for Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"サンプルレート変換プラグイン for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "サンプルのスキップ/繰り返し"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "線形補間"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "高速 sinc 補間"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "sinc 補間"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "高品質 sinc 補間"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "変換"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "方法"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "レート:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "レートマッピング"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "レートマッピングを使用する"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "サンプリング周波数コンバータ"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "パスワードの変更"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "ユーザー %s の Scrobble に成功しました。"
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "サービス"
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "アクセス許可がありません"
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Audacious に scrobble する許可を与えるには、以下のリンクにアクセスしてくださ"
+"い。"
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "ユーザ名:"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"このウィンドウを開いたまま、もう一度「パーミッションを確認する」をクリックし"
+"てください。\n"
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "パスワード:"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"あなたの Scrobble はコンピュータに保存されています。\\n\n"
+"Audacious は投稿が可能になり次第、すぐに Scrobble を投稿します。"
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "ネットワークに問題があります。"
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "Last.fmへの接続に問題が発生しました。あとでもう一度試してください。"
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "チェックしています..."
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "パーミッションを確認する(_H)"
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Audacious があなたの Last.fm アカウントにトラックを scrobble できるように設定"
+"する必要があります。\n"
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "Scrobbler URL:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Scrobbler プラグインを起動できませんでした。\\n\n"
+"インストール方法に問題がある可能性があります。"
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Audacious AudioScrobbler プラグイン\n\nOriginally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Pitxyoki による、 Audacious Scrobbler プラグイン 2.0 です。\\n\\n\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\\n\\n\n"
+"プロジェクト開始時に手助けしてくれた John Lindgren に感謝します。\\n\\n\n"
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious は Last.fm Scrobbler のバージョンを更新しました。\n"
+"Scrobbler プラグインの設定をご確認ください。"
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "SDL 出力プラグイン for Audacious\nCopyright 2010 John Lindgren"
+msgstr ""
+"SDL 出力プラグイン for Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "SDL 出力"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "ライブラリ"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "不明なアーティスト"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "不明なアルバム"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\nアルバム: %s アーティスト: %s"
+msgstr ""
+"%s\\n\n"
+"アルバム: %s アーティスト: %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d albums"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2465,9 +2921,11 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d songs"
+msgstr[0] ""
+"%s\n"
+" %s, %d songs"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2475,75 +2933,79 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d songs by %s"
+msgstr[0] ""
+"%s\n"
+" %d songs by %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "プレイリストを作成(_C)"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "プレイリストに追加(_A)"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "ライブラリを検索"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "音楽ライブラリを Audacious へインポートするには、フォルダを選択し、\"再読み込み\" アイコンをクリックしてください。"
+msgstr ""
+"音楽ライブラリを Audacious へインポートするには、フォルダを選択し、\"再読み込"
+"み\" アイコンをクリックしてください。"
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "お待ちください..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "フォルダを選択"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "検索ツール"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Winamp クラシックインターフェイス"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "プレイヤ(_P):"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "メインウィンドウで使用するフォントの選択"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "プレイリスト(_P):"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "プレイリストで使用するフォントの選択"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "フォント(_F)"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "ビットマップフォントを使用する (ASCII のみ対応)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "曲のタイトルを両方向にスクロールする"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "スキン(_S)"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "インターフェイスの設定"
 
@@ -2599,7 +3061,7 @@
 msgid "Presets"
 msgstr "プリセット"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "プリセットの読み込み"
 
@@ -2612,7 +3074,7 @@
 msgid "Load equalizer preset"
 msgstr "イコライザのプリセットの読み込み"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "プリセットの保存"
 
@@ -2624,7 +3086,7 @@
 msgid "Save equalizer preset"
 msgstr "イコライザプリセットの保存"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "プリセットの削除"
 
@@ -2632,739 +3094,751 @@
 msgid "Delete auto-preset"
 msgstr "自動プリセットの削除"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "%d:%-2.2d / %d:%-2.2d へシークする"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "音量: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "バランス: %d%% 左"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "バランス: 中央"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "バランス: %d%% 右"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "オプションメニュー"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "「常に最前面に配置」無効"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "「常に最前面に配置」有効"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "ファイル情報ボックス"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "視覚化メニュー"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "シングルモード"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "プレイリストモード"
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "曲の再生後に停止する"
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "曲の再生後に停止しない"
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "リピートポイントAを設定します。"
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "リピートポイントBを設定します。"
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "リピートポイントがクリアされました。"
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "曲名を自動でスクロールする"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "現在の曲の後に停止する"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "ピーク"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "リピート"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "シャッフル"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "次の曲に進まない"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "プレイヤを表示する"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "プレイリストエディタを表示する"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "イコライザを表示する"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "常に最前面に配置する"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "全ワークスペースに配置する"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "プレイヤを巻き上げる"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "プレイリストエディタを巻き上げる"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "イコライザを巻き上げる"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "アナライザ"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "スコープ"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "声紋"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "オフ"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "標準"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "ファイア"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "垂直ライン"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "ライン"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "バー"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "ドット"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "ライン"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "ソリッド"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "アイス"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "スムーズ"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "最も遅い"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "遅い"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "中"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "早い"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "最も早い"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "経過時間を表示する"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "残り時間を表示する"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "一時停止"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "前の曲"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "次の曲"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "視覚化"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "視覚化モード"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "アナライザモード"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "スコープモード"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "声紋モード"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "WindowShade VU モード"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "アナライザ フォールオフ"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "ピーク フォールオフ"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "プレイリスト"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "プレイリストの再生"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "新しいプレイリスト"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "次のプレイリストを選択"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "前のプレイリストを選択"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "プレイリストの削除"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "プレイリストのインポート"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "選択したプレイリストにプレイリストファイルを読み込みます。"
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "プレイリストのエクスポート"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "選択したプレイリストを保存します。"
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "プレイリストの更新"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "プレイリストのエントリに関連付けられたメタデータを更新します。"
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "プレイリストマネージャ"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "キューマネージャ"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "表示"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "インターフェイス"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "インターフェイスの設定"
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "インターネットアドレスの追加"
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "リモートトラックをプレイリストに追加します。"
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "ファイルの追加"
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "ファイルをプレイリストに追加します."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "検索と選択"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "プレイリストを検索し、検索条件に合うものを選択します。"
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "選択範囲の反転"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "エントリの選択と未選択を反転します。"
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "全て選択"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "プレイリストの全てのエントリを選択します。"
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "未選択にする"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "プレイリストの全てのエントリを未選択にします。"
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "全て削除"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "全てのエントリをプレイリストから削除します."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "キューのクリア"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "プレイリストに関連付けられたキューをクリアします."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "利用できないファイルの削除"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "利用できないファイルをプレイリストから削除します。"
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "重複エントリの削除"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "タイトル"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "重複するタイトルのエントリをプレイリストから削除します。"
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "ファイル名"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "重複するファイル名のエントリをプレイリストから削除します."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "パス名とファイル名"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "重複するパス名とファイル名のエントリをプレイリストから削除します。"
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "選択していないエントリの削除"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "選択していないエントリをプレイリストから削除します。"
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "選択したエントリの削除"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "選択したエントリをプレイリストから削除します。"
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "プレイリストをランダムにする"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "プレイリストの順序をランダムにします。"
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "プレイリストを逆順にする"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "プレイリストの順序を逆順にします。"
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "プレイリストのソート"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "タイトル順でプレイリストをソートします."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "アルバム"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "アルバム順でプレイリストをソートします。"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "アーティスト"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "アーティスト順でプレイリストをソートします。"
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "ファイル名順でプレイリストをソートします。"
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "ファイルのパス名でプレイリストをソートします。"
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "日付"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "変更時間でプレイリストをソートします。"
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "トラック番号"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "トラック番号順でプレイリストをソートします。"
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "選択範囲のソート"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "ファイル"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "プラグインサービス"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "トラックの詳細を表示"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "トラックの詳細を表示"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Audacious について"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "ファイルを再生"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "ファイルを読み込んで再生"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "場所を再生"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "選択した場所からメディアを再生"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "プラグインサービス"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "設定"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "設定ウィンドウを開く"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Audacious を終了する"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "A-B をセット"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "A-B をクリア"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "指定したファイルへ移動"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "指定した時間へ移動"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "キューをトグルする"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "プレイリストのキューに入っているエントリの有効/無効を切り替えます。"
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "コピー"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "切り取り"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "貼り付け"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "読み込み"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "インポート"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "保存"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "削除"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "プリセット"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "自動読み込みのプリセット"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "自動読み込みのプリセット"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "イコライザにデフォルトプリセットを読み込む"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "ゼロ"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "イコライザプリセットレベルをゼロにセット"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "ファイル"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "ファイルからプリセットを読み込み"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "WinAMP EQF ファイル"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "WinAMP EQF ファイルからプリセットを読み込み"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP プリセット"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "WinAMP プリセット"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "自動読み込みのプリセットの保存"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "デフォルトプリセットの保存"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "ファイル"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "プリセットをファイルへ保存"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "WinAMP EQF ファイル"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "プリセットを WinAMP EQF ファイルへ保存"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "自動読み込みのプリセットの削除"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "有効になっているプレイリストのエントリを検索"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "1つ以上の項目を入力すると、プレイリストのエントリが選択できます。項目には正規表現が使え、大文字と小文字を区別しません。正規表現の動作がわからない場合は、検索したい文字をそのまま入力してください。"
+msgstr ""
+"1つ以上の項目を入力すると、プレイリストのエントリが選択できます。項目には正規"
+"表現が使え、大文字と小文字を区別しません。正規表現の動作がわからない場合は、"
+"検索したい文字をそのまま入力してください。"
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "タイトル: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "アルバム名: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "アーティスト: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "ファイル名: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "検索前に前回の選択をクリアする"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "マッチしたエントリのキューを自動的にトグルする"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "マッチしたエントリで新しいプレイリストを作成する"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Audacious プレイリストエディタ"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d / %d)"
@@ -3382,81 +3856,123 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "ディレクトリ (%s) を作成できませんでした: %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Based on the xmms_sndfile plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Based on the xmms_sndfile plugin:\nCopyright (C) 2000, 2002 Erik de Castro Lopo\n\nAdapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Sndfile プラグイン"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Sndio 出力プラグインについて"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Sndio 出力プラグイン\n\nWritten by Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Sndio 出力プラグイン\n"
+"\n"
+"Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "対応していない形式"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "オーディオデバイスで対応していない形式が要求されました。\n\nsndiod(1) サーバが起動してから、もう一度実行してください。"
+msgstr ""
+"オーディオデバイスで対応していない形式が要求されました。\n"
+"\n"
+"sndiod(1) サーバが起動してから、もう一度実行してください。"
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "sndio デバイス"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(空の場合、デフォルトに設定します)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "楽曲の変更通知"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "新しい曲を再生したときに実行するコマンド"
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "コマンド:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "曲の再生が終わったときに実行するコマンド"
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "プレイリストの最後に到達したときに実行するコマンド"
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "曲のタイトルが変わったときに実行するコマンド (ネットワークストリームのタイトルなど)"
+msgstr ""
+"曲のタイトルが変わったときに実行するコマンド (ネットワークストリームのタイト"
+"ルなど)"
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3473,35 +3989,85 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "次のフォーマット文字列を使用できます。\nこれらは、コマンドが呼ばれる前に置換されます。\nただし、プレイリストの最後の曲の場合、無意味なものもあります\n\n%F: サンプリング周波数 (Hz)\n%c: チャンネル数\n%f: ファイル名 (フルパス)\n%l: 長さ (ms)\n%n または %s: 曲名\n%r: ビットレート (bps)\n%t: プレイリストの位置 (%02d)\n%p: 再生中か？ (1 or 0)\n%a: アーティスト\n%b: アルバム\n%T: トラック名"
+msgstr ""
+"次のフォーマット文字列を使用できます。\n"
+"これらは、コマンドが呼ばれる前に置換されます。\n"
+"ただし、プレイリストの最後の曲の場合、無意味なものもあります\n"
+"\n"
+"%F: サンプリング周波数 (Hz)\n"
+"%c: チャンネル数\n"
+"%f: ファイル名 (フルパス)\n"
+"%l: 長さ (ms)\n"
+"%n または %s: 曲名\n"
+"%r: ビットレート (bps)\n"
+"%t: プレイリストの位置 (%02d)\n"
+"%p: 再生中か？ (1 or 0)\n"
+"%a: アーティスト\n"
+"%b: アルバム\n"
+"%T: トラック名"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "シェルに渡されるパラメータはクォートでくくってください。そうしない場合、セキュリティ上の危険があります。"
+msgstr ""
+"シェルに渡されるパラメータはクォートでくくってください。そ"
+"うしない場合、セキュリティ上の危険があります。"
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "コマンド"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "テンポとピッチ"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "テンポ:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "ピッチ:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "テンポとピッチ"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3510,94 +4076,118 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "ステータスアイコンプラグイン\n\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nThis plugin provides a status icon, placed in\nthe system tray area of the window manager."
+msgstr ""
+"ステータスアイコンプラグイン\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "マウススクロールアクション"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "音量の変更"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "再生曲の変更"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "その他の設定"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "ポップアップウィンドウを無効にする"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "システムトレイに収納する"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "上にスクロールしたらプレイリストを進める"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "ステータスアイコン"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Extra Stereo プラグイン\n\nBy Johan Levin, 1999"
+msgstr ""
+"Extra Stereo プラグイン\n"
+"\n"
+"By Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "エクストラステレオ"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "エクストラステレオ"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "トーンジェネレータ: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "サイン音色 (sine tone) ジェネレータ by Håvard Kvålen <havardk@xmms.org>\nModified by Daniel J. Peng <danielpeng@bigfoot.com>\n\nこのプラグインを使用するには、URL に次のフォーマットの文字列を入力してください。\n\ntone://frequency1;frequency2;frequency3;...\n\n例:\ntone://2000;2005 (2000Hz と 2005Hz のトーンを再生する)"
+msgstr ""
+"サイン音色 (sine tone) ジェネレータ by Håvard Kvålen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"このプラグインを使用するには、URL に次のフォーマットで文字列を入力してくださ"
+"い。\n"
+"\n"
+"tone://frequency1;frequency2;frequency3;...\n"
+"\n"
+"例:\n"
+"tone://2000;2005 (2000Hz と 2005Hz のトーンを再生する)"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "トーンジェネレータ"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "ファイル I/O プラグインfor Audacious\nCopyright 2009-2012 John Lindgren\n\n*このプラグインは必須です。無効にしないでください。*"
+msgstr ""
+"ファイル I/O プラグインfor Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"*このプラグインは必須です。無効にしないでください。*"
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "ファイル I/O プラグイン"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "ボーカルの除去"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3616,46 +4206,76 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Audacious Ogg Vorbis デコーダ\n\nBased on the Xiph.org Foundation's Ogg Vorbis Plugin:\nhttp://www.xiph.org/\n\nOriginal code by:\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nContributions from:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Audacious Ogg Vorbis デコーダ\n"
+"\n"
+"Based on the Xiph.org Foundation's Ogg Vorbis Plugin:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Original code by:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contributions from:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis デコーダ"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
+"Sashnov Alexander <sashnov@ngs.ru> による Vortex ファイル形式プレイヤで"
+"す。\\n\n"
+"Roman Sherbakov <v_soft@microfor.ru> の in_vtx.dll を基にしています。\\n\n"
+"Audacious の実装は、Pavel Vymetalek <pvymetalek@seznam.cz> が行いました。"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "VTX デコーダ"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "非可逆(ハイブリッド)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "非可逆"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n\nSome of the plugin code was by Miles Egan."
+msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "WavPack デコーダ"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "2SF デコーダ"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "共有可能な XML プレイリスト (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - ファイル選択"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "選択した曲をソート(_E)"

audacious-plugins-3.3.4.tar.bz2/po/ko.po -> audacious-plugins-3.4.2.tar.bz2/po/ko.po Changed

@@ -1,596 +1,668 @@
 # Korean translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# 		ChoSeongWoo <syn333@gmail.com>, 2008.
-# Jaegeum Choe <baedaron@hananet.net>, 2001.
-# Man-Yong Lee <yong@linuxkorea.co.kr>, 2000.
-# Sang-Jin Hwang <accel@accellinux.org>, 1999.
-# 		Seong-ho Cho <darkcircle.0426@gmail.com>, 2012.
-# 	Seong-ho Cho <darkcircle.0426@gmail.com>, 2012.
+# 		ChoSeongWoo <syn333@gmail.com>, 2008
+# Darkcircle <darkcircle.0426@gmail.com>, 2013
+# Darkcircle <darkcircle.0426@gmail.com>, 2012-2013
+# Jaegeum Choe <baedaron@hananet.net>, 2001
+# Man-Yong Lee <yong@linuxkorea.co.kr>, 2000
+# Sang-Jin Hwang <accel@accellinux.org>, 1999
+# Darkcircle <darkcircle.0426@gmail.com>, 2012
+# Darkcircle <darkcircle.0426@gmail.com>, 2012
+# Darkcircle <darkcircle.0426@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-16 23:46+0000\n"
-"Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: Korean\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-09-30 14:46+0000\n"
+"Last-Translator: Darkcircle <darkcircle.0426@gmail.com>\n"
+"Language-Team: Korean (http://www.transifex.com/projects/p/audacious/"
+"language/ko/)\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "모노"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "스테레오"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "서라운드"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "AAC 디코더"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
-msgstr ""
+msgstr "순차"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib 재생기)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
+"임의의 시간에 재생을 시작할 때 사용하는 플러그인입니다.\n"
+"\n"
+"초기에 Adam Feakin과 Daniel Stodden이 작성했습니다."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "알림"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "기상 알림입니다."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "확인"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "알림 설정"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "시계"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "시간"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "시"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"시간\n"
+" 다음 시간에 알림:\n"
+" 알람을 울릴 시간입니다.\n"
+"\n"
+" 다음 시간 후 조용히:\n"
+" 이 시간이 지나면 알람을 멈춥니다.\n"
+" (기상 대화상자를 닫지 않았을 경우)\n"
+"\n"
+"\n"
+"날짜\n"
+" 날짜:\n"
+" 알람을 활성화 할 날짜를 선택하십시오.\n"
+"\n"
+" 시간:\n"
+" 각각의 날짜에 알람을 울릴 시간을 선택\n"
+" 하거나, 기본 시간을 사용하려면 전환 \n"
+" 단추를 선택하십시오.\n"
+"\n"
+"\n"
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "분"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"음량\n"
+" 점진적 음량 변화 시간:\n"
+" 여기 정해놓은 시간만큼 선택한 볼륨\n"
+" 크기로 음량을 증가하며 페이드합니다.\n"
+"\n"
+" 시작:\n"
+" 이 음량으로 페이딩을 시작합니다.\n"
+"\n"
+" 끝:\n"
+" 페이딩을 멈출 음량입니다. 페이딩 시간이\n"
+" 0 이면 이 음량으로 맞추고 재생을 시작합\n"
+" 니다.\n"
+"\n"
+"\n"
+"옵션:\n"
+" 추가 명령:\n"
+" 알람 시간에 이 명령을 실행합니다.\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "다음 시간후 조용히:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+" 재생 목록:\n"
+" 재생 목록을 불러옵니다. 재생 목록\n"
+" 이 없으면 현재의 재생 목록을 사용\n"
+" 합니다. mp3/ogg 스트림의 URL은\n"
+" 도 입력할 수 있습니다.\n"
+"\n"
+" 알리미:\n"
+" 알람이 꺼지면 알리미를 표시합니다.\n"
+" 상자에 약속을 입력하고 표시하려는\n"
+" 경우 전환 단추를 누르십시오."
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "다음 시간에 알림(기본):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "기상 알림입니다."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "알림을 울릴 날짜를 선택합니다"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "오늘 약속은..."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "기본값"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "약속 알리미"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "요일"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "월요일"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "화요일"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "수요일"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "목요일"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "금요일"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "토요일"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "일요일"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "월요일"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "알림 설정"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "시계"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "다음 시간에 알림(기본):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "시"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "다음 시간후 조용히:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "시간"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "분"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "알림을 울릴 날짜를 선택합니다"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "요일"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "기본값"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "일"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
-msgstr "점진적 음량변화"
+msgstr "점진적 음량 변화 시간"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "초"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "음량"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "현재"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "시작"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
-msgstr "마지막"
+msgstr "끝"
+
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "현재"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "추가 명령"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "활성화"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "재생 목록(선택)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "재생 목록 선택하기"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "약속 알리미"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "약속 알리미 사용"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "옵션"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "이 옵션은 무엇을 의미하나요?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\n시간\n 다음 시간에 알림: \n 알림이 울릴 시간입니다.\n\n 다음 시간후 조용히: \n 이 시간이 흐른 이후에 알림을 멈춥니다.\n (기상 대화상자가 닫히지 않았을 경우)\n\n\n날짜\n 요일:\n 알림을 울릴 요일을 선택합니다.\n\n 시간:\n 각각의 날짜에 알릴 시간을 선택하거나,\n 기본 시간을 사용하려면 상태 전환단추를\n 선택합니다.\n \n\n음량\n 점진적 음량 변화: \n 정해진 시간동안 정한 음량 만큼 음량을 서서히\n 크게 합니다.\n\n 시작: \n 이 음량부터 서서히 크게 합니다.\n\n 끝: \n 음량이 서서히 커지는 것을 멈출 음량값입니다.\n 점진적 음량 변화 시간이 0이면 이 값을 선택\n 하고 재생을 시작합니다.\n\n\n옵션:\n 추가 명령:\n 알림 시간에 명령을 실행합니다.\n\n 재생 목록: \n 재생할 곡을 불러올 재생 목록을 불러옵니다. \n 재생 목록이 주어지지 않으면 현재 목록에 있는\n 곡을 사용할 것입니다.\n mp3/ogg 스트림의 주소를 입력할 수도 있습니다.\n\n 약속 알리미:\n 타이머가 끝나면 약속 알리미를 보여줍니다.\n 약속 알리미를 보이고 싶으면 약속 내용을\n 상자에 입력하고 전환단추를 켭니다.\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "도움말"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "취소"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "오늘의 약속 내용은.."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "감사합니다"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
-msgstr "음반 표지"
+msgstr "앨범 표지"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "기본 PCM 장치"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "기본 음량 조절기 장치"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA 출력 플러그인 기본 설정"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "PCM 장치:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "음량 조절기 장치:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "음량 조절기 요소:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "드레인 행업을 피하며 작업"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
+"오데이셔스용 ALSA 출력 플러그인\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"ALSA 메뉴얼이 충분히 도움이 되지 않았을 때, 코드 참고서가 되어준 ALSA 출력 플"
+"러그인 NG의 저작자인 William Pitcock에게 감사드립니다."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "ALSA 출력"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (MIDI 재생기)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "미디 재생을 위한 시퀀서 포트를 선택하지 않았습니다. 미디 플러그인 기본 설정에서 설정할 수 있습니다."
+msgstr ""
+"미디 재생을 위한 시퀀서 포트를 선택하지 않았습니다. 미디 플러그인 기본 설정에"
+"서 설정할 수 있습니다."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI 재생기)"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "ALSA 백엔드"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "이 백엔드는 사용자가 선택한 ALSA 시퀀서 포트의 그룹에 미디 이벤트를 전송합니다. ALSA 시퀀서 인터페이스는 매우 다양한 기능을 갖추고 있는데 오디오 카드 하드웨어 신디자이저(예: emu10k1)뿐만 아니라 소프트웨어 신디사이저, 외부 장치 등에 대한 포트를 제공할 수 있습니다.\n이 백엔드는 소리를 만들어내는게 아니라, ALSA 포트 뒤에 있는 장치/프로그램에서 직접적으로 미디 이벤트를 다룹니다. 예를 들자면 오디오를 직접 재생할 하드웨어 신디사이저로 미디 이벤트를 보냅니다.이 벡엔드는 Giacomo Lozito가 작성했습니다."
+msgstr ""
+"이 백엔드는 사용자가 선택한 ALSA 시퀀서 포트의 그룹에 미디 이벤트를 전송합니"
+"다. ALSA 시퀀서 인터페이스는 매우 다양한 기능을 갖추고 있는데 오디오 카드 하"
+"드웨어 신디자이저(예: emu10k1)뿐만 아니라 소프트웨어 신디사이저, 외부 장치 등"
+"에 대한 포트를 제공할 수 있습니다.\n"
+"이 백엔드는 소리를 만들어내는게 아니라, ALSA 포트 뒤에 있는 장치/프로그램에"
+"서 직접적으로 미디 이벤트를 다룹니다. 예를 들자면 오디오를 직접 재생할 하드웨"
+"어 신디사이저로 미디 이벤트를 보냅니다.이 벡엔드는 Giacomo Lozito가 작성했습"
+"니다."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "FluidSynth 백엔드"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "이 백엔드는 SoundFont2 명세(www.fluidsynth.org)를 따르는 실시한 소프트웨어 신디사이저인 FluidSynth에 미디 이벤트를 보내어 소리를 만들어냅니다.\n만들어낸 소리는 플레이어 효과 플러그인을 통해 조작할 수 있으며, 선택한 출력 플러그인으로 처리합니다.\n이 백엔드는 Giacomo Lozito가 작성했습니다."
+msgstr ""
+"이 백엔드는 SoundFont2 명세(www.fluidsynth.org)를 따르는 실시간 소프트웨어 신"
+"디사이저인 FluidSynth에 미디 이벤트를 보내어 소리를 만듭니다.\n"
+"만든 소리는 플레이어 효과 플러그인을 통해 처리할 수 있으며, 선택한 출력 플러"
+"그인으로 처리합니다.\n"
+"이 백엔드는 Giacomo Lozito가 작성했습니다."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "포트"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "클라이언트 이름"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "포트 이름"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "ALSA 출력 포트"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "사운드 카드:"
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "음량 조절기 컨트롤:"
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "음량 조절기 설정"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "ALSA\n백엔드"
+msgstr ""
+"ALSA\n"
+"백엔드"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - 백엔드 정보"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "백엔드 선택"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "재생 목록 설정"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "조옮김:"
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "박자 이동:"
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "고급 설정"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "재생 목록의 미디 파일 길이 미리 계산"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "(가능한 경우) 미디 파일에서 주석 가져오기"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "(가능한 경우) 미디 파일에서 가사 가져오기"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - 파일 선택"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "AMIDI-Plug 설정"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr "AMIDI-Plug - 사운드폰트 파일 선택"
+msgstr "AMIDI-Plug - 사운드 폰트 파일 선택"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
-msgstr "사운드폰트 설정"
+msgstr "사운드 폰트 설정"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "파일 이름"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "크기(바이트)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "재생기 시작할 때 사운드 폰트 불러오기"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "처음 미디 파일 재생할 때 사운드 폰트 불러오기"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "신디사이저 설정"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "게인"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "기본값 사용"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "값:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "화성"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "리버브"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "예"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "아니요"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "합"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "샘플 주파수"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "사용자 정의"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "FluidSynth\n백엔드"
+msgstr ""
+"FluidSynth\n"
+"백엔드"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "이름:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " 미디 정보 "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "형식:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "길이(밀리초):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "트랙 번호:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "가변"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "빠르기(BPM):"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "빠르기(BPM, wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "박자:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " 미디 주석과 가사 "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* 이 미디 파일에는 주석이 없습니다 *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* 이 미디 파일에는 가사가 없습니다 *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (잘못된 UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "AMIDI-Plug 정보"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr ""
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -612,10 +684,27 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"\n"
+"모듈형 MIDI 음악 재생기\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"Giacomo Lozito\n"
+"<james@develia.org>가 작성함\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"ALSA API를 좀 더 배우기 위한 alsa-lib 문서와\n"
+"정말 쓸모있는 aplaymidi, amixer라는 좋은 \n"
+"프로그램을 만든 Clemens Ladisch, Jaroslav Kysela\n"
+"\n"
+"괜찮은 미디 키보드 로고를 사용할 수 있게 해준\n"
+"Alfredo Spadafina\n"
+"\n"
+"알파 테스트에 많은 도움을 준 Tony Vroon"
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
-msgstr ""
+msgstr "오데이셔스 OSD"
 
 #: src/aosd/aosd.c:37
 msgid "AOSD (On-Screen Display)"
@@ -654,7 +743,9 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "재생할 때 OSD를 시작하면 곡 제목은 바뀌지만 파일 이름은 그대로 입니다. 인터넷 스트림의 제목을 바꾸어서 보여줄 대부분의 경우에 유용합니다."
+msgstr ""
+"재생할 때 OSD를 시작하면 곡 제목은 바뀌지만 파일 이름은 그대로 입니다. 인터"
+"넷 스트림의 제목을 바꾸어서 보여줄 대부분의 경우에 유용합니다."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -786,8 +877,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "합성 관리자를 삭제하지 못했습니다.\n적어도 하나가 실행중인지 알지 못한다면, 합성 관리자를 활성화 해 주시기 바랍니다. 그렇지 않으면 OSD가 제대로 동작하지 않을 것입니다"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"합성 관리자를 삭제하지 못했습니다.\n"
+"적어도 하나가 실행중인지 알지 못한다면, 합성 관리자를 활성화 해 주십시오. 그"
+"렇지 않으면 OSD가 제대로 동작하지 않습니다"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -816,11 +911,11 @@
 #: src/aosd/aosd_ui.c:914
 #, c-format
 msgid "Audacious OSD"
-msgstr "Audacious OSD"
+msgstr "오데이셔스 OSD"
 
 #: src/aosd/aosd_ui.c:995
 msgid "Audacious OSD - configuration"
-msgstr "Audacious OSD - 설정"
+msgstr "오데이셔스 OSD - 설정"
 
 #: src/aosd/aosd_ui.c:1016
 msgid "Test"
@@ -850,47 +945,47 @@
 msgid "Misc"
 msgstr "기타"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "ASXv1/ASXv2 재생 목록"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
-msgstr "Audacious 재생 목록(audpl)"
+msgstr "오데이셔스 재생 목록(audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "색"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "흐림처리 스코프"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Bauer Stereophonic-to-Binaural 기본 설정"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "피드 수준:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "주파수 잘라내기:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "프리셋:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "스펙트럼 분석기"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -901,232 +996,245 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"\n"
+"libcdio 개발자 <http://www.gnu.org/software/libcdio/>과\n"
+"libcddb 개발자 <http://libcddb.sourceforge.net/> 여러분께 감사드립니다.\n"
+"\n"
+"또한 저를 지도해준 Tony Vroon 에게 감사드립니다.\n"
+"\n"
+"이 프로젝트는 GSoC 2007에서 만들었습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "장치"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "읽기 속도:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "장치 대체:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "메타데이터"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "CD-Text 사용하기"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "CDDB 사용하기"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP 대신 HTTP 사용하기"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "서버:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "경로:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "포트:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "오디오 CD 플러그인"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
-msgstr ""
+msgstr "cdio 하위 시스템을 초기화하는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
-msgstr ""
+msgstr "잘못된 %s URI 입니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
-msgstr ""
+msgstr "%d 트랙이 없습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "%d 트랙은 데이터 트랙입니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
-msgstr ""
+msgstr "오디오 출력을 여는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "오디오 CD 읽는중 오류가 발생했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "오디오 CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr ""
+msgstr "%s CD 장치를 여는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
-msgstr ""
+msgstr "오디오를 재생할 수 있는 CD 드라이브가 없습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "열려 있는 CD 드라이브 초기화를 끝내는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "첫번째/마지막 트랙 번호를 검색하는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "%d번 트랙에 대한 시작/끝 LSN을 읽을 수 없습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
-msgstr ""
+msgstr "cddb 연결을 만드는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "CDDB 서버에 요청하는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "CDDB 서버에 요청하는데 실패했습니다: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
-msgstr ""
+msgstr "cddb 정보를 읽는데 실패했습니다: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "드라이브가 비어 있습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "지원하지 않는 디스크 형식입니다."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "CD 재생"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "CD 추가"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "오디오 CD 메뉴 항목"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "압축"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "중앙 음량:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "동적 범위:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"오데이셔스용 동적 범위 압축 플러그인\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "동적 범위 압축"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "게임 콘솔 음악 디코더"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "일반"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "재생"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "저음:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "초"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "고음:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "기본 곡 길이:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "리샘플링"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "오디오 리샘플링 활성화"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "리샘플링 주파수:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "SPC 태그의 길이 무시"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "리버브 증가"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "초 단위로 표현하는 곡의 기본 길이는 길이 정보를 제공하지 않는 곡(반복 트랙)에 사용합니다."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"초 단위로 표현하는 곡의 기본 길이는 길이 정보를 제공하지 않는 곡(반복 트랙)"
+"에 사용합니다."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1135,87 +1243,105 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+" Game_Music_Emu 0.5.2 기반 콘솔 음악 디코더 플러그인\n"
+"지원 형식: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"오데이셔스 플러그인 작성:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "곡이 다른 채널 수를 가지고 있어 크로스페이딩에 실패했습니다. 곡이 동일한 채널 수를 가지도록 변환하기 위해 채널 믹서를 사용할 수 있습니다."
+msgstr ""
+"곡이 다른 채널 수를 가지고 있어 크로스페이딩에 실패했습니다. 채널 믹서를 사용"
+"하여 동일한 채널 수를 가지도록 곡을 변환할 수 있습니다."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "곡이 다른 샘플주파수를 가지고 있어 크로스페이딩에 실패했습니다. 곡이 동일한 샘플주파수를 가지도록 변환하기 위해 샘플 주파수 변환기를 사용할 수 있습니다."
+msgstr ""
+"곡이 다른 샘플 주파수를 가지고 있어 크로스페이딩에 실패했습니다. 샘플 주파수 "
+"변환기를 사용하여 동일한 샘플 주파수를 가지도록 곡을 변환 할 수 있습니다."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"오데이셔스용 교차 페이드 플러그인\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "크로스페이드"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "오버랩:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "크로스페이드"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "크리스털라이저"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "강도:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "크리스털라이저"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "큐 시트 플러그인"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "울림"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "지연:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "반향:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "음량:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
+"에코 플러그인\n"
+"By Johan Levin, 1999\n"
+"\n"
+"Surround echo by Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "울림"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1224,8 +1350,14 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
+"FFmpeg 멀티미디어 프레임워크를 사용한\n"
+"오데이셔스용 다중 형식 오디오 디코딩 플러그인\n"
+"\n"
+"오다셔서 플러그인 작성:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg 플러그인"
 
@@ -1294,6 +1426,17 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 msgstr ""
+"이 프로그램은 자유 소프트웨어입니다; 자유 소프트웨어 재단이 공표한\n"
+"GNU 일반 공중 사용 허가서 2판(또는 여러분의 취향에 따라) 이상의 조항\n"
+"에 따라 재배포 또는 수정할 수 있습니다.\n"
+"\n"
+"이 프로그램이 유용하게 사용되길 바라지만 그 어떤 보증도 없으며 심지어는\n"
+"상업적 보증이나 일부 목적의 적합성에 대한 암시적 보증도 하지 않습니다.\n"
+"자세한 내용은 GNU 일반 공중 사용허가서를 보십시오.\n"
+"\n"
+"이 프로그램과 함께 GNU 일반 공중 사용 허가서 사본을 받아야 합니다.\n"
+"만약 사본이 없다면 자유 소프트웨어 재단에 요청하십시오.\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1307,11 +1450,13 @@
 msgid "Joint Stereo"
 msgstr "통합 스테레오"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "스테레오"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "모도"
 
@@ -1325,7 +1470,7 @@
 
 #: src/filewriter/mp3.c:737
 msgid "Output Samplerate:"
-msgstr "출력 샘플주파수:"
+msgstr "출력 샘플 주파수:"
 
 #: src/filewriter/mp3.c:765
 msgid "(Hz)"
@@ -1359,7 +1504,7 @@
 msgid "Error protection"
 msgstr "오류 방지"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "음질"
 
@@ -1439,541 +1584,623 @@
 msgid "Tags"
 msgstr "태그"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis 인코더 설정"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "음질 수준(0-10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
-msgstr ""
+msgstr "무손실"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
+"초기 코드 작성:\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "FLAC 디코더"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
+"오데이셔스용 GIO 플러그인\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "GIO 플러그인"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Audacious용 OpenGL 스펙트럼 분석기⏎\n"
+"Copyright 2013 Christophe Budé and John Lindgren⏎\n"
+"⏎\n"
+"XMMS 플러그인을 기반으로 함:⏎\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies⏎\n"
+"⏎\n"
+"라이선스: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL 스펙트럼 분석기"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
+"그놈 바로 가기 플러그인\n"
+"그놈 바로 가기를 통해 재생기를 제어할 수 있게 해줍니다.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "그놈 바로 가기"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "항목 번호"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "제목"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "음악가"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "연도"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
-msgstr "음반"
+msgstr "앨범"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "트랙"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "장르"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "대기 목록 위치"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "길이"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "파일 경로"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "사용자 정의 제목"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "비트 전송율"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "컬럼 선택"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "사용 가능 여부:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "선택한 요소:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "왼편에 붙이기"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "오른편에 붙이기"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "상단에 붙이기"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "하단에 붙이기"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "떼어내기"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "비활성화"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "파일 열기(_O) ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "URL 열기(_U) ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "파일 추가(_A) ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "URL 추가(_R) ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "라이브러리 검색(_S)"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "정보(_B) ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "기본 설정(_P) ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
-msgstr "나가기(_Q)"
+msgstr "끝내기(_Q)"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "재생(_P)"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "일시정지(_E)"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "정지(_S)"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "이전(_V)"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "다음(_N)"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "반복(_R)"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "뒤섞기(_H)"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "재생 목록 미리 알리지 않음(_O)"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "이 곡 이후 정지(_A)"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "이 노래 다음 멈춤(_F)"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "곡 정보(_I) ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "시간 건너뛰기(_T) ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "곡 건너뛰기(_J) ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "트랙 번호순(_N)"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "반복 시점 A 설정(_A)"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "반복 시점 B 설정(_B)"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "반복 시점 지우기(_C)"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "제목순(_T)"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "파일 이름순(_F)"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "파일 경로 순(_P)"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "트랙 번호순(_N)"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "음악가 이름순(_A)"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "음반 제목순(_L)"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "앨범 이름순(_B)"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "출시 일자순(_D)"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "길이순(_L)"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "파일 경로순(_F)"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "사용자 정의 제목순(_C)"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "순서 뒤집기(_E)"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "임의 순서(_R)"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "이 재생 목록 재생(_P)"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "새로 고침(_R)"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "사용할 수 없는 파일 제거(_U)"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "정렬(_S)"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "선택한 항목 정렬"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "중복 제거(_D)"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "사용할 수 없는 파일 제거(_U)"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "새 파일(_N)"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "이름 바꾸기(_A)..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "닫기(_C)"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "가져오기(_I) ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "내보내기(_E) ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "재생 목록 관리자(_M) ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "대기 목록 관리자(_Q) ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "음량 크게(_U)"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "음량 작게(_D)"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "이퀄라이저(_E)"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "효과(_F)"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "인터페이스(_I)"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "시각화(_V)"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
-msgstr "메뉴 표시줄 보이기(_M)"
+msgstr "메뉴 표시줄 표시(_M)"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
-msgstr "정보 표시줄 보이기(_N)"
+msgstr "정보 표시줄 표시(_N)"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
-msgstr "정보 표시줄 시각화 보이기(_U)"
+msgstr "정보 표시줄 시각화 표시(_U)"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
-msgstr "상태 표시줄 보이기(_S)"
+msgstr "상태 표시줄 표시(_S)"
+
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "남은 시간 표시(_R)"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
-msgstr "닫기 단추 보이기(_B)"
+msgstr "닫기 단추 표시(_B)"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
-msgstr "컬럼 헤더 보이기(_H)"
+msgstr "컬럼 헤더 표시(_H)"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "컬럼 선택(_C) ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "곡 바뀔때 스크롤(_L)"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "파일(_F)"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "재생(_P)"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "재생 목록(_L)"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "서비스(_S)"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "출력(_O)"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "보기(_V)"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "대기 목록에 넣기/빼기(_Q)"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "잘라내기(_T)"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "복사(_C)"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "붙여넣기(_P)"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "모두 선택(_A)"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "이름 바꾸기(_R) ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "GTK 인터페이스"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
-msgstr "%s - Audacious"
+msgstr "%s - 오데이셔스"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "버퍼링 ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
-msgstr "Audacious"
+msgstr "오데이셔스"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "오류"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr[0] "%d개의 채널"
+msgstr[0] "채널 %d개"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr "이전 트랙"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "재생"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "일시 정지/재개"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "정지"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "다음 트랙"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
 msgstr "5초 빨리감기"
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
 msgstr "5초 되감기"
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
-msgstr "묵음"
+msgstr "음소거"
+
+#: src/hotkey/gui.c:78
+msgid "Volume up"
+msgstr "음량 증가"
+
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr "음량 감소"
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "음량 크게"
+msgid "Jump to file"
+msgstr "파일로 건너뛰기"
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "음량 작게"
+msgid "Toggle player window(s)"
+msgstr "재생 창 전환"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "파일 건너뛰기"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "화면에 표시 보이기"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "재생기 창 전환"
+msgid "Toggle repeat"
+msgstr "반복 전환"
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "화면에 표시 보이기"
+msgid "Toggle shuffle"
+msgstr "임의재생 전환"
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "반복 여부 전환"
+msgid "Toggle stop after current"
+msgstr "현재 곡 이후 멈춤여부 전환"
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "뒤섞기 여부 전환"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr "재생기 창 복원"
+msgid "Raise player window(s)"
+msgstr "재생 창 복귀"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(없음)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "수정자 없이 주 마우스 단추를 할당 하는것은 추천하지 않습니다.\n\n계속 진행하시겠습니까?"
+msgstr ""
+"수정자 없이 주 마우스 단추를 할당 하는것은 추천하지 않습니다.\n"
+"\n"
+"계속 진행하시겠습니까?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "마우스 단추 바인딩하기"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "전역 단축키 플러그인 설정"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "텍스트 필드에서 키 조합을 누르십시오.\n마우스 단추도 넣을 수 있습니다."
+msgstr ""
+"텍스트 필드에서 키 조합을 누르십시오.\n"
+"마우스 단추도 넣을 수 있습니다."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "단축키:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "동작:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "키 바인딩:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1987,103 +2214,128 @@
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
+"전역 단축키 플러그인\n"
+"전역 키 조합 또는 멀티미디어 키를 사용하여 플레이어를 제어합니다.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"다음 공헌자도 있습니다:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "전역 단축키"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
+"xmms-jack 기반. by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Ported to Audacious by Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "JACK 출력"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s 설정"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "LADSPA 호스트 설정"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "모듈 경로:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "여러 경로를 콜론으로 구분합니다.\n이 경로들은 LADSPA_PATH에서도 찾았습니다.\n새 경로를 추가한 다음 새 플러그인 검색을 위해 Enter 키를 누르세요."
+msgstr ""
+"여러 경로를 콜론으로 구분합니다.\n"
+"이 경로들을 LADSPA_PATH에서도 찾았습니다.\n"
+"새 플러그인을 검색하려면 새 경로를 추가하고 Enter 키를 누르십시오."
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "사용할 수 있는 플러그인:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "활성화"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "활성화한 플러그인:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "설정"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
+"오데이셔스용 LADSPA 호스트\n"
+"Copyright 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "LADSPA 호스트"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: LIRC 지원을 초기화 할 수 없습니다\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: LIRC 설정 파일을 읽을 수 없습니다\n%s: 적당한 설정 파일을 어떻게 만드는지\n%s: LIRC 문서를 읽어주시기 바랍니다\n"
+msgstr ""
+"%s: LIRC 설정 파일을 읽을 수 없습니다\n"
+"%s: 적당한 설정 파일을 어떻게 만드는지\n"
+"%s: LIRC 문서를 읽어주십시오\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: 다시 연결 시도 중...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: 알 수 없는 명령 \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: LIRC로부터 끊어졌습니다\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
-msgstr "%s: 매 %d 초 후 다시 연결을 시도할 것입니다...\n"
+msgstr "%s: 매 %d 초 후 다시 연결을 시도합니다...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2098,68 +2350,79 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
+"LIRC 원격 제어 데몬을 사용하여 오데이셔스를 제어하기 위한 간단한 플러그인\n"
+"\n"
+"오데이셔스에 적용함:Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"XMMS LIRC 플러그인 기반 작성:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"LIRC에 대한 자세한 내용은, http://lirc.org를 보십시오."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "연결"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "LIRC 서버에 다시 연결"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "다시 연결하기 전에 대기중:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "LIRC 플러그인"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "가사가 없습니다."
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "%s을(를) 가져올 수 없습니다"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "%s을(를) 해석할 수 없습니다"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "가사 검색중..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "곡 메타데이터가 빠졌습니다"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "lyrics.wikia.com에 연결 중..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki 플러그인"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "M3U 재생 목록"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact 생성기: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact 생성기: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2167,85 +2430,240 @@
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
+"tact 생성기 by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"사용하려면, 다음 URL을 추가하십시오: tact://beats*num/den\n"
+"사용 예) tact://77은 분당 77 비트\n"
+"또는 tact://60*3/4는 3/4 tact에서 분당 60 bpm"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Tact 생성기"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"오데이셔스용 채널 음량 조절기 플러그인\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "채널 믹서"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "출력 채널:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "채널 믹서"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "MMS 플러그인"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "레졸루션"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8비트"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16비트"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "채널"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "리샘플링"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "근접(가장 빠름)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "선형(빠름)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "스플라인(좋음)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "다중 페이스(최상)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "샘플 주파수"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "레벨:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "컷-오프:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "리버브"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "저음 증폭"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "서라운드"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "프리앰프"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "기타"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "오버샘플링"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "노이즈 감쇄"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Amiga MOD 재생"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "반복"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "반복 횟수:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "계속 반복하려면 반복 횟수를 -1로 설정하십시오."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (모듈 재생기)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "서라운드"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "MPG123 플러그인"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 서버"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS 플러그인"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "정지함"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
-msgstr "Audacious가 재생중이 아닙니다."
+msgstr "오데이셔스가 재생중이 아닙니다."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
+"Desktop Notifications Plugin for Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Audacious용 데스크톱 알림 플러그인\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"이 플러그인은 자유 소프트웨어입니다; 자유 소프트웨어 재단이 공표한 GNU 일반 "
+"공중 사용허가서 3판 (또는 여러분의 의사에 따라) 이상의 조항에 따라 재배포 또"
+"는 수정할 수 있습니다.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"이 프로그램이 유용하게 사용되길 바라지만 그 어떤 보증도 없으며 심지어는 상업"
+"적 보증이나 일부 목적의 적합성에 대한 암시적 보증도 하지 않습니다. 자세한 내"
+"용은 GNU 일반 공중 사용허가서를 보십시오.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
+"이 프로그램과 함께 GNU 일반 공중 사용 허가서 사본을 받아야 합니다. 만약 사본"
+"이 없다면 <http://www.gnu.org/licenses/> 링크를 참조하십시오."
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "재생 컨트롤 표시"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "항상 알림 표시"
+
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "데스크톱 알림"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "보이기"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "일시 정지"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "다음"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. 기본 장치"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "오디오 장치:"
 
@@ -2270,22 +2688,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
+"오데이셔스용 OSS4 출력 플러그인\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"#audacious 사람들, 특히 Tony Vroon, John Lindgren, 이전에 OSS 플러그인을 만"
+"든 저작자분께 감사드리고 싶습니다."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "OSS4 출력"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "PLS 재생 목록"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 디코더"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2304,160 +2728,232 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 msgstr ""
+"오데이셔스 펄스오디오 출력 플러그인\n"
+"\n"
+"이 프로그램은 자유 소프트웨어입니다; 자유 소프트웨어 재단이 공표한\n"
+"GNU 일반 공중 사용허가서 2판 (또는 여러분의 의사에 따라) 이상의\n"
+"조항에 따라 재배포 또는 수정할 수 있습니다.\n"
+"\n"
+"이 프로그램이 유용하게 사용되길 바라지만 그 어떤 보증도 없으며 심지어는\n"
+"상업적 보증이나 일부 목적의 적합성에 대한 암시적 보증도 하지 않습니다.\n"
+"자세한 내용은 GNU 일반 공중 사용허가서를 보십시오.\n"
+"\n"
+"이 프로그램과 함께 GNU 일반 공중 사용 허가서 사본을 받아야 합니다.\n"
+"만약 사본이 없다면 자유 소프트웨어 재단에 요청하십시오.\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "PulseAudio 출력"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"오데이셔스용 샘플 주파수 변환 플러그인\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "샘플 건너뛰기/반복하기"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "선형 보간"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "빠른 sinc함수 보간"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "중간 sinc함수 보간"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "최상의 sinc함수 보간"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "변환"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "방식:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "주파수:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "주파수 매핑"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "주파수 매핑 사용하기"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
-msgstr "샘플주파수 변환기"
+msgstr "샘플 주파수 변환기"
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "네. %s 사용자의 스크로블링을 진행합니다"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "권한이 거부되었습니다"
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"재생 항목을 오데이셔스에서 스크롤 하도록 하려면 다음 연결을 방문하십시오:"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "암호 바꾸기"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr "이 창을 연 상태로 다시 '권한 확인'을 누르십시오.\n"
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "서비스"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"걱정하지 마십시오. 스크로블을 컴퓨터에 저장했습니다.\n"
+"오데이셔스가 동작할 수 있는대로 바로 제출합니다."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "네트워크에 문제가 있습니다."
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "Last.fm에 연결하는데 문제가 있습니다. 다시 시도해 주십시오."
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "확인중..."
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "권한 확인(_H)"
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "사용자 이름:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "권한 취소(_R)"
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "암호:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr "오데이셔스가 Last.fm 계정에 트랙을 추출할 수 있게 해야 합니다.\n"
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "스크로블러 URL:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"스크로블러 플러그인을 시작할 수 없습니다.\n"
+"설치에 문제가 있는 것 같습니다."
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"이 프로젝트를 시작하는데 도움을 준 John Lindgren에게 감사드립니다.\n"
+"\n"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "스크로블러"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "스크로블러 2.0"
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious가 이제부터 Last.fm 스크로블러 개선 버전을 사용중입니다.⏎\n"
+"스크로블러 플러그인의 기본 설정을 확인하십시오."
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"오데이셔스용 SDL 출력 플러그인\n"
+"Copyright 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "SDL 출력"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "라이브러리"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "알 수 없는 음악가"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
-msgstr "알 수 없는 음반"
+msgstr "알 수 없는 앨범"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%3$s의\n%2$s에 있는 %1$s"
+msgstr ""
+"%3$s의\n"
+"%2$s에 있는 %1$s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
-msgstr[0] "%d개의 음반"
+msgstr[0] "앨범 %d개"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2465,9 +2961,11 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d개의 곡"
+msgstr[0] ""
+"%s\n"
+" %s, 곡 %d개"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2475,75 +2973,79 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%1$s\n%3$s의 곡 %2$d개\t"
+msgstr[0] ""
+"%1$s\n"
+"%3$s의 곡 %2$d개\t"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "재생 목록 만들기(_C)"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "재생 목록 추가하기(_A)"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "라이브러리 검색"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "음악 라이브러리를 Audacious로 가져오려면 폴더를 선택하고 \"새로고침\"아이콘을 누르십시오."
+msgstr ""
+"음악 라이브러리를 오데이셔스로 가져오려면 폴더를 선택하고 \"새로고침\"아이콘"
+"을 누르십시오."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "기다려 주십시오 ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "폴더 선택"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "검색 도구"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Winamp 클래식 인터페이스"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "재생기(_P):"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "주 재생기 창 글꼴 선택:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "재생 목록(_P):"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "재생 목록 글꼴 선택:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "글꼴(_F)"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "비트맵 글꼴 사용(아스키 전용 지원)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "양방향으로 곡 제목 스크롤"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "스킨(_S)"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "인터페이스 기본 설정"
 
@@ -2593,13 +3095,13 @@
 
 #: src/skins/ui_equalizer.c:375
 msgid "Audacious Equalizer"
-msgstr "Audacious 이퀄라이저"
+msgstr "오데이셔스 이퀄라이저"
 
 #: src/skins/ui_equalizer.c:890
 msgid "Presets"
 msgstr "프리셋"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "프리셋 불러오기"
 
@@ -2612,7 +3114,7 @@
 msgid "Load equalizer preset"
 msgstr "이퀄라이저 프리셋 불러오기"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "프리셋 저장하기"
 
@@ -2624,7 +3126,7 @@
 msgid "Save equalizer preset"
 msgstr "이퀄라이저 프리셋 저장하기"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "프리셋 삭제하기"
 
@@ -2632,739 +3134,752 @@
 msgid "Delete auto-preset"
 msgstr "자동 프리셋 삭제하기"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "%d 탐색:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "음량: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "균형: %d%% 왼쪽"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "균형: 가운데"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "균형: %d%% 오른쪽"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "옵션 메뉴"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "'항상 위' 비활성화"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "'항상 위' 활성화"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "파일 정보 상자"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "시각화 메뉴"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "싱글 모드입니다."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "재생 목록 모드입니다."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "곡 재생 후 멈추는 중입니다."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "곡 재생 후 멈추는 중이 아닙니다."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "A 반복 시점을 설정했습니다."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "B 반복 시점을 설정했습니다."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "반복 시점을 지웠습니다."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "자동 스크롤 곡 이름"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "현재 곡 다음 정지"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "피크"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "반복"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "뒤섞기"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "이전 재생목록이 없습니다"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
-msgstr "재생기 보이기"
+msgstr "재생기 표시"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
-msgstr "재생 목록 편집기 보이기"
+msgstr "재생 목록 편집기 표시"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
-msgstr "이퀄라이저 보이기"
+msgstr "이퀄라이저 표시"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "항상 위"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "모든 작업 공간에 놓기"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "롤업 재생기"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "롤업 재생 목록 편집기"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "롤업 이퀄라이저"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "분석기"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "표시기"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "음성 출력"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "끄기"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "보통"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "불"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "수직선"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "선"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "막대"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "점 표시기"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "선 표시기"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "면 표시기"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "얼음"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "부드럽게"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "가장 느리게"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "느리게"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "중간"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "빠르게"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "가장 빠르게"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "걸린 시간"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "남은 시간"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "일시 정지"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "이전"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "다음"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "시각화"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "시각화 모드"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "분석기 모드"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "표시기 모드"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "음성출력 모드"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "WindowShade VU 모드"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "분석기 감소"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "피크 감소"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "재생 목록"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "재생 목록 재생하기"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "새 재생 목록"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "다음 재생 목록 선택"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "이전 재생 목록 선택"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "재생 목록 삭제"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "재생 목록 가져오기"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "선택한 재생 목록에 재생 목록 파일을 불러옵니다."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "재생 목록 내보내기"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "선택한 재생 목록을 저장합니다."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "목록 새로 고침"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "재생 목록 항목과 관련된 메타데이터를 새로 고칩니다."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "재생 목록 관리자"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "대기 목록 관리자"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "보기"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "인터페이스 기본 설정 ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "인터넷 주소 추가..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "원격 트랙을 재생 목록에 추가합니다."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "파일 추가..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "파일을 재생 목록에 추가합니다."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "검색하고 선택"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "재생 목록을 검색하고 지정한 검색어를 기반으로 재생 목록 항목을 선택합니다."
+msgstr ""
+"재생 목록을 검색하고 지정한 검색어를 기반으로 재생 목록 항목을 선택합니다."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "선택 반전"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "선택한, 선택하지 않은 항목을 반전합니다."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "모두 선택"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "모든 재생 목록의 항목을 선택합니다."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "선택하지 않음"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "모든 재생 목록의 항목의 선택을 취소합니다."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "모두 제거"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "모든 재생 목록의 항목을 제거합니다."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "대기 목록 지우기"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "이 재생 목록과 관련된 대기 목록을 지웁니다."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "사용할 수 없는 파일 제거"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "재생 목록에서 사용할 수 없는 파일을 제거합니다."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "복제본 제거"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "제목별"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "제목에 따라 재생 목록에서 복제한 항목을 제거합니다."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "파일 이름별"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "파일 이름에 따라 재생 목록에서 복제한 항목을 제거합니다."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "경로 + 파일 이름별"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "전체 경로에 따라 재생 목록에서 복제한 항목을 제거합니다."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "선택하지 않은 항목 제거"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "재생 목록에서 선택하지 않은 항목을 제거합니다."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "선택한 항목 제거"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "재생 목록에서 선택한 항목을 제거합니다."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "목록 순서 뒤섞기"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "재생 목록을 뒤섞습니다."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "목록 순서 뒤집기"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "재생 목록의 순서를 뒤집습니다."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "목록 정렬"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "제목순으로 목록을 정렬합니다."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
-msgstr "음반 제목순"
+msgstr "앨범 제목순"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
-msgstr "음반 제목 순으로 목록을 정렬합니다."
+msgstr "앨범 제목 순으로 목록을 정렬합니다."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "음악가순"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "음악가 이름 순으로 목록을 정렬합니다."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "파일 이름순으로 목록을 정렬합니다."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "전체 파일 경로이름 순으로 목록을 정렬합니다."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "날짜순"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "수정 시각순으로 목록을 정렬합니다."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "트랙 번호순"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "트랙 번호순으로 목록을 정렬합니다."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "선택한 항목 정렬"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "파일"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "플러그인 서비스"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "트랙 세부정보 보기"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "트랙 세부정보 보기"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
-msgstr "Audacious 정보"
+msgstr "오데이셔스 정보"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "파일 재생하기"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "파일 불러오고 재생하기"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "위치 재생하기"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "선택한 위치에서 미디어를 재생하기"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "플러그인 서비스"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "기본 설정"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "기본 설정 창 열기"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
-msgstr "Audacious 나가기"
+msgstr "오데이셔스 나가기"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "A-B 설정"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "A-B 지우기"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "파일 건너뛰기"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "시간 건너뛰기"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "대기 목록 전환"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "재생 목록의 대기 목록에 있는 항목을 활성화/비활성화 합니다."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "복사"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "잘라내기"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "불러오기"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "가져오기"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "저장"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "삭제"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "프리셋"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "오토로드 프리셋"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "오토로드 프리셋 불러오기"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "이퀄라이저에 기본 프리셋 불러오기"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "영"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "이퀄라이저 프리셋 레벨을 영값으로 설정"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "파일에서"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "파일에서 프리셋 불러오기"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "WinAMP EQF 파일에서"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "WinAMP EQF 파일에서 프리셋 불러오기"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP 프리셋"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "WinAMP 프리셋 가져오기"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "오토로드 프리셋 저장하기"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "기본 프리셋 저장하기"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "파일로"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "프리셋을 파일로 저장하기"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "WinAMP EQF 파일로"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "프리셋을 WInAMP EQF 파일로 저장하기"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "오토로드 프리셋 삭제하기"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "활성 재생 목록에서 항목 검색"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "하나 이상의 칸을 채워 재생 목록의 항목을 검색합니다. 대소문자에 관계 없이 정규표현식 문법을 사용합니다. 정규표현식이 어떻게 동작하는지 모르신다면 검색할 문장 일부를 넣으시면 됩니다."
+msgstr ""
+"하나 이상의 칸을 채워 재생 목록의 항목을 검색합니다. 대소문자에 관계 없이 정"
+"규표현식 문법을 사용합니다. 정규표현식이 어떻게 동작하는지 모르신다면 검색할 "
+"문장 일부를 넣으시면 됩니다."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "제목:"
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
-msgstr "음반:"
+msgstr "앨범:"
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "음악가:"
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "파일 이름:"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "검색하기 전에 이전 선택항목 지우기"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "일치하는 항목에 대해 자동으로 대기 목록을 전환하기"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "일치하는 항목에 대해 새 재생 목록 만들기"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
-msgstr "Audacious 재생 목록 편집기"
+msgstr "오데이셔스 재생 목록 편집기"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%1$s (%3$d중 %2$d)"
@@ -3382,81 +3897,120 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "(%s) 디렉터리를 만들 수 없습니다: %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"xmms_sndfile 플러그인 기반.\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr ""
+"이 프로그램은 자유 소프트웨어입니다; 자유 소프트웨어 재단이 공표한 GNU 일반 "
+"공중 사용허가서 2판 (또는 여러분의 의사에 따라) 이상의 조항에 따라 재배포 또"
+"는 수정할 수 있습니다.\n"
+"\n"
+"이 프로그램이 유용하게 사용되길 바라지만 그 어떤 보증도 없으며 심지어는 상업"
+"적 보증이나 일부 목적의 적합성에 대한 암시적 보증도 하지 않습니다. 자세한 내"
+"용은 GNU 일반 공중 사용허가서를 보십시오.\n"
+"\n"
+"이 프로그램과 함께 GNU 일반 공중 사용 허가서 사본을 받아야 합니다. 만약 사본"
+"이 없다면 자유 소프트웨어 재단에 요청하십시오. 51 Franklin Street, Fifth "
+"Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Sndfile 플러그인"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Sndio 출력 플러그인 정보"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Sndio 출력 플러그인\n\nThomas Pfaff <tpfaff@tp76.info>가 작성하였습니다\n"
+msgstr ""
+"Sndio 출력 플러그인\n"
+"\n"
+"Thomas Pfaff <tpfaff@tp76.info>가 작성하였습니다\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "지원하지 않는 형식"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "오디오 장치가 지원하지 않는 형식을 요청했습니다.\n\nsndiod(1) 서버를 실행하고 다시 시도해주시기 바랍니다."
+msgstr ""
+"오디오 장치가 지원하지 않는 형식을 요청했습니다.\n"
+"\n"
+"sndiod(1) 서버를 실행하고 다시 시도하십시오."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "sndio 장치"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(빈 값은 기본 값을 의미)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "확인"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "취소"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "곡 바꾸기"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
-msgstr "Audacious가 새 곡 재생을 시작할 때 실행할 명령입니다."
+msgstr "오데이셔스가 새 곡 재생을 시작할 때 실행할 명령입니다."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "명령:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "곡의 끝 부분에 다다랐을때 실행할 명령입니다."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "재생 목록의 끝에 도달했을 때 실행할 명령입니다."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr "곡의 제목(예: 네트워크 스트림 제목)을 바꿀 때 실행할 명령입니다."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3473,35 +4027,90 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "명령을 호출하기 전에 대체할 다음의 형식 문자열을\n사용할 수 있습니다\n(재생 목록 마지막 시점의 명령으로 다 쓸모 있는것은 아닙니다):\n\n%F: 주파수(Hz 단위)\n%c: 채널 번호\n%f: 파일 이름(전체 경로)\n%l: 곡 길이(밀리초 단위)\n%n or %s: 곡 이름\n%r: 비트전송율(bps 단위)\n%t: 재생 목록 위치(%02d)\n%p: 현재 재생중 여부(1 or 0)\n%a: 음악가\n%b: 음반\n%T: 트랙 제목"
+msgstr ""
+"명령을 호출하기 전에 대체할 다음의 형식 문자열을\n"
+"사용할 수 있습니다\n"
+"(재생 목록 마지막 시점의 명령으로 다 쓸모 있는것은 아닙니다):\n"
+"\n"
+"%F: 주파수(Hz 단위)\n"
+"%c: 채널 번호\n"
+"%f: 파일 이름(전체 경로)\n"
+"%l: 곡 길이(밀리초 단위)\n"
+"%n or %s: 곡 이름\n"
+"%r: 비트전송율(bps 단위)\n"
+"%t: 재생 목록 위치(%02d)\n"
+"%p: 현재 재생중 여부(1 or 0)\n"
+"%a: 음악가\n"
+"%b: 앨범\n"
+"%T: 트랙 제목"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "쉘에 전달하는 인자는 따옴표로 감싸야 합니다. 그렇게 하지 않으면 보안 문제가 생깁니다."
+msgstr ""
+"쉘에 전달하는 인자는 따옴표로 감싸야 합니다. 그렇게 하지 "
+"않으면 보안 문제가 생깁니다."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "명령"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"SoX Resampler Plugin for Audacious⏎\n"
+"Copyright 2013 Michał Lipski⏎\n"
+"⏎\n"
+"샘플 주파수 변환 플러그인을 기반으로 하였습니다:\n"
+"Copyright 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "빠름"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "낮음"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "높음"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "매우 높음"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "음질:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "SoX 리샘플러"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "속도와 피치"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "속도:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "피치:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "속도와 피치"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3511,64 +4120,74 @@
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"상태 아이콘 플러그인\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"이 플러그인은 창 관리자의 시스템 표시줄 영역에\n"
+"뜨는 상태 아이콘을 제공합니다."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "마우스 스크롤 동작"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "음량 조절하기"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "재생중인 곡 바꾸기"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "기타 설정"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "풍선 도움말 창 비활성화"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "시스템 트레이로 전환"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "재생목록을 위로 스크롤 할 때 미리 알림"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "상태 아이콘"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
+"추가 스테레오 플러그인\n"
+"\n"
+"By Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "엑스트라 스테레오"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "엑스트라 스테레오"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "톤 생성기:"
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3576,28 +4195,38 @@
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
+"사인 톤 생성기by Håvard Kvålen <havardk@xmms.org>\n"
+"Daniel J. Peng <danielpeng@bigfoot.com>이 수정함\n"
+"\n"
+"사용하려면 다음 URL을 추가하십시오: tone://frequency1;frequency2;"
+"frequency3;...\n"
+"사용 예) tone://2000;2005는 2000 Hz 톤과 a 2005 Hz 톤으로 재생합니다."
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "톤 생성기"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
+"오데이셔스용 파일 입출력 플러그인\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"이 플러그인은 반드시 필요합니다. 비활성화 하지 마십시오."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "파일 입출력 플러그인"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "육성 제거"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3617,45 +4246,74 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"오데이셔스 Ogg Vorbis 디코더\n"
+"\n"
+"Xiph.org 재단의 Ogg Vorbis 플러그인을 기반으로 합니다:\n"
+"http://www.xiph.org/\n"
+"\n"
+"초기 코드 작성자:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"공헌자:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis "
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
+"Vortex 파일 형식 재생기 by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Roman Sherbakov <v_soft@microfor.ru>의 in_vtx.dll을 기반으로 함\n"
+"Pavel Vymetalek <pvymetalek@seznam.cz>이 오데이셔스 플러그인 제작"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "VTX 디코더"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
-msgstr ""
+msgstr "손실(혼성)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
-msgstr ""
+msgstr "손실"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"플러그인 코드 일부는 Miles Egan이 작성했습니다."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "WavPack 디코더"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "2SF 디코더"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML 공유 가능 재생 목록(XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - 파일 선택"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "선택 항목 정렬(_E)"

audacious-plugins-3.3.4.tar.bz2/po/ky.po -> audacious-plugins-3.4.2.tar.bz2/po/ky.po Changed

@@ -1,591 +1,585 @@
 # Kirgyz translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# <translatorky@lavabit.com>, 2012.
+# chingis <translatorky@lavabit.com>, 2013
+# chingis <translatorky@lavabit.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-16 23:46+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-04 12:38+0000\n"
 "Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: Kirgyz\n"
+"Language-Team: Kirgyz (http://www.transifex.com/projects/p/audacious/"
+"language/ky/)\n"
+"Language: ky\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ky\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "моно"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "стерео"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "көлөмдүү тыбыш"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "AAC декодери"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr ""
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib ойноткучу)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Ойготкуч саат"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
 msgstr ""
 
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Ойготкуч сааттын ырастоолору"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Убакыт"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "саат"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "с"
-
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "мүнөт"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
 msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
 msgstr ""
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
 msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Жарыяланбас"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Эске салуу"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Күн"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Дүйшөмбү"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Шейшемби"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Шаршемби"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Бейшемби"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Жума"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Ишемби"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Жекшемби"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Дүйшөмбү"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Ойготкуч сааттын ырастоолору"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Убакыт"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr ""
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "с"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr ""
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "саат"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "мүнөт"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr ""
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Күн"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Жарыяланбас"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Күндөр"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Басаңчалоо"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "секунда"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Катуулук"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Кезектеги"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr ""
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Аяктоо"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Кезектеги"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Кошумча команда"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "күйгүзүү"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr ""
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Ойнотуу тизмесин тандаңыз"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Эске салуу"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Эске салууну колдонуу"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Опциялар"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr ""
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nУбакыт\n Alarm at: \n The time for the alarm to come on.\n\n Quiet After: \n Stop alarm after this amount of time.\n (if the wakeup dialog is not closed)\n\n\nКүндөр\n Күн:\n Select the days for the alarm to activate.\n\n Убакыт:\n Choose the time for the alarm on each day,\n or select the toggle button to use the default\n time.\n\n\nКатуулук\n Fading: \n Fade the volume up to the chosen volume \n for this amount of time.\n\n Start at: \n Start fading from this volume.\n\n Final: \n The volume to stop fading at. If the fading\n time is 0 then set volume to this and start\n playing.\n\n\nОпциялар:\n Additional Command:\n Run this command at the alarm time.\n\n Ойнотуу тизмеси: \n Load this playlist for playing songs from.\n If no playlist is given, the songs which are\n currently in the list will be used.\n The URL of an mp3/ogg stream can also be\n entered here.\n\n Reminder:\n Display a reminder when the alarm goes off,\n type the reminder in the box and turn on the\n toggle button if you want it to be shown.\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Жардам"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Айнуу"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr ""
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Ыракмат"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Альбом тышы"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Жарыяланбас PCM орнотмосу"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Жарыяланбас микшер орнотмосу"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
-msgstr "ALSA чыгыш плагин параметрлери"
+msgstr "ALSA чыгыш плагин ырастоолору"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "PCM орнотмосу:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Микшер орнотмосу:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Микшер элементи:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "ALSA чыгышы"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
 msgstr ""
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr ""
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr ""
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr ""
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Порт"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Клиент аты"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Порт аты"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "ALSA чыгыш порттору"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Үнкарта: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Микшер параметрлери"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Ойнотуу параметрлери"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Транспонировка:"
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Кошумча параметрлер"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
 msgstr ""
 
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr ""
-
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "SoundFont параметрлери"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Файл аты"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Өлчөм (байт)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Синтезатор параметрлери"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "күчөө"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "чоңдук:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "полифония"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "реверберация"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "ооба"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "жок"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "хор"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "жыштык"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "башка"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Гц "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Аты:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
-msgstr ""
+msgstr " MIDI маалыматы "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Узундук (мс):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "өзгөрмө"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
-msgstr ""
+msgstr "Time Div:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
-msgstr ""
+msgstr " MIDI комментарийлер жана сөздөрү "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (туура эмес UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "AMIDI-Plug жөнүндө"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -610,7 +604,7 @@
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
-msgstr ""
+msgstr "Audacious OSD "
 
 #: src/aosd/aosd.c:37
 msgid "AOSD (On-Screen Display)"
@@ -642,7 +636,7 @@
 
 #: src/aosd/aosd_trigger.c:79
 msgid "Title Change"
-msgstr ""
+msgstr "Атын өзгөртүү"
 
 #: src/aosd/aosd_trigger.c:80
 msgid ""
@@ -781,7 +775,8 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
 msgstr ""
 
 #: src/aosd/aosd_ui.c:799
@@ -811,7 +806,7 @@
 #: src/aosd/aosd_ui.c:914
 #, c-format
 msgid "Audacious OSD"
-msgstr ""
+msgstr "Audacious OSD"
 
 #: src/aosd/aosd_ui.c:995
 msgid "Audacious OSD - configuration"
@@ -845,47 +840,47 @@
 msgid "Misc"
 msgstr ""
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "ASXv1/ASXv2 ойнотуу тизмелери"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious ойнотуу тизмелери (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Түс"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Күңүрт диапазон"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr ""
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr ""
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Пресеттер:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Спектр талдагычы"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -897,231 +892,232 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Орнотмо"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Окуу ылдамдыгы:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Метамаалымат"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "CD-Text колдонуу"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "CDDB колдонуу"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Жол:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Аудио CD плагини"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Аудио чыгышын ачуу оңунан чыккан жок."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Аудио CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "%s CD орнотмосун ачуу оңунан чыккан жок."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "CD ойнотуу"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "CD кошуу"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr ""
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Кысылыш"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Борбор катуулугу:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Динамикалык диапазон:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr ""
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr ""
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Негизги"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Ойнотуу"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Бас:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "секунда"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr ""
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Жарыяланбас ыр узундугу:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr ""
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr ""
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr ""
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Гц"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr ""
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr ""
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
 msgstr ""
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1131,74 +1127,76 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Интенсивдүүлүк:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
-msgstr ""
+msgstr "Кристализатор"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Жаңырык"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Кечигүү:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "мс"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Кербайланыш:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Катуулук:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
@@ -1206,11 +1204,11 @@
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Эхо"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1220,7 +1218,7 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg плагини"
 
@@ -1296,19 +1294,21 @@
 
 #: src/filewriter/mp3.c:37 src/filewriter/mp3.c:748
 msgid "Auto"
-msgstr ""
+msgstr "Автоматтуу"
 
 #: src/filewriter/mp3.c:37
 msgid "Joint Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
-msgstr ""
+msgstr "Стерео"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
-msgstr ""
+msgstr "Моно"
 
 #: src/filewriter/mp3.c:688
 msgid "MP3 Configuration"
@@ -1316,15 +1316,15 @@
 
 #: src/filewriter/mp3.c:712
 msgid "Algorithm Quality:"
-msgstr ""
+msgstr "Алгоритм сапаты:"
 
 #: src/filewriter/mp3.c:737
 msgid "Output Samplerate:"
-msgstr ""
+msgstr "Чыгыш жыштыгы:"
 
 #: src/filewriter/mp3.c:765
 msgid "(Hz)"
-msgstr ""
+msgstr "(Гц)"
 
 #: src/filewriter/mp3.c:772
 msgid "Bitrate / Compression ratio:"
@@ -1340,7 +1340,7 @@
 
 #: src/filewriter/mp3.c:853
 msgid "Audio Mode:"
-msgstr ""
+msgstr "Аудио режими:"
 
 #: src/filewriter/mp3.c:878
 msgid "Misc:"
@@ -1354,7 +1354,7 @@
 msgid "Error protection"
 msgstr "Каталардан коргоо"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Сапат"
 
@@ -1416,7 +1416,7 @@
 
 #: src/filewriter/mp3.c:1156
 msgid "ID3 params:"
-msgstr ""
+msgstr "ID3 параметрлери:"
 
 #: src/filewriter/mp3.c:1167
 msgid "Force addition of version 2 tag"
@@ -1434,19 +1434,19 @@
 msgid "Tags"
 msgstr "Тегдер"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
-msgstr ""
+msgstr "Vorbis кодегин ырастоо"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
-msgstr ""
+msgstr "Сапат деңгээли (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1454,21 +1454,37 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "FLAC декодери"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "GIO плагини"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
@@ -1476,499 +1492,542 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr ""
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Жазуунун номери"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Ат"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Аткаруучу"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Жыл"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Альбом"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Жол"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Кезектеги орду"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Узундук"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Файлга жол"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Файл аты"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Тапшырылма ат"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Битрейт"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Тилкелерди тандоо"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Кол жетердик:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr ""
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr ""
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr ""
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Өчүрүү"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "Файлдарды _ачуу ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "_URL ачуу ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "Файлдарды _кошуу ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "U_RL кошуу ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Издөө абазканасы"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "Программа _жөнүндө ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
-msgstr "_Параметрлер ..."
+msgstr "_Ырастоолор ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Чыгуу"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Ойнотуу"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "_Пауза"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Токтотуу"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
-msgstr "_Абалкы"
+msgstr "_Мурунку"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Кийинки"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "_Кайталоо"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "_Иретсиз"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "Тизмеден жылдырбоо"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Бул ырдан _кийин токтотуу"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
-msgstr "Ыр жөнүндө _маалымат ..."
+msgstr "Ыр _маалыматы ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "_Убакытка өтүү ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "_Ырга өтүү ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Трек _номери боюнча"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "_Ат боюнча"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Трек _номери боюнча"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "_Аткаруучу боюнча"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "А_льбом боюнча"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
-msgstr "Чыгаруу _датасы боюнча"
+msgstr "Чыгаруу _күнү боюнча"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "_Файлдын турган жери боюнча"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "_Тапшырылма ат боюнча"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "_Тескери тартип менен"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "_Аралаш тартип менен"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "Ушул ойнотуу тизмесин _ойнотуу"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
-msgstr "_Жаңыртуу"
-
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "_Кол жеткис файлдарды өчүрүү"
+msgstr "_Жаңылоо"
 
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Сорттоо"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Тандалгандарды сорттоо"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "_Кол жеткис файлдарды өчүрүү"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Жаңы"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Атын _өзгөртүү..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Жабуу"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Импорт ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Экспорт ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Ойнотуу тизмесинин _менеджери..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "_Кезек менеджери ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "Катуулукту _көбөйтүү"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "Катуулукту _азайтуу"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Эквалайзер"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "Э_ффекттер"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Интерфейс"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
-msgstr "_Визуализациялар"
+msgstr "_Визуалдаштыруулар"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "_Меню панелин көрсөтүү"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "М_аалымат панелин көрсөтүү"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "_Абал панелин көрсөтүү"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Жабуу _кнопкаларын көрсөтүү"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Тилке _баштарын көрсөтүү"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Тилкелерди _тандоо ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Ыр которулганда тегеретүү"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Ойнотуу"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Тизме"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Кызматтар"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Чыгыш"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "Кө_рүнүш"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Кезекке коюу/койбоо"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "Ке_сүү"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
-msgstr "_Копиялоо"
+msgstr "_Көчүрүү"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "К_оюу"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "_Баарын тандоо"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Атын өзгөртүү ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "GTK интерфейс"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Буферизация ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Ката"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d канал"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d кбит/с"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Абалкы жолчо"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr "Мурунку жолчо"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Ойнотуу"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
-msgstr ""
+msgstr "Пауза/Улантуу"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Токтотуу"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "Кийинки жолчо"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
 msgstr ""
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
 msgstr ""
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
 msgstr "Үнүн басуу"
 
+#: src/hotkey/gui.c:78
+msgid "Volume up"
+msgstr ""
+
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr ""
+
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Катуураак"
+msgid "Jump to file"
+msgstr "Файлга өтүү"
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Акырыныраак"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Файлга өтүү"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr ""
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+msgid "Toggle repeat"
 msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
+msgid "Toggle shuffle"
 msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
+msgid "Toggle stop after current"
 msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
+msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr ""
-
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(жок)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr ""
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr ""
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Ысык клавишалар:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Аракет:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Клавиштик айкалыш:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1983,11 +2042,11 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
@@ -1995,62 +2054,64 @@
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "JACK чыгышы"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
-msgstr ""
+msgstr "%s Ырастоолор"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr ""
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr ""
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
 msgstr ""
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Кол жетердик плагиндер:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Күйгүзүү"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Күйгүзүлгөн плагиндер:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Ырастоолор"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "LADSPA түйүнү"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr ""
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2058,27 +2119,27 @@
 "%s: how to create a proper config file\n"
 msgstr ""
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr ""
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr ""
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr ""
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr ""
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2094,67 +2155,67 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Туташтыруу"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr ""
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "LIRC плагини"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Ыр тексти кол жеткис"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Ыр текстин издөө ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Ыр метамаалыматтары жок болуу"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki плагини"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "M3U ойнотуу тизмелери"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2163,84 +2224,218 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Такт генератору"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Канал микшери"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Чыгыш каналдары:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Канал микшери"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "MMS плагини"
 
-#: src/modplug/plugin_main.c:13
-msgid "ModPlug (Module Player)"
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Чечим"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-бит"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-бит"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Каналдар"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 кГц"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 кГц"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 кГц"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 кГц"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Деңгээли:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
 msgstr ""
 
-#: src/mpg123/mpg123.c:197
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Кайталоо"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Кайталоо саны:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
+msgid "ModPlug (Module Player)"
+msgstr "ModPlug (модуль ойноткучу)"
+
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Көлөмдүү тыбыш"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "MPG123 плагини"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 сервери"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS плагини"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Токтолгон"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious ойнотуп жаткан жок."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr ""
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Пауза"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Кийинки"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Жарыяланбас орнотмосу"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Үн орнотмосу:"
 
@@ -2265,22 +2460,23 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "OSS4 чыгышы"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "PLS ойнотуу тизмелери"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 чыгышы"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2300,159 +2496,199 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "PulseAudio чыгышы"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr ""
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Сызыктык интерполяция"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Конверсия"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Ыкма:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Жыштык:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Жыштыктар картасы"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Жыштык картасын колдонуу"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 кГц:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 кГц:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 кГц:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 кГц:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 кГц:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 кГц:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 кГц:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr ""
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Сырсөздү өзгөртүү"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Кызматтар"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Тармак көйгөйү."
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Текшерилүүдө..."
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Колдонуучунун аты:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Сырсөз:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Скробблер"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "SDL чыгышы"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Абазкана"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Белгисиз аткаруучу"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Белгисиз альбом"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
 msgstr ""
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d альбом"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2462,7 +2698,7 @@
 " %s, %d songs"
 msgstr[0] ""
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2472,75 +2708,77 @@
 " %d songs by %s"
 msgstr[0] ""
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "Ойнотуу тизмесин _жаратуу"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "Ойнотуу тизмесине _кошуу"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Издөө абазканасы"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Audacious абазканасына музыкаңызды импорт кылыш үчүн, биринчи каталогду тандаңыз, анан \"жаңыртуу\" деген иконканы басыңыз."
+msgstr ""
+"Audacious абазканасына музыкаңызды импорт кылыш үчүн, биринчи каталогду "
+"тандаңыз, анан \"жаңыртуу\" деген иконканы басыңыз."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr ""
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Каталогду тандаңыз"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Издөө аспабы"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Winamp классикалык интерфейси"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Ойноткуч:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Ойноткучтун негизги терезесинин шрифтин тандаңыз:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Ойнотуу тизмеси:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Ойнотуу тизмесинин шрифтин тандоо:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Шрифттер"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Ыр атын эки багытты карата айлантуу"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Тери"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
-msgstr "Интерфейстин параметрлери"
+msgstr "Интерфейс ырастоолору"
 
 #: src/skins/ui_equalizer.c:328
 msgid "Preamp"
@@ -2592,9 +2830,9 @@
 
 #: src/skins/ui_equalizer.c:890
 msgid "Presets"
-msgstr "Пресеттер"
+msgstr ""
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Пресетти жүктөө"
 
@@ -2607,7 +2845,7 @@
 msgid "Load equalizer preset"
 msgstr "Эквалайзер пресетин жүктөө"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Пресетти сактоо"
 
@@ -2619,7 +2857,7 @@
 msgid "Save equalizer preset"
 msgstr "Эквалайзер пресетин сактоо"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Пресетти өчүрүү"
 
@@ -2627,831 +2865,856 @@
 msgid "Delete auto-preset"
 msgstr "Авто-пресетти өчүрүү"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "кбит/с"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "кГц"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Катуулук: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
-msgstr ""
+msgstr "Балансы: %d%% сол"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr ""
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
-msgstr ""
+msgstr "Балансы: %d%% оң"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Параметрлер менюсу"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "\"Дайыма үстүндө\"нү өчүрүү"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "\"Дайыма үстүндө\"нү күйгүзүү"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Файл жөнүндө маалымат"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
-msgstr "Визуализация менюсу"
+msgstr "Визуалдаштыруу менюсу"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Бириндеген режим."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Ойнотуу тизмеси режими."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Ырдан кийин токтотуу."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Ырдан кийин токтотпоо."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Ырдын атын автоайлантуу"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Кезектеги ырдан кийин токтотуу"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Чокулар"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Кайталоо"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Иретсиз"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr ""
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Ойноткучту көрсөтүү"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Ойнотуу тизмесинин редакторун көрсөтүү"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "_Эквалайзерди көрсөтүү"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Дайыма үстүндө"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Бүт иш столдоруна коюу"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Ойноткучту ороп коюу"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Ойнотуу тизмесинин редакторун ороп коюу"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Эквалайзерди ороп коюу"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Анализатор"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Осциллограмма"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Үн тагы"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Өч."
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Жөнөкөй"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "От"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Вертикалдык сызыктар"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Сызыктар"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Тилкелер"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Тактык осциллограмма"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Сызыктык осциллограмма"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Тутамдаш осциллограмма"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Муз"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Тегиз"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Жайыраак"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Жай"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Орточо"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Бат"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Батыраак"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Өткөн убакыт"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Калган убакыт"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Пауза"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
-msgstr "Абалкы"
+msgstr "Мурунку"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Кийинки"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
-msgstr "Визуализация"
+msgstr "Визуалдаштыруу"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
-msgstr "Визуализация режими"
+msgstr "Визуалдаштыруу режими"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Анализатор режими"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Осциллограмма режими"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Үн тагы режими"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "WindowShade VU режими"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Талдагыч түшүшү"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Чоку түшүшү"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Ойнотуу тизмеси"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Ойнотуу тизмесин ойнотуу"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Жаңы ойнотуу тизмеси"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Кийинки ойнотуу тизмесин тандоо"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
-msgstr "Абалкы ойнотуу тизмесин тандоо"
+msgstr "Мурунку ойнотуу тизмесин тандоо"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Ойнотуу тизмесин өчүрүү"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Ойнотуу тизмесин импорттоо"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Ойнотуу тизмесин экспорттоо"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Тизмени жаңыртуу"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr ""
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Ойнотуу тизмесинин менеджери"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Кезек менеджери"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Көрүнүш"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Интерфейс ырастоолору ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Интернет даректи кошуу..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Файлдарды кошуу..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Ойнотуу тизмесине файлдарды кошуу."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Издеп анан тандоо"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr ""
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Тандалганды тескерилетүү"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr ""
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Баарын тандоо"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Ойнотуу тизмесинин бүт жазууларын тандоо."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Тандоону алуу"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Ойнотуу тизмесинин бүт жазууларын тандоодон алуу."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Баарын өчүрүү"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Ойнотуу тизмесинен бүт жазууларды өчүрүү."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Кезекти тазалоо"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Кол жеткис файлдарды өчүрүү"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Ойнотуу тизмесинен кол жеткис файлдарды өчүрүү."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Дубликаттарды өчүрүү"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Ат боюнча"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Файл аты боюнча"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr ""
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Жол + файл аты боюнча"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr ""
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Тандалбагандарды өчүрүү"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Ойнотуу тизмесинен тандалбаган жазууларды өчүрүү."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Тандалгандарды өчүрүү"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Ойнотуу тизмесинен тандалган жазууларды өчүрүү."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Тизмени аралаштыруу"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Тизмени тескерилетүү"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr ""
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Тизмени сорттоо"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr ""
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Альбом боюнча"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Тизмени альбом боюнча сорттоо."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Аткаруучу боюнча"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr ""
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Файл аты боюнча тизмени сорттоо."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr ""
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Дата боюнча"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr ""
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Жолчо номерлери боюнча"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr ""
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Тандалгандарды сорттоо"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Файл"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Плагин кызматтары"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Жолчо жөнүндө маалымат"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Жолчо жөнүндө маалымат"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Audacious жөнүндө"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Файлды ойнотуу"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Файлды жүктөп анан ойнотуу"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Даректен ойнотуу"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr ""
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Плагин кызматтары"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
-msgstr "Параметрлер"
+msgstr "Ырастоолор"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
-msgstr "Параметр терезесин ачуу"
+msgstr "Ырастоолор терезесин ачуу"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Audacious'ту жабуу"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "A-B'ни коюу"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "A-B'ни тазалоо"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Файлга өтүү"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Убакытка өтүү"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Кезекти көрсөтүү/жашыруу"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr ""
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
-msgstr "Копиялоо"
+msgstr "Көчүрүү"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Кесүү"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Коюу"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Жүктөө"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Импорт"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Сактоо"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Өчүрүү"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Пресет"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr ""
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr ""
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Файлдан"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr ""
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP пресеттери"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr ""
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr ""
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Файлга"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Пресетти файлга сактоо"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr ""
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr ""
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Активдүү ойнотуу тизмесинен жазууларды издөө"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
 msgstr ""
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Ат: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Альбом: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Аткаруучу: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Файл аты: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Audacious ойнотуу тизмесинин редактору"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
-msgstr ""
+msgstr "%s (%d / %d)"
 
 #: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
-msgstr ""
+msgstr "Архивделген Winamp 2.x темасы"
 
 #: src/skins/ui_skinselector.c:167
 msgid "Unarchived Winamp 2.x skin"
-msgstr ""
+msgstr "Архивделбеген Winamp 2.x темасы"
 
 #: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
 msgstr ""
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Sndfile плагини"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Sndio чыгыш плагини жөнүндө"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 msgstr ""
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Колдолбогон формат"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
 msgstr ""
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "sndio орнотмосу"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr ""
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Айнуу"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Ыр которуу"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr ""
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Команда:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr ""
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr ""
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr ""
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3470,33 +3733,66 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
 msgstr ""
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Командалар"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Сапаты:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Ылдамдык жана бийиктик"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Ылдамдык:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Бийиктик:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Ылдамдык жана бийиктик"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3507,63 +3803,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Чычканды айлантуу аракети"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Катуулукту өзгөртүү"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Ойнотулуп жаткан ырды алмаштыруу"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Башка ырастоолор"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Калкыма терезени өчүрүү"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Системалык трейге жабуу"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Статус иконкасы"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Экстра стерео"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Экстра стерео"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Тон генератору: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3572,11 +3868,11 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Тон генератору"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -3584,15 +3880,15 @@
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr ""
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3613,44 +3909,44 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis декодери"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "VTX декодери"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "WavPack декодери"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "2SF декодери"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""

audacious-plugins-3.3.4.tar.bz2/po/lt.po -> audacious-plugins-3.4.2.tar.bz2/po/lt.po Changed

@@ -1,594 +1,662 @@
 # Lithuanian translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Algimantas Margevičius <gymka@archlinux.lt>, 2012.
-# Algimantas Margevičius <gymka@mail.ru>, 2011.
-# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011-2012.
-# gymka <gymka@mail.ru>, 2011.
+# Algimantas Margevičius <gymka@archlinux.lt>, 2012-2013
+# Algimantas Margevičius <gymka@archlinux.lt>, 2011
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2011-2012
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2012-2013, 2011, 2011-2012, 2013
+# gymka <gymka@mail.ru>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-17 08:30+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-04 12:51+0000\n"
 "Last-Translator: Algimantas Margevičius <gymka@archlinux.lt>\n"
-"Language-Team: Lithuanian\n"
+"Language-Team: Lithuanian (http://www.transifex.com/projects/p/audacious/"
+"language/lt/)\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "stereo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "erdvinis"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "AAC dekoderis"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "nuoseklus"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib grotuvas)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "Įskiepis skirtas paleisti atkūrimą numatytu laiku.\n\nOriginaliai parašė Adam Feakin ir Daniel Stodden."
+msgstr ""
+"Įskiepis skirtas paleisti atkūrimą numatytu laiku.\n"
+"\n"
+"Originaliai parašė Adam Feakin ir Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Žadintuvas"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Tai pabudimo skambutis."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "Gerai"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Žadintuvo nustatymai"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Laikas"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "valandos"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "v"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Laikas\n"
+" Signalo laikas:\n"
+" Kada skambės signalas.\n"
+"\n"
+" Nutilti po:\n"
+" Po nurodyto laiko nutildyti.\n"
+" (jei žadinimo dialogas neužvertas)\n"
+"\n"
+"\n"
+"Dienos\n"
+" Diena:\n"
+" Pasirinkite dienas kuriomis skambės signalas.\n"
+"\n"
+" Laikas:\n"
+" Pasirinkite laiką kuriuo skambės signalas,\n"
+" arba pasirinkite perjungimo mygtuką ir naudokite numatytąjį\n"
+" laiką.\n"
+"\n"
+"\n"
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minutės"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Nutylimas:\n"
+"garsiniti iki nurodyto lygio, šį laiko tarpą.\n"
+"\n"
+"Pradėti nuo:\n"
+"Pradėti nuo šio garso.\n"
+"\n"
+"Pabaiga:\n"
+"garsas po kurio nebekeisti garsumo. Jei garso keitimo laikas\n"
+"yra 0 tada nustatykite ir atkurkite.\n"
+"\n"
+"\n"
+"Parinktys:\n"
+"Papildoma komanda:\n"
+"atėjus signalo laikui paleisti šią komandą.\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Nutildyti po:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+" Grojaraštis:\n"
+" Įkelti grojaraštį. Jei nenurodyta,\n"
+" bus naudojamas esamas.\n"
+" Taipogi galima įvesti mp3/ogg srauto url.\n"
+"\n"
+" Priminimas:\n"
+" Parodo priminimą kai žadintuvas išjungiamas.\n"
+" Įrašykite priminimą ir perjunkite mygtuką \n"
+" jei norite jog jis būtų rodomas."
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Žadinti (numatyta):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Tai pabudimo skambutis."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Pasirinkite dienas kuriomis žadinti"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Šiandienos priminimas..."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Numatytosios"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Priminimas"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Diena"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Pirmadienis"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Pirmadienis"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Žadintuvo nustatymai"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Laikas"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Žadinti (numatyta):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "v"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Nutildyti po:"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "valandos"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minutės"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Pasirinkite dienas kuriomis žadinti"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Diena"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Numatytosios"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Dienos"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Išblukimas"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "sekundės"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Garsas"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Dabartinis"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Pradėti nuo"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Baigti"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Dabartinis"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Papildoma komanda"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "Įjungti"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Grojaraštis (nebūtina)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Pasirinkite grojaraštį"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Priminimas"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Naudoti priminimą"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Pasirinktys"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Ką šios pasirinktys reiškia?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nLaikas\n Žadinti laiku: \n Laikas kada įjungti žadintuvą.\n\nNutilti po: \n Po šio laiko tarpo išjungti žadintuvą.\n (jei prikėlimo žadintuvas neuždarytas)\n\n\nDienos\n Diena:\n Pasirinkite dienas kuriomis įjungti žadintuvą.\n\nLaikas:\n Pasirinkti kiekvienos dienos žadintuvo laiką,\n arba pasirinkti numatytąjį laiką.\n\n\nGarsas\n Garsėjimas: \n Garsinti iki nurodyto garso, \n šį laiko tarpą.\n\n Pradėti nuo: \n Pradėti garsinti nuo.\n\n Baigti: \n Garsas ties kuriuo baigti garsinti. Jei garsinimo\n laikas yra 0 tada nustatykit garsą šitą ir\n pradėkit groti.\n\n\nPasirinktys:\n Papildoma komanda:\n Vykdyti šią komandą žadintuvo laiku.\n\nGrojaraštis: \n Įkelti šį grojaraštį ir groti dainas iš jo. \n Jei nenurodytas grojaraštis bus naudojamos \n dainos kurios dabar yra sąraše.\n mp3/ogg URL taipogi gali būt čia įvestas.\n\nPriminimas:\n Parodyti priminimą žadintuvui išsijungus,\n įveskit priminimą langelyje ir paspauskite patvirtinimo mygtuką\n jei norit jog būtų rodomas.\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Žinynas"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Atšaukti"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Šiandienos priminimas..."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Dėkui"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Albumo apipavadalinimas"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Numatytasis PCM įrenginys"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Numatytasis mikšerio įrenginys"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA išvesties įskiepio nustatymai"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "PCM įrenginys:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Mikšerio įrenginys:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Mikšerio elementas:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Apeiti sausą pakibimą"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "ALSA išvesties įskiepis skirtas Audacious\nAutorinės teisės 2009-2012 John Lindgren\n\nDėkoju William Pitcock, „ALSA Output Plugin NG“ autoriui, jo kodas buvo kaip pagrindas kai ALSA žinynas negelbėdavo."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"ALSA išvesties įskiepis skirtas Audacious\n"
+"Autorinės teisės 2009-2012 John Lindgren\n"
+"\n"
+"Dėkoju William Pitcock, „ALSA Output Plugin NG“ autoriui, jo kodas buvo kaip "
+"pagrindas kai ALSA žinynas negelbėdavo."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "ALSA išvestis"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (MIDI grotuvas)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Nepasirinkti jokie MIDI atkūrimo prievadai. Juos pasirinkti galite MIDI įskiepio nustatymuose."
+msgstr ""
+"Nepasirinkti jokie MIDI atkūrimo prievadai. Juos pasirinkti galite MIDI "
+"įskiepio nustatymuose."
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI grotuvas)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "ALSA posistemė"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Ši posistemė siunčia MIDI įvykius naudotojo pasirinktai ALSA eiliškumo prievadų grupei. ALSA sekvencerio sąsaja yra labai universali, ji gali suteikti prievadus audio plokščių sintezatoriams (pvz. emu10k1) beto programiniams sintezatoriams, papildomiems įrenginiams ir t.t.\nŠi posistemė nekuria garso, MIDI įvykius apdoroja tiesiogiai įrenginiai/programos už ALSA prievadų; pavyzdžiui MIDI įvykiai nusiųsti į sintezatorių bus grojami tiesiogiai.\nPosistemę sukūrė Giacomo Lozito."
+msgstr ""
+"Ši posistemė siunčia MIDI įvykius naudotojo pasirinktai ALSA eiliškumo "
+"prievadų grupei. ALSA sekvencerio sąsaja yra labai universali, ji gali "
+"suteikti prievadus audio plokščių sintezatoriams (pvz. emu10k1) beto "
+"programiniams sintezatoriams, papildomiems įrenginiams ir t.t.\n"
+"Ši posistemė nekuria garso, MIDI įvykius apdoroja tiesiogiai įrenginiai/"
+"programos už ALSA prievadų; pavyzdžiui MIDI įvykiai nusiųsti į sintezatorių "
+"bus grojami tiesiogiai.\n"
+"Posistemę sukūrė Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "FluidSynth Posistemė"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Ši posistemė kuria garsą siųsdama MIDI įvykius į FluidSynth, realaus laiko programinis sintezatorius paremtas SoundFont2 specifika (www.fluidsynth.org).\nSukurtas garsas gali būti manipuliuojamas grotuvo efektų įskiepiais ir yra apdorojamas pasirinktu išvesties įskiepiu.\nPosistemę sukūrė Giacomo Lozito."
+msgstr ""
+"Ši posistemė kuria garsą siųsdama MIDI įvykius į FluidSynth, realaus laiko "
+"programinis sintezatorius paremtas SoundFont2 specifika (www.fluidsynth."
+"org).\n"
+"Sukurtas garsas gali būti manipuliuojamas grotuvo efektų įskiepiais ir yra "
+"apdorojamas pasirinktu išvesties įskiepiu.\n"
+"Posistemę sukūrė Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Prievadas"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Vardas"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Prievado vardas"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "ALSA išvesties prievadai"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Garso plokštė:"
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Mikšerio valdymas:"
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Mikšerio nustatymai"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "ALSA\nposistemė"
+msgstr ""
+"ALSA\n"
+"posistemė"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - posistemės informacija"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Posistemės pasirinkimas"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Atkūrimo nustatymai"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Perkelti:"
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Būgnų poslinkis: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Papildomi nustatymai"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "numanomas MIDI failų, grojaraštyje, ilgis"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "gauti komentarus iš MIDI failo (jei įmanoma)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "gauti žodžius iš MIDI failo (jei įmanoma)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - pasirinkti failą"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "AMIDI-Plug nustatymai"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - pasirinkite SoundFont failą"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "SoundFont nustatymai"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Failo vardas"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Dydis (bitais)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Įkrauti SF paleidžiant grotuvą"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Paleidus MIDI failą įkrauti SF"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Sintezatoriaus nustatymai"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "gauti"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "naudoti numatytą"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "vertė:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "polifonija"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "aidas"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "taip"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "ne"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "choras"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "diskretizacijos dažnis"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "derinta"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "FluidSynth\nposistemė"
+msgstr ""
+"FluidSynth\n"
+"posistemė"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Pavadinimas:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " MIDI Info "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formatas:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Trukmė (ms):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Takelių:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "kintamasis"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Laiko div:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI komentarai ir žodžiai"
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* Šiame MIDI faile nėra komentarų *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* Šiame MIDI faile nėra žodžių *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (neteisingas UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Apie AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr "AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -609,7 +677,23 @@
 "\n"
 "Tony Vroon\n"
 "for the good help with alpha testing"
-msgstr "\nmoduliarinis MIDI muzikos grotuvas \nhttp://www.develia.org/projects.php?p=amidiplug sukūrė \nGiacomo Lozito <james@develia.org> \n\nypatinga padėka...\n\nClemens Ladisch and Jaroslav Kysela \nuž jų puikias programas aplaymidi ir amixer; šios programos tikrai naudingos susipažįstant su ALSA API\n\nAlfredo Spadafina\nuž gražų midi klaviatūros logotipą\n\nTony Vroon\nuž pagalbą testuojan alfa"
+msgstr ""
+"\n"
+"moduliarinis MIDI muzikos grotuvas \n"
+"http://www.develia.org/projects.php?p=amidiplug sukūrė \n"
+"Giacomo Lozito <james@develia.org> \n"
+"\n"
+"ypatinga padėka...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela \n"
+"už jų puikias programas aplaymidi ir amixer; šios programos tikrai naudingos "
+"susipažįstant su ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"už gražų midi klaviatūros logotipą\n"
+"\n"
+"Tony Vroon\n"
+"už pagalbą testuojan alfa"
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
@@ -652,7 +736,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Sužadina OSD kai, atkūrimo metu, dainos pavadinimas pasikeičia, bet bylos vardas lieka tas pats. Šita pasirinktis naudingiausia atvaizduojant interneto srauto dainos pavadinimo pokyčius. "
+msgstr ""
+"Sužadina OSD kai, atkūrimo metu, dainos pavadinimas pasikeičia, bet bylos "
+"vardas lieka tas pats. Šita pasirinktis naudingiausia atvaizduojant "
+"interneto srauto dainos pavadinimo pokyčius. "
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -784,8 +871,11 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Kompozicionavimo tvarkyklė nerasta;\nįjunkite kompozicionavimo tvarkyklę, nes OSD neveiks taip kaip priklauso"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Kompozicionavimo tvarkyklė nerasta;\n"
+"įjunkite kompozicionavimo tvarkyklę, nes OSD neveiks taip kaip priklauso"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -848,47 +938,47 @@
 msgid "Misc"
 msgstr "Kita"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "ASXv1/ASXv2 grojaraščiai"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious grojaraščiai (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Spalva"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Išsiliejimo sritis"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Bauer Stereophonic-to-Binaural Preferences"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Duoti lygį:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Nukirpti dažnius:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Profiliai:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Spektro analizatorius"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -898,233 +988,246 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "Autorinės teisės (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> ir kiti.\n\nYpatingai dėkoju libcdio kūrėjams <http://www.gnu.org/software/libcdio/>\nir libcddb kūrėjams <http://libcddb.sourceforge.net/>.\n\nTaip pat dėkoju Tony Vroon už pamokymus ir užvedimą ant kelio.\n\nTai buvo Google Summer Code 2007 projektas."
+msgstr ""
+"Autorinės teisės (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> ir kiti.\n"
+"\n"
+"Ypatingai dėkoju libcdio kūrėjams <http://www.gnu.org/software/libcdio/>\n"
+"ir libcddb kūrėjams <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Taip pat dėkoju Tony Vroon už pamokymus ir užvedimą ant kelio.\n"
+"\n"
+"Tai buvo Google Summer Code 2007 projektas."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Įrenginys"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Skaitymo greitis:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Perrašyti įrenginį:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Meta duomenys"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Naudoti CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Naudoti CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Naudoti HTTP vietoj CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Serveris:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Kelias:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Prievadas:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Audio CD įskiepis"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Inicijuoti cdio posistemės nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Netinkamas URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Takelis %d nerastas."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Takelis %d yra duomenų takelis."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Atverti audio išvesties nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Klaida skaitant audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Atverti CD įrenginio %s nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "CD įrenginio suderinamo su audio nerasta."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Nepavyko užbaigti inicijuoto atverto CD įrenginio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Gauti pirmo/paskutinio takelio numerio nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Perskaityti LSN takelio %d pradžios/pabaigos nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Sukurti cddb sujungimo nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Užlausti CDDB serverio nepavyko"
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Užlausti CDDB serverio nepavyko: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Perskaityti cddb informaciją nepavyko: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Diskasukis tuščias."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Nepalaikomas disko tipas."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Groti CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Pridėti CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Audio CD Meniu elementai"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Glaudinimas"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Centro garsas:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Dinaminė sritis:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Dynamic Range Compression įskiepis skirtas Audacious\nAutorinės teisės 2010-2012 John Lindgren"
+msgstr ""
+"Dynamic Range Compression įskiepis skirtas Audacious\n"
+"Autorinės teisės 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Dynamic Range Compressor"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Žaidimų konsolės muzikos dekoderis"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Pagrindinės"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Atkūrimas"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Bosas:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "sekundės"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Aukšti:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Numatyta dainos trukmė:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Diskretizacija"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Įjungti garso diskretizaciją"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Diskretizacijos dažnis:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Nepaisyti trukmės iš SPC žymų"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Padidinti reverb"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "Numatyta dainos trukmė, išreikšta sekundėmis, naudojama dainom kurios nesuteikia trukmės informacijos (pvz. besikartojantiems takeliams)"
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Numatyta dainos trukmė, išreikšta sekundėmis, naudojama dainom kurios "
+"nesuteikia trukmės informacijos (pvz. besikartojantiems takeliams)"
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1132,88 +1235,107 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "Console music decoder engine paremtas Game_Music_Emu 0.5.2\nPalaikomi formatai: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n\nAudacious įskiepį sukūrė:\nWilliam Pitcock <nenolod@dereferenced.org>\nShay Green <gblargg@gmail.com>"
+msgstr ""
+"Console music decoder engine paremtas Game_Music_Emu 0.5.2\n"
+"Palaikomi formatai: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious įskiepį sukūrė:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "Garso perėjimo efektas nepavyko, nes dainos turi skirtingą skaičių kanalų. Galite panaudoti kanalų mikšerio įrankį ir suvienodinti kanalų skaičių."
+msgstr ""
+"Garso perėjimo efektas nepavyko, nes dainos turi skirtingą skaičių kanalų. "
+"Galite panaudoti kanalų mikšerio įrankį ir suvienodinti kanalų skaičių."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Garso perėjimo efektas nepavyko, nes dainos turi skirtingus diskretizavimo dažnius. Galite panaudoti diskretizacijos konvertavimo įrankį ir paversti dainas į tą patį dažnį."
+msgstr ""
+"Garso perėjimo efektas nepavyko, nes dainos turi skirtingus diskretizavimo "
+"dažnius. Galite panaudoti diskretizacijos konvertavimo įrankį ir paversti "
+"dainas į tą patį dažnį."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Crossfade Plugin skirtas Audacious\nAutorinės teisės 2010-2012 John Lindgren"
+msgstr ""
+"Crossfade Plugin skirtas Audacious\n"
+"Autorinės teisės 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Persidengimas"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Perdengti:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Perdengimas"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intensyvumas:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet įskiepis"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Aidas"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Delsa:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Garsinis atsakas:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Garsumas:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Echo Plugin\nSukūrė Johan Levin, 1999\n\nSurround echo sukūrė Carl van Schaik, 1999"
+msgstr ""
+"Echo Plugin\n"
+"Sukūrė Johan Levin, 1999\n"
+"\n"
+"Surround echo sukūrė Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Aidas"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1221,9 +1343,15 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Multi-format audio decoding įskiepis skirtas Audacious naudojama\nFFmpeg multimedia framework (http://www.ffmpeg.org/)\n\nAudacious įskiepį sukūrė:\nWilliam Pitcock <nenolod@nenolod.net>\nMatti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Multi-format audio decoding įskiepis skirtas Audacious naudojama\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious įskiepį sukūrė:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg įskiepis"
 
@@ -1291,7 +1419,21 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1305,11 +1447,13 @@
 msgid "Joint Stereo"
 msgstr "Sujungtas stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1357,7 +1501,7 @@
 msgid "Error protection"
 msgstr "Apsauga nuo klaidų"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Kokybė"
 
@@ -1437,429 +1581,500 @@
 msgid "Tags"
 msgstr "Žymos"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis koduotojo konfigūracija"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Kokybės lygis (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "lossless"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Originalų kodą rašė\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Originalų kodą rašė\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "FLAC dekoderis"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "GIO įskiepis skirtas Audacious\nAutorinės teisės 2009-2012 John Lindgren"
+msgstr ""
+"GIO įskiepis skirtas Audacious\n"
+"Autorinės teisės 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "GIO įskiepis"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL Spektro analizatorius skirtas Audacious\n"
+"Autorinės teisės 2013 Christophe Budé ir John Lindgren\n"
+"\n"
+"Paremta XMMS įskiepiu:\n"
+"Autorinės teisės 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson, ir 4Front Technologies\n"
+"\n"
+"Licencija: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL spektro analizatorius"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Gnome Shortcut įskiepis\nSuteikia galimybę valdyti grotuvą su Gnome susiejimais.\n\nAutorinės teisės (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"Gnome Shortcut įskiepis\n"
+"Suteikia galimybę valdyti grotuvą su Gnome susiejimais.\n"
+"\n"
+"Autorinės teisės (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Gnome spartieji klavišai"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Įrašo numeris"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Pavadinimas"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Atlikėjas"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Metai"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Albumas"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Takelis"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Žanras"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Vieta eilėje"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Trukmė"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Bylos kelias"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Bylos vardas"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Derintas pavadinimas"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Bitų seka"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Rinktis stulpelius"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Prieinama:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Pasirinkta:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Sumažinti į kairę"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Sumažinti į dešinę"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Sumažinti į viršų"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Sumažinti apačioje"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Padidinti"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Išjungti"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Atverti failus ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Atverti _URL ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Pridėti failus..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Pridėti U_RL ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Ieškoti fonotekoje"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "A_pie"
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Nustatymai ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Išeiti"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Groti"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Pauz_ė"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Sustabdyti"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "Ankste_snis"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Sekantis"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "_Kartoti"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "S_umaišyti"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "N_esislinkti grojaraščiu"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Sustabdyti _po šitos dainos"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Sustabdyti _po šios dainos"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "Dainos _informacija ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Šokti į _laiką"
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "_Pereiti prie dainos ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Pagal takelio _numerį"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Nustatyti kartojimo tašką _A"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Nustatyti kartojimo tašką _B"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "_Išvalyti kartojimo taškus"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Pagal _pavadinimą"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "Pagal failo _vardą"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "Pagal failo _kelią"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Pagal takelio _numerį"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Pagal _atlikėją"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Pagal a_lbumą"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "Pagal _albumą"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Pagal išleidimo _datą"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "Pagal _trukmę"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Pagal _failo kelią"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Pagal _derintą eilutę"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "A_tvirkštine tvarka"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "_Atsitiktine tvarka"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Groti šį grojaraštį"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Atnaujinti"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Pašalinti _neprieinamus failus"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Rikiuoti"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Rikuoti pasirinktus"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Pašalinti _dubliuotus"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Pašalinti _neprieinamus failus"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Naujas"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "_Pervadinti"
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Uždaryti"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Įkelti ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Eksportuoti ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Grojaraščio _redaktorius"
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "_Eilės redaktorius ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "Pagarsi_nti"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "Patil_dyti"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Ekvalaizeris"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_fektai"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Naudotojo sąsaja"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Vizualizacijos"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Rodyti _meniu juostą"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Rodyti i_nfo juostą"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Rodyti informacijos juostos _vizualizaciją"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Rodyti _būsenos juostą"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "_Rodyti likusį laiką"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Rodyti _užvėrimo mygtukus"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Rodyti stulpelio _antraštes"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Pasirinkti _stulpelius ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Slinkt_is keičiantis dainai"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Failas"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Atkūrimas"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "G_rojaraštis"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Tarnybos"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Išvestis"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Rodymas"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Į eilę/Iš eilės"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "Iškirpt_i"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Įklijuoti"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Pasirinkti _viską"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Pervadinti..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "GTK naudotojo sąsaja"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Įkraunama į atmintį ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Klaida"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1867,113 +2082,124 @@
 msgstr[1] "%d kanalai"
 msgstr[2] "%d kanalų"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr "Ankstesnis takelis"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Groti"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Sustabdyti/Paleisti"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Stabdyti"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "Kitas takelis"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
 msgstr "5 sekundes į priekį"
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
 msgstr "5 sekundes atgal"
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
 msgstr "Nutildyti"
 
-#: src/hotkey/gui.c:80
-msgid "Volume Up"
+#: src/hotkey/gui.c:78
+msgid "Volume up"
 msgstr "Pagarsinti"
 
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr "Pritildyti"
+
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
+msgstr "Peršokti į failą"
+
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Patildyti"
+msgid "Toggle player window(s)"
+msgstr "Perjungti grotuvo langą (-us)"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Šokti į failą"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Rodyti On-Screen-Display"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Perjungti grotuvo langą(-us)"
+msgid "Toggle repeat"
+msgstr "Perjungti kartojimą"
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Rodyti On-Screen-Display"
+msgid "Toggle shuffle"
+msgstr "Perjungti maišymą"
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Perjungti Kartojimą"
+msgid "Toggle stop after current"
+msgstr "Perjungti sustabdymą po dabartinės"
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Perjungti maišymą"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr "Iškelti grotuvo langą(-us)"
+msgid "Raise player window(s)"
+msgstr "Pakelti grotuvą langą (-us)"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(joks)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Nerekomenduojama susieti pagrindinius pelės mygtukus be prižiūrėtojų.\n\nTęsti?"
+msgstr ""
+"Nerekomenduojama susieti pagrindinius pelės mygtukus be prižiūrėtojų.\n"
+"\n"
+"Tęsti?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Saistyti pelės mygtukus"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Global Hotkey įskiepio konfigūravimas"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Paspauskite klavišų kombinaciją teksto lauke.\nTaip pat galima sieti ir pelės mygtukus."
+msgstr ""
+"Paspauskite klavišų kombinaciją teksto lauke.\n"
+"Taip pat galima sieti ir pelės mygtukus."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Spartieji klavišai:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Veiksmas:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Klavišo susiejimas:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1986,104 +2212,130 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "Global Hotkey Plugin\nValdykite grotuvą bendrais klavišų susiejimais ar multimedijos klavišais.\n\nAutorinės teisės (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nContributers include:\nAutorinės teisės (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nAutorinės teisės (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n Bryn Davies <curious@ihug.com.au>,\n Jonathan A. Davis <davis@jdhouse.org>,\n Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"Global Hotkey Plugin\n"
+"Valdykite grotuvą bendrais klavišų susiejimais ar multimedijos klavišais.\n"
+"\n"
+"Autorinės teisės (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Autorinės teisės (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Autorinės teisės (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Bendri karštieji klavišai"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Paremta xmms-jack, kūrė Chris Morgan:\nhttp://xmms-jack.sourceforge.net/\n\nPritaikė Audacious, Giacomo Lozito"
+msgstr ""
+"Paremta xmms-jack, kūrė Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Pritaikė Audacious, Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "JACK išvestis"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s nustatymai:"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "LADSPA Host nustatymai"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Modulio kelias:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Atskirkite kelis kelius su dvitaškiu.\nŠie keliai ieškomi neradus ko reikia LADSPA_PATH kelyje.\nKai pridedami nauji keliai, paspauskite ENTER naujų įskiepių paieškai."
+msgstr ""
+"Atskirkite kelis kelius su dvitaškiu.\n"
+"Šie keliai ieškomi neradus ko reikia LADSPA_PATH kelyje.\n"
+"Kai pridedami nauji keliai, paspauskite ENTER naujų įskiepių paieškai.</"
+"small>"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Prieinami įskiepiai:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Įjungti"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Įjungti įskiepiai:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "LADSPA Host skirta Audacious\nAutorinės teisės 2011 John Lindgren"
+msgstr ""
+"LADSPA Host skirta Audacious\n"
+"Autorinės teisės 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "LADSPA Host"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: inicijuoti LIRC palaikymo nepavyko\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: nepavyko perskaityti LIRC konfigūracijos failo\n%s: paskaitykite LIRC dokumentaciją\n%s: kaip sukurti tinkamą konfigūracijos failą\n"
+msgstr ""
+"%s: nepavyko perskaityti LIRC konfigūracijos failo\n"
+"%s: paskaitykite LIRC dokumentaciją\n"
+"%s: kaip sukurti tinkamą konfigūracijos failą\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: bandoma prisijungti iš naujo...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: nežinoma komanda „%s“\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: atsijungta nuo LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: bus bandoma prisijungti iš naujo kas %d sekundes...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2097,155 +2349,323 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "Paprastas įskiepis Audacious valdymui per nutolusį LIRC valdymo demoną\n\nPritaikė Audacious:\nTony Vroon <chainsaw@gentoo.org>\nJoonas Harjumäki <jharjuma@gmail.com>\n\nParemta XMMS LIRC kurį sukūrė:\nCarl van Schaik <carl@leg.uct.ac.za>\nChristoph Bartelmus <xmms@bartelmus.de>\nAndrew O. Shadoura <bugzilla@tut.by>\n\nApie LIRC galite sužinoti tinklalapy http://lirc.org."
+msgstr ""
+"Paprastas įskiepis Audacious valdymui per nutolusį LIRC valdymo demoną\n"
+"\n"
+"Pritaikė Audacious:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Paremta XMMS LIRC kurį sukūrė:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Apie LIRC galite sužinoti tinklalapy http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Prisijungimas"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Iš naujo prisijungti prie LIRC serverio"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Prieš jungiantis iš naujo palaukti:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "LIRC įskiepis"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Nėra prieinamų dainų žodžių"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Gauti %s nepavyko"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Apdoroti %s nepavyko"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Ieškoma dainų žodžių"
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Trūksta dainos metaduomenų"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Jungiamasi prie lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki įskiepis"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "M3U grojaraščiai"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takto generatorius: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takto generatorius: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "Takto generatorius, sukūrė Martin Strauss <mys@faveve.uni-stuttgart.de>\nNorėdami naudoti pridėkite URL tact://beats*num/den\npvz. tact://77 norint atkurt 77 dūžius per minutę\nar tact://60*3/4 norint atkurti 60 bpm 3/4 taktu"
+msgstr ""
+"Takto generatorius, sukūrė Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"Norėdami naudoti pridėkite URL tact://beats*num/den\n"
+"pvz. tact://77 norint atkurt 77 dūžius per minutę\n"
+"ar tact://60*3/4 norint atkurti 60 bpm 3/4 taktu"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Takto generatorius"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Channel Mixer įskiepis skirtas Audacious\nAutorinės teisės 2011-2012 John Lindgren ir Michał Lipski"
+msgstr ""
+"Channel Mixer įskiepis skirtas Audacious\n"
+"Autorinės teisės 2011-2012 John Lindgren ir Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Kanalų mikšeris"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Išvesties kanalai:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Kanalų mikšeris"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "MMS įskiepis"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Raiška"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bitai"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bitų"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Kanalai"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Perdarymas (resampling)"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Arčiausias (greičiausia)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Linijinis (greitas)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Spline (gerai)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Polifazinis (geriausiai)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Diskretizacijos dažnis"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Lygis:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Nukirpimas:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Reverb"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Boso garsinimas"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Erdvinis"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Stiprinimas"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Kita"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Oversample"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Triukšmo mažinimas"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Groti Amiga MOD"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Kartoti"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Kartojimų skaičius:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Norėdami kartoti amžinai, nustatykite „-1“."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Module grotuvas)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Erdvinis garsas"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "MPG123 įskiepis"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 Serveris"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS įskiepis"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Sustabdyta"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious negroja."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Desktop Notifications Plugin for Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Paremta libnotify-aosd kurį sukūrė Maximilian Bogner:\nhttp://www.mbogner.de/projects/libnotify-aosd/\n\nAutorinės teisės (C) 2010 Maximilian Bogner\nAutorinės teisės (C) 2011 John Lindgren\n\nThis plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n\nThis plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Rodyti atkūrimo valdymą"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Visada rodyti pranešimą"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Darbastalio pranešimai"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Rodyti"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pauzė"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Sekantis"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Numatytasis įrenginys"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Audio įrenginys:"
 
@@ -2270,22 +2690,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "OSS4 Output Plugin skirtas Audacious\nAutorinės teisės 2010-2012 Michał Lipski\n\nNorėčiau padėkoti žmonėms #audacious kanale, ypatingai Tony Vroon ir John Lindgren ir savaime aišku ankstesnės OSS įskiepio versijos autoriams."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"OSS4 Output Plugin skirtas Audacious\n"
+"Autorinės teisės 2010-2012 Michał Lipski\n"
+"\n"
+"Norėčiau padėkoti žmonėms #audacious kanale, ypatingai Tony Vroon ir John "
+"Lindgren ir savaime aišku ankstesnės OSS įskiepio versijos autoriams."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "OSS4 išvestis"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "PLS grojaraščiai"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 dekoderis"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2303,155 +2729,232 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Audacious PulseAudio Output Plugin\n\nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"Audacious PulseAudio Output Plugin\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "PulseAudio išvestis"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Sample Rate Converter Plugin for Audacious\nAutorinės teisės 2010-2012 John Lindgren"
+msgstr ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Autorinės teisės 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Praleisti/kartoti pavyzdžius"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Linijinė interpoliacija"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Greita interpoliacija"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Vidutinė interpoliacija"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Geriausia interpoliacija"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Konvertavimas"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Metodas:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Dažnis:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Dažnio nustatymai"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Naudoti dažnio nustatymus"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Diskretizavimo dažnio keitėjas"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Keisti slaptažodį"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "Gerai. Ieškoma informacijos naudotojui: %s"
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Tarnybos"
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Neleidžiama"
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Nueikite šia nuoroda ir leiskite Audacious gauti informaciją apie dainas:"
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Naudotojo vardas:"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Palikite šį langą atvertą ir paspauskite „Tikrinti leidimus“ dar kartą.\n"
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Slaptažodis:"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"Nesijaudinkite. Jūsų informacija saugoma kompiuteryje.\n"
+"Ji bus išsiųsta kai tik Audacious leis tai padaryti."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Tinklo problema."
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "Bandant susisiekti su Last.fm įvyko klaida. Pabandykite vėliau."
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Tikrinama..."
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "_Tikrinti leidimus"
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_Atšaukti leidimą"
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Turite leisti Audacious perduoti takelių informaciją jūsų Last.fm paskyrai.\n"
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "Scrobbler URL:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Scrobbler įskiepio paleisti nepavyko.\n"
+"Gali būt jog yra problemų su jūsų įdiegimu."
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Audacious Scrobbler įskiepis 2.0 autorius Pitxyoki,\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Audacious AudioScrobbler įskiepis\n\nOriginaliai sukurė Audun Hove <audun@nlc.no> ir Pipian <pipian@pipian.com>"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Dėkojame John Lindgren už pagalbą.\n"
+"\n"
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Nuo šiol audacious naudoja patobulintą last.fm apdoroklio versiją.\n"
+"Pažiūrėkite apdoroklio nustatymuose."
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "SDL Output Plugin skirtas Audacious\nAutorinės teisės 2010 John Lindgren"
+msgstr ""
+"SDL Output Plugin skirtas Audacious\n"
+"Autorinės teisės 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "SDL išvestis"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Fonoteka"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Nežinomas atlikėjas"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Nežinomas albumas"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\n ant %s su %s"
+msgstr ""
+"%s\n"
+" ant %s su %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
@@ -2459,7 +2962,7 @@
 msgstr[1] "%d albumai"
 msgstr[2] "%d albumų"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2467,11 +2970,17 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d daina"
-msgstr[1] "%s\n %s, %d dainos"
-msgstr[2] "%s\n %s, %d dainų"
+msgstr[0] ""
+"%s\n"
+" %s, %d daina"
+msgstr[1] ""
+"%s\n"
+" %s, %d dainos"
+msgstr[2] ""
+"%s\n"
+" %s, %d dainų"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2479,77 +2988,85 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d daina kurią sukūrė %s"
-msgstr[1] "%s\n %d dainos kurias sukūrė %s"
-msgstr[2] "%s\n %d dainų kurias sukūrė %s"
+msgstr[0] ""
+"%s\n"
+" %d daina kurią sukūrė %s"
+msgstr[1] ""
+"%s\n"
+" %d dainos kurias sukūrė %s"
+msgstr[2] ""
+"%s\n"
+" %d dainų kurias sukūrė %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Sukurti grojaraštį"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Pridėti į grojaraštį"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Ieškoti fonotekoje"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Norėdami importuoti muziką į Audacious fonoteką, pasirinkite aplanką ir paspauskite „atnaujinti“ piktogramą."
+msgstr ""
+"Norėdami importuoti muziką į Audacious fonoteką, pasirinkite aplanką ir "
+"paspauskite „atnaujinti“ piktogramą."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Palaukite..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Pasirinkite aplanką"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Paieškos įrankis"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Klasikinė Winamp sąsaja"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Grotuvas:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Pasirinkti pagrindinį lango šriftą:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Grojaraštis:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Pasirinkti grojaraščio šriftą:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Šriftai"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Naudoti bitmap šriftus (palaiko tik ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Slinkti pavadinimą į abi puses"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Išvaizda"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Sąsajos nustatymai"
 
@@ -2605,7 +3122,7 @@
 msgid "Presets"
 msgstr "Šablonai"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Įkrauti šabloną"
 
@@ -2618,7 +3135,7 @@
 msgid "Load equalizer preset"
 msgstr "Įkrauti ekvalaizerio išankstinius nustatymus"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Išsaugoti šablonus"
 
@@ -2630,7 +3147,7 @@
 msgid "Save equalizer preset"
 msgstr "Išsaugoti ekvalaizerio išankstinius nustatymus"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Ištrinti šabloną"
 
@@ -2638,739 +3155,752 @@
 msgid "Delete auto-preset"
 msgstr "Ištrinti auto išankstinius nustatymus"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Eiti į %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Garsumas: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balansas: %d%% kairė"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Balansas: centras"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balansas: %d%% dešinė"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Pasirinkčių meniu"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Išjungti „Visada viršuje“"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Įjungti „Visada viršuje“"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Failo informacijos langas"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Vizualizacijos meniu"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Vieno režimas."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Grojaraščio režimas."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Sustabdymas po dainos."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Nesustabdyti po dainos."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Kartojimo taškas A nustatytas."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Kartojimo taškas B nustatytas."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Kartojimo taškai išvalyti."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Automatiškai slinkti dainos pavadinimą"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Sustabdyti po grojamos dainos"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Viršūnės"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Kartoti"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Maišyti"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Nesislinkti grojaraščiu"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Rodyti grotuvą"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Rodyti grojaraščio redaktorių"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Rodyti ekvalaizerį"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Visada viršuje"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Rodyti visuose darbalaukiuose"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Suskleisti grotuvą"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Suskleisti grojaraščio redaktorių"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Suskleisti ekvalaizerį"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analizatorius"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Sritis"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Voiceprint"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Išjungta"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normalus"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Ugnis"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Vertikalios linijos"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Linijos"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Juostos"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Taško sritis"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Linijos sritis"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Vientisa sritis"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Ledas"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Tolygus"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Lėčiausias"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lėtas"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Vidutinis"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Greitas"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Greičiausias"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Praėjo laiko"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Liko laiko"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pauzė"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Ankstesnis"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Sekantis"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Vizualizacija"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Vizualizacijos režimas"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Analizatoriaus režimas"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Akiračio režimas"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Voiceprint režimas"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "WindowShade VU režimas"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Analizatoriaus nukritimas"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Pikų krytis"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Grojaraštis"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Groti grojaraštį"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Naujas grojaraštis"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Pasirinkti sekantį grojaraštį"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Pasirinkti ankstesnį grojaraštį"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Ištrinti grojaraštį"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Įkelti grojaraštį"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Įkrauna grojaraščio failą į pasirinktą grojaraštį."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Eksportuoti grojaraštį"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Išsaugo pasirinktą grojaraštį."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Atnaujinti sąrašą"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Atnaujina meta duomenis susietus su grojaraščio elementu."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Grojaraščio redaktorius"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Eilės redaktorius"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Rodymas"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Naudotojo sąsaja"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Naudotojo sąsajos nustatymai..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Pridėti interneto adresą..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Pridėti nutolusį takelį į grojaraštį."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Pridėti failus..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Prideda failus į grojaraštį."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Ieškoti ir pasirinkti"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "Ieško ir pasirenka grojaraščio elementus pagal nurodytą kriterijų."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Invertuoti pažymėjimą"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Apverčia visus elementus."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Pasirinkti viską"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Pasirenka visus grojaraščio įrašus."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Nieko nepasirinkti"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Atžymi visus grojaraščio įrašus."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Pašalinti visus"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Pašalina visus įrašus iš grojaraščio."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Išvalyti eilę"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Išvalo eilę susietą su šiuo grojaraščiu."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Pašalina neprieinamus failus"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Pašalina neprieinamus failus iš grojaraščio."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Pašalinti dubliuotus"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Pagal pavadinimą"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Pašalina dubliuotus įrašus iš grojaraščio pagal pavadinimą."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Pagal failo vardą"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Pašalina dubliuotus įrašus iš grojaraščio pagal failo vardą."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Pagal kelią + failo vardą"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Pašalina dubliuotus įrašus iš grojaraščio pagal pilną jų kelią."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Pašalint nepažymėtus"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Pašalina nepažymėtus."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Pašalint pažymėtus"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Pašalina pažymėtus elementus iš grojaraščio."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Sumaišyti sąrašą"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Sumaišo sąrašą."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Apversti sąrašą"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Apverčia grojaraštį."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Rikiuoti sąrašą"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Rikiuoja sąrašą pagal pavadinimą."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Pagal albumą"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Rikiuoja sąrašą pagal albumą."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Pagal atlikėją"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Rikiuoja sąrašą pagal atlikėją."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Rikiuoja sąrašą pagal failo vardą."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Rikiuoja sąrašą pagal pilną kelią."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Pagal datą"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Rikiuoja sąrašą pagal keitimo laiką."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Pagal takelio numerį"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Rikiuoja sąrašą pagal takelio numerį."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Rikuoti pasirinktus"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Failas"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Įskiepių paslaugos"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Pažiūrėti takelio detales"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Pažiūrėti takelio detales"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Apie Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Groti failą"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Įkrauti ir groti failą"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Groti vietą"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Groti failą iš pasirinktos vietos"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Įskiepių paslaugos"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Nustatymai"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Atverti nustatymų langą"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Užverti Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Nustatyti A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Išvalyti A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Šokti į failą"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Šokti į laiką"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Perjungti eilę"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Įjungia/Išjungia įrašą grojaraščio eilėje."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Iškirpti"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Įklijuoti"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Įkrauti"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importuoti"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Išsaugoti"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Šablonas"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Savaime įsikraunantis šablonas"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Įkrauti savaime įsikraunantį šabloną"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Įkrauti numatytąjį šabloną į ekvalaizerį"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Nulis"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Nustatyti ekvalaizerio šablono lygius nuliui"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Iš failo"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Įkrauti šabloną iš failo"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Iš WinAMP EQF failo"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Įkrauti šabloną iš WinAMP EQF failo"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP šablonai"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importuoti WinAMP šablonus"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Išsaugoti savaime įsikraunantį šabloną"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Išsaugoti numatytąjį šabloną"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Į failą"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Išsaugoti šabloną į failą"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Į WinAMP EQF failą"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Išsaugoti šabloną į WinAMP EQF failą"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Ištrinti savaime įsikraunantį šabloną"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Ieškoti įrašų aktyviame grojaraštyje"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Surask ir pasirink įrašus grojaraštyje užpildydamas vieną ar kelis laukelius. Laukeliai naudoja reguliariųjų išraiškų sintaksę, raidžių lygis nesvarbus. Jei nežinai kaip veikia reguliariosios išraiškos, paprasčiausiai įrašyk paraidžiui tai ko ieškai."
+msgstr ""
+"Surask ir pasirink įrašus grojaraštyje užpildydamas vieną ar kelis "
+"laukelius. Laukeliai naudoja reguliariųjų išraiškų sintaksę, raidžių lygis "
+"nesvarbus. Jei nežinai kaip veikia reguliariosios išraiškos, paprasčiausiai "
+"įrašyk paraidžiui tai ko ieškai."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Pavadinimas:"
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Albumas:"
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Atlikėjas:"
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Failo vardas:"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Prie ieškant, išvalyti buvusius pasirinkimus"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Atitinkantiems įrašams automatiškai perjungti eilę"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Iš surastų įrašų sukurti naują grojaraštį"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Audacious grojaraščio redaktorius"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d iš %d)"
@@ -3388,81 +3918,123 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Negaliu sukurti aplanko (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Paremta xmms_sndfile įskiepiu:\n"
+"Autorinės teisės (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Paremta xmms_sndfile įskiepiu:\nAutorinės teisės (C) 2000, 2002 Erik de Castro Lopo\n\nAdapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Sndfile įskiepis"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Apie Sndio Output įskiepį"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Sndio Output Plugin\n\nSukūrė Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Sndio Output Plugin\n"
+"\n"
+"Sukūrė Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Nepalaikomas formatas"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Garso įrenginys šio formato nepalaiko.\n\nPabandykite dar kartą su paleistu sndiod(1) serveriu."
+msgstr ""
+"Garso įrenginys šio formato nepalaiko.\n"
+"\n"
+"Pabandykite dar kartą su paleistu sndiod(1) serveriu."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "sndio įrenginys"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(tuščia reiškia numatytą)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Gerai"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Atšaukti"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Dainos keitimas"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Komanda kurią paleisti kai Audacious paleidžia naują dainą."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Komanda:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Komanda kurią paleisti prieš pasibaigiant dainai."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Komanda kurią paleisti kai Audacious pasiekia grojaraščio pabaigą."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Komanda kurią paleisti kai dainos pavadinimas pasikeičia (t.y. interneto srautų pavadinimai)"
+msgstr ""
+"Komanda kurią paleisti kai dainos pavadinimas pasikeičia (t.y. interneto "
+"srautų pavadinimai)"
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3479,35 +4051,87 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Galite naudoti tokio formato eilutes, kurios\nprieš kviečiant komandą bus pakeistos (ne visos\ntinka end-of-playlist komandai):\n\n%F: Dažnis (hercais)\n%c: Kanalų skaičius\n%f: Failo vardas (pilnas kelias)\n%l: Trukmė (millisekundėmis)\n%n ar %s: Dainos vardas\n%r: Dažnis (bitais per sekundę)\n%t: Grojaraščio vieta (%02d)\n%p: Šiuo metu grojama (1 arba 0)\n%a: Atlikėjas\n%b: Albumas\n%T: Takelio pavadinimas"
+msgstr ""
+"Galite naudoti tokio formato eilutes, kurios\n"
+"prieš kviečiant komandą bus pakeistos (ne visos\n"
+"tinka end-of-playlist komandai):\n"
+"\n"
+"%F: Dažnis (hercais)\n"
+"%c: Kanalų skaičius\n"
+"%f: Failo vardas (pilnas kelias)\n"
+"%l: Trukmė (millisekundėmis)\n"
+"%n ar %s: Dainos vardas\n"
+"%r: Dažnis (bitais per sekundę)\n"
+"%t: Grojaraščio vieta (%02d)\n"
+"%p: Šiuo metu grojama (1 arba 0)\n"
+"%a: Atlikėjas\n"
+"%b: Albumas\n"
+"%T: Takelio pavadinimas"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Parametrai pateikti komandų interpretatoriui turi būti kabutėse. Darant kitaip rizikuojate savo saugumu."
+msgstr ""
+"Parametrai pateikti komandų interpretatoriui turi būti "
+"kabutėse. Darant kitaip rizikuojate savo saugumu."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Komandos"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"SoX Resampler įskiepis skirtas Audacious⏎ Copyright 2013 Michał Lipski⏎ ⏎ "
+"Paremta Sample Rate Converter įskiepiu:⏎ Copyright 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Greita"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Žema"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Aukšta"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Labai aukšta"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Kokybė:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "SoX Resampler"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Greitis ir žingsnis"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Greitis:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Žingsnis:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Greitis ir žingsnis"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3516,94 +4140,113 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "Status Icon Plugin\n\nAutorinės teisės 2005-2007 Giacomo Lozito <james@develia.org>\nAutorinės teisės 2010 Michał Lipski <tallica@o2.pl>\n\nŠis įskiepis suteikia būsenos piktogramą, kuri\nrodoma sistemos dėkle."
+msgstr ""
+"Status Icon Plugin\n"
+"\n"
+"Autorinės teisės 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Autorinės teisės 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Šis įskiepis suteikia būsenos piktogramą, kuri\n"
+"rodoma sistemos dėkle."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Pelės slinkimo veiksmas"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Keisti garsą"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Keisti grojančią dainą"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Kiti nustatymai"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Išjungti iššokantį langą"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Užverti į sistemos dėklą"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Slenkant aukštyn, žengti grojaraščiu"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Būsenos piktograma"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Extra Stereo Plugin\n\nSukūrė Johan Levin, 1999"
+msgstr ""
+"Extra Stereo Plugin\n"
+"\n"
+"Sukūrė Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Tono generatorius: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "Sine tono generatorius, sukūrė Håvard Kvålen <havardk@xmms.org>\nPakeitė Daniel J. Peng <danielpeng@bigfoot.com>\n\nNorėdami naudoti, pridėkite URL: tone://dažnis1;dažnis2;dažnis3;...\npvz. tone://2000;2005 norint atkurti 2000 Hz toną ir 2005 Hz toną"
+msgstr ""
+"Sine tono generatorius, sukūrė Håvard Kvålen <havardk@xmms.org>\n"
+"Pakeitė Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Norėdami naudoti, pridėkite URL: tone://dažnis1;dažnis2;dažnis3;...\n"
+"pvz. tone://2000;2005 norint atkurti 2000 Hz toną ir 2005 Hz toną"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Tono generatorius"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "File I/O Plugin skirtas Audacious\nAutorinės teisės 2009-2012 John Lindgren\n\nŠIS ĮSKIEPIS BŪTINAS. NEIŠJUNKITE."
+msgstr ""
+"File I/O Plugin skirtas Audacious\n"
+"Autorinės teisės 2009-2012 John Lindgren\n"
+"\n"
+"ŠIS ĮSKIEPIS BŪTINAS. NEIŠJUNKITE."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Failo įvesties/išvesties įskiepis"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Balso pašalinimas"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3622,46 +4265,75 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Audacious Ogg Vorbis Decoder\n\nParemta Xiph.org Foundation's Ogg Vorbis Plugin:\nhttp://www.xiph.org/\n\nOriginalų kodą rašė:\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nPrisidėjo:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Paremta Xiph.org Foundation's Ogg Vorbis Plugin:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Originalų kodą rašė:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Prisidėjo:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis dekoderis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr "Vortex formato failų grotuvą sukūrė Sashnov Alexander <sashnov@ngs.ru>\nParemta in_vtx.dll kurį sukūrė Roman Sherbakov <v_soft@microfor.ru>\nAudacious įskiepį sukūrė Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Vortex formato failų grotuvą sukūrė Sashnov Alexander <sashnov@ngs.ru>\n"
+"Paremta in_vtx.dll kurį sukūrė Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious įskiepį sukūrė Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "VTX Decoder"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "lossy (hibridinis)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "lossy"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Autorinės teisės 2006 William Pitcock <nenolod@nenolod.net>\n\nDalį kodo parašė Miles Egan."
+msgstr ""
+"Autorinės teisės 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Dalį kodo parašė Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "WavPack dekoderis"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "2SF dekoderis"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML viešinami grojaraščiai (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - pasirinkti failą"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Rikuoti _pasirinktus"

audacious-plugins-3.3.4.tar.bz2/po/lv.po -> audacious-plugins-3.4.2.tar.bz2/po/lv.po Changed

@@ -1,591 +1,660 @@
 # Latvian translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Einars Sprugis <einars8@gmail.com>, 2009,2011-2013.
+# hairy_latvian <einars8@gmail.com>, 2009,2011-2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2013-01-01 21:02+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-06 11:31+0000\n"
 "Last-Translator: hairy_latvian <einars8@gmail.com>\n"
-"Language-Team: Latvian\n"
+"Language-Team: Latvian (http://www.transifex.com/projects/p/audacious/"
+"language/lv/)\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "stereo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "ieskaušana"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "AAC dekodētājs"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "sekvencēts"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib atskaņotājs)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "Spraudnis, kas var tikt izmantots, lai sāktu atskaņošanu noteiktā laikā.\n\nSākotnējie autori: Adam Feakin un Daniel Stodden."
+msgstr ""
+"Spraudnis, kas var tikt izmantots, lai sāktu atskaņošanu noteiktā laikā.\n"
+"\n"
+"Sākotnējie autori: Adam Feakin un Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Modinātājs"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Šis ir jūsu mošanās zvans."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "Labi"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Modinātājs iestatījumi"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Laiks"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "stundas"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Laiks\n"
+" Modināt:\n"
+" laiks, kādā modinātājs tiks aktivizēts.\n"
+"\n"
+" Apklust pēc:\n"
+" apturēt modinātāju pēc šāda laika perioda.\n"
+" (Ja pamošanās dialoglogs netiek aizvērts.)\n"
+"\n"
+"\n"
+"Dienas\n"
+" Diena:\n"
+" izvēlieties dienas, kurās aktivizēt modinātāju.\n"
+"\n"
+" Laiks:\n"
+" izvēlieties modinātāja laiku katrai dienai vai arī\n"
+" pārslēgšanas pogu, lai izmantotu noklusēto laiku.\n"
+"\n"
+"\n"
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minūtes"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Skaļums\n"
+" Izdzišana:\n"
+" samazināt skaļumu līdz izvēlētajam līmenim\n"
+" šādā laika periodā.\n"
+"\n"
+" Sākt pie:\n"
+" sākt samazināt no šāda skaļuma līmeņa.\n"
+"\n"
+" Beigas:\n"
+" skaļums, pie kāda apturēt izdzišanu. Ja izdzišanas\n"
+" laiks ir 0, tad iestatīt skaļumu uz šo un sākt atskaņošanu.\n"
+"\n"
+"\n"
+"Opcijas:\n"
+" papildu komanda:\n"
+" palaist šo komandu, noskanot modinātājam.\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Kluss pēc:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+" Repertuārs:\n"
+" ielādēt šo repertuāru. Ja repertuārs\n"
+" netiek norādīts, tiks izmantots pašreizējais.\n"
+" Šeit ir iespējams ievadīt arī mp3/ogg straumi.\n"
+"\n"
+" Atgādinājums:\n"
+" atskanot modinātājam, parādīt atgādinājumu.\n"
+" Ierakstiet atgādinājumu rāmītī un nospiediet\n"
+" pārslēgšanas pogu, ja vēlaties, lai atgādinājums\n"
+" tiek parādīts."
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Modināt (noklusējums):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Šis ir jūsu mošanās zvans."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Izvēlieties dienas, kurās ieslēgsies modinātājs"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Jūsu atgādinājums šodienai ir..."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Noklusētais"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Atgādinājums"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Diena"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Pirmdiena"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Otrdiena"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Trešdiena"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Ceturtdiena"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Piektdiena"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Sestdiena"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Svētdiena"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Pirmdiena"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Modinātājs iestatījumi"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Laiks"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Modināt (noklusējums):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Kluss pēc:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "stundas"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minūtes"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Izvēlieties dienas, kurās ieslēgsies modinātājs"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Diena"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Noklusētais"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Dienas"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Izdzišana"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "sekundes"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Skaļums"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Pašreizējais"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Sākumā"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Beigās"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Pašreizējais"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Papildu komanda"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "ieslēgt"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Repertuārs (neobligāts)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Izvēlieties repertuāru"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Atgādinājums"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Izmantot atgādinājumu"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Opcijas"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Ko šīs opcijas nozīmē?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nLaiks\n Modinātājs: \n Laiks, kad zvanīs modinātājs.\n\n Kluss pēc: \n Apturēt modinātāju pēc šāda laika perioda.\n (ja pamošanās dialoglogs netiek aizvērts)\n\n\nDienas\n Diena:\n Izvēlieties, kādās dienās modinātāju aktivizēt.\n\n Laiks:\n Izvēlieties modinātāja laiku katrā dienā, \n vai izvēlieties pārslēgšanas pogu, lai izmantotu\n noklusēto laiku.\n\n\nSkaļums\n Izdzišana:\n Samazināt skaļumu līdz izvēlētajam līmenim\n šādu laika periodu.\n\n Sākt:\n Sākt izdzišanu no šāda skaļuma līmeņa.\n\n Beigt: \n Skaļums, pie kāda apstādināt izdzišanu. Ja\n izdzišanas laiks ir 0, tad iestatiet skaļumu uz\n šo un sāciet atskaņošanu.\n\n\nOpcijas:\n Papildu komanda:\n Palaist šo komandu modināšanas laikā.\n\n Repertuārs: \n Ielādēt šo repertuāru, lai no tā atskaņotu\n dziesmas. Ja repertuārs nav dots, tiks izmantotas\n dziesmas, kuras pašreiz ir sarakstā.\n Šeit var tikt ievadīts arī mp3/ogg straumes URL.\n\n Atgādinātājs:\n Parādīt atgādinājumu, kad palaižas modinātājs;\n ierakstiet atgādinājumu rāmītī un ieslēdziet pārslēgšanas\n pogu, ja vēlaties, lai atgādinājumu parāda.\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Palīdzība"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Atcelt"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Jūsu atgādinājums šodienai ir.."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Paldies"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Albuma vāks"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Noklusētā PCM ierīce"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Noklusētā miksera ierīce"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA izvades spraudņa iestatījumi"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "PCM ierīce:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Miksera ierīce:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Miksera elements:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Apiet 'drain hangup' problēmai"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "ALSA izvades spraudnis atskaņotājam Audacious\nAutortiesības 2009-2012 John Lindgren\n\nPaldies William Pitcock, ALSA NG izvades spraudņa autoram, kura kods kalpoja kā paraugs, kad ar ALSA rokasgrāmatu vien nepietika."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"ALSA izvades spraudnis atskaņotājam Audacious\n"
+"Autortiesības 2009-2012 John Lindgren\n"
+"\n"
+"Paldies William Pitcock, ALSA NG izvades spraudņa autoram, kura kods kalpoja "
+"kā paraugs, kad ar ALSA rokasgrāmatu vien nepietika."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "ALSA izvade"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (MIDI atskaņotājs)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Jūs neesat izvēlējies nevienu sekvencera portu MIDI atskaņošanai. To varat izdarīt MIDI spraudņa iestatījumos."
+msgstr ""
+"Jūs neesat izvēlējies nevienu sekvencera portu MIDI atskaņošanai. To varat "
+"izdarīt MIDI spraudņa iestatījumos."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI atskaņotājs)"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "ALSA aizmugure "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Šī aizmugure sūta MIDI notikumus uz lietotāja izvēlētu ALSA sekvencera portu grupu. ALSA sekvencera saskarne ir ļoti daudzpusīga, tā var nodrošināt portus gan skaņas karšu aparatūras sintezatoriem (piem., emu10k1), gan arī programmatūras sintezatoriem, ārējām ierīcēm, u.c.\nŠī aizmugure neveido skaņu, MIDI notikumi tiek apstrādāti tieši no ierīcēm/ programmām aiz ALSA portiem; piemēram, MIDI notikumi, kas sūtīti uz aparatūras sintezatoru, tiks atskaņoti tieši.\nAizmuguri uzrakstījis Giacomo Lozito."
+msgstr ""
+"Šī aizmugure sūta MIDI notikumus uz lietotāja izvēlētu ALSA sekvencera portu "
+"grupu. ALSA sekvencera saskarne ir ļoti daudzpusīga, tā var nodrošināt "
+"portus gan skaņas karšu aparatūras sintezatoriem (piem., emu10k1), gan arī "
+"programmatūras sintezatoriem, ārējām ierīcēm, u.c.\n"
+"Šī aizmugure neveido skaņu, MIDI notikumi tiek apstrādāti tieši no ierīcēm/ "
+"programmām aiz ALSA portiem; piemēram, MIDI notikumi, kas sūtīti uz "
+"aparatūras sintezatoru, tiks atskaņoti tieši.\n"
+"Aizmuguri uzrakstījis Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "FluidSynth aizmugure "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Šī aizmugure izveido skaņu, sūtot MIDI notikumus uz FluidSynth, reāllaika programmatūras sintezatoru, kas balstīts uz SoundFont2 specifikāciju (www.fluidsynth.org).\nIzveidotā skaņa var mainīta ar atskaņotāja efektu spraudņu palīdzību, un tā tiek apstrādāta ar izvēlēto izvades spraudni.\nAizmuguri uzrakstījis Giacomo Lozito."
+msgstr ""
+"Šī aizmugure izveido skaņu, sūtot MIDI notikumus uz FluidSynth, reāllaika "
+"programmatūras sintezatoru, kas balstīts uz SoundFont2 specifikāciju (www."
+"fluidsynth.org).\n"
+"Izveidotā skaņa var mainīta ar atskaņotāja efektu spraudņu palīdzību, un tā "
+"tiek apstrādāta ar izvēlēto izvades spraudni.\n"
+"Aizmuguri uzrakstījis Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Ports"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Klienta nosaukums"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Porta nosaukums"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "ALSA izvades porti"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Skaņas karte: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Miksera kontrole: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Miksera iestatījumi"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "ALSA\naizmugure"
+msgstr ""
+"ALSA\n"
+"aizmugure"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - aizmugures informācija"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Aizmugures izvēle"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Atskaņošanas iestatījumi"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Pārlikt: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Bungu pārbīde: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Paplašinātie iestatījumi"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "aprēķināt garumus MIDI failiem repertuārā iepriekš"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "izvilkt komentārus no MIDI failiem (ja pieejami)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "izvilkt dziesmu vārdu tekstus no MIDI failiem (ja pieejami)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - izvēlieties failu"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "AMIDI-Plug iestatījumi"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug — izvēlieties SoundFont failu"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "SoundFont iestatījumi"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Faila nosaukums"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Izmērs (baitos)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Ielādēt SF palaižot atskaņotāju"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Ielādēt SF pie pirmās MIDI faila atskaņošanas"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Sintezatora iestatījumi"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "pastiprinājums"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "izmantot noklusēto"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "vērtība:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "polifonija"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "atbalss"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "jā"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "nē"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "koris"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
-msgstr "iztveršanas temps"
+msgstr "diskretizācijas frekvence"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "pielāgots "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "FluidSynth\naizmugure"
+msgstr ""
+"FluidSynth\n"
+"aizmugure"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nosaukums:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " MIDI informācija "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formāts:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Garums (ms):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Celiņu skaits:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "mainīgais"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Laika dalītājs:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI Komentāri un dziesmu vārdu teksti "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* komentāri šajā MIDI failā nav pieejami *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* dziesmu vārdu teksti šajā MIDI failā nav pieejami *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (nederīgs UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
-msgstr "About AMIDI-Plug"
+msgstr "About AMIDI spraudni"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI spraudnis"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -606,7 +675,26 @@
 "\n"
 "Tony Vroon\n"
 "for the good help with alpha testing"
-msgstr "\nmodulārs MIDI mūzikas atskaņotājs\nhttp://www.develia.org/projects.php?p=amidiplug\n\nautors Giacomo Lozito\n<james@develia.org>\n\nīpašs paldies...\n\nClemens Ladisch un Jaroslav Kysela\npar viņu jaukajām programmām aplaymidi un amixer;\nšīs programmas, līdz ar alsa-lib dokumentāciju, bija ļoti\nnoderīgas, lai uzzinātu vairāk par ALSA API\n\nAlfredo Spadafina\npar jauku midi klaviatūras logo\n\nTony Vroon\npar palīdzību alfa-testēšanā"
+msgstr ""
+"\n"
+"modulārs MIDI mūzikas atskaņotājs\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"autors Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"īpašs paldies...\n"
+"\n"
+"Clemens Ladisch un Jaroslav Kysela\n"
+"par viņu jaukajām programmām aplaymidi un amixer;\n"
+"šīs programmas, līdz ar alsa-lib dokumentāciju, bija ļoti\n"
+"noderīgas, lai uzzinātu vairāk par ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"par jauku midi klaviatūras logo\n"
+"\n"
+"Tony Vroon\n"
+"par palīdzību alfa-testēšanā"
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
@@ -649,7 +737,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Palaiž OSD, kad, atskaņošanas laikā, dziesmas nosaukums mainās, bet faila nosaukums paliek nemainīgs. Tas galvenokārt ir noderīgi, lai attēlotu interneta straumju nosaukumu maiņu."
+msgstr ""
+"Palaiž OSD, kad, atskaņošanas laikā, dziesmas nosaukums mainās, bet faila "
+"nosaukums paliek nemainīgs. Tas galvenokārt ir noderīgi, lai attēlotu "
+"interneta straumju nosaukumu maiņu."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -781,8 +872,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Kompozitēšanas pārvaldnieks nav atrasts;\nja vien esat pārliecināts, ka jums tas ir palaists, lūdzu, aktivizējiet kompozitēšanas pārvaldnieku, citādi OSD nefunkcionēs pareizi"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Kompozitēšanas pārvaldnieks nav atrasts;\n"
+"ja vien esat pārliecināts, ka jums tas ir palaists, lūdzu, aktivizējiet "
+"kompozitēšanas pārvaldnieku, citādi OSD nefunkcionēs pareizi"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -845,47 +940,47 @@
 msgid "Misc"
 msgstr "Dažādi"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "ASXv1/ASXv2 repertuāri"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious repertuāri (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Krāsa"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Bauer stereofoniski-uz-binaurāli iestatījumi"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Barošanas līmenis:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Nogriešanas frekvence:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Gatavie regulējumi:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Bauer stereofoniski-uz-binaurāli (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Spektra analizators"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -895,233 +990,247 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "Autortiesības (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> un citi.\n\nLiels paldies libcdio izstrādātājiem <http://www.gnu.org/software/libcdio/>\nun libcddb izstrādātājiem <http://libcddb.sourceforge.net/>.\n\nPaldies arī Tony Vroon par padomiem.\n\nŠis bija Google Summer of Code 2007 projekts."
+msgstr ""
+"Autortiesības (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> un citi.\n"
+"\n"
+"Liels paldies libcdio izstrādātājiem <http://www.gnu.org/software/libcdio/>\n"
+"un libcddb izstrādātājiem <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Paldies arī Tony Vroon par padomiem.\n"
+"\n"
+"Šis bija Google Summer of Code 2007 projekts."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Ierīce"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Lasīšanas ātrums:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Aizstāt ierīci:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metadati"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Lietot CD-text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Lietot CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Lietot HTTP nevis CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Serveris:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Ceļš:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Ports:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Audio CD spraudnis"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Neizdevās inicializēt cdio apakšsistēmu."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Nederīgs URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Celiņš %d netika atrasts."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Celiņš %d ir datu celiņš."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Neizdevās atvērt audio izvadi."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Kļūda nolasot audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Neizdevās atvērt CD ierīci %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "Netika atrasts CD dzinis ar audio atskaņošanas iespēju."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Neizdevās pabeigt inicializēt atvērtu CD dzini."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Neizdevās saņemt pirmā/pēdējā celiņa numuru."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Neizdevās nolasīt LSN sākumu/beigas celiņam %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Neizdevās izveidot cddb savienojumu."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Neizdevās aptaujāt CDDB serveri."
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Neizdevās aptaujāt CDDB serveri: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Neizdevās nolasīt cddb informāciju: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Dzinis ir tukšs."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Neatbalstīts diska tips."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Atskaņot CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Pievienot CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Audio CD izvēlnes elementi"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Kompresija"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Centra skaļums:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Dinamiskais diapazons:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Dinamiskā diapozona kompresijas spraudnis atskaņotājam\nAudacious\nAutortiesības 2010-2012 John Lindgren"
+msgstr ""
+"Dinamiskā diapozona kompresijas spraudnis atskaņotājam\n"
+"Audacious\n"
+"Autortiesības 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Dinamiskā diapazona kompresors"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Spēļu konsoles mūzikas dekodētājs"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Vispārīgi"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Atskaņošana"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Bass:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "sekundes"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Augstie toņi:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Noklusētais dziesmas garums:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Iztveršanas tempa pārveidošana"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Ieslēgt audio iztveršanas tempa pārveidošanu"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Iztveršanas temps:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignorēt garums no SPC tagiem"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Palielināt atbalsi"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "noklusētais dziesmas garums, izteikts sekundēs, tiks izmantots dziesmām, kuras nenodrošina ar garuma informāciju (piem., celiņi, kas atkārtojas)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"noklusētais dziesmas garums, izteikts sekundēs, tiks izmantots dziesmām, "
+"kuras nenodrošina ar garuma informāciju (piem., celiņi, kas atkārtojas)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1129,88 +1238,107 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "Konsoļu mūzikas dekodētāja dzinējs, balstīts uz Game Music Emu 0.5.2\nAtbalstītie formāti: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n\nAudacious spraudņa autori:\nWilliam Pitcock <nenolod@dereferenced.org>\nShay Green <gblargg@gmail.com>"
+msgstr ""
+"Konsoļu mūzikas dekodētāja dzinējs, balstīts uz Game Music Emu 0.5.2\n"
+"Atbalstītie formāti: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious spraudņa autori:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "Sapludināšana neizdevās, jo dziesmām ir dažāds kanālu skaits. Varat izmantot kanālu mikseri, lai pārveidotu abas dziesmas uz vienādu kanālu skaitu."
+msgstr ""
+"Sapludināšana neizdevās, jo dziesmām ir dažāds kanālu skaits. Varat izmantot "
+"kanālu mikseri, lai pārveidotu abas dziesmas uz vienādu kanālu skaitu."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Sapludināšana neizdevās, jo dziesmām ir dažādas iztveršanas frekvences. Varat izmantot iztveršanas frekvenču pārveidotāju, lai pārveidotu dziesmas uz vienu iztveršanas frekvenci."
+msgstr ""
+"Sapludināšana neizdevās, jo dziesmām ir dažādas diskretizācijas frekvences. "
+"Varat izmantot diskretizācijas frekvenču pārveidotāju, lai pārveidotu "
+"dziesmas uz vienu diskretizācijas frekvenci."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Sapludināšanas spraudnis atskaņotājam Audacious\nAutortiesības 2010-2012 John Lindgren"
+msgstr ""
+"Sapludināšanas spraudnis atskaņotājam Audacious\n"
+"Autortiesības 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Sapludināšana"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Pārklāšanās:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Sapludināšana"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Kristalizators"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intensitāte:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Kristalizators"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Cue lapas spraudnis"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Atbalss"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Aizture:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Atbilde:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Skaļums:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Atbalss spraudnis\nAutors Johan Levin, 1999\n\nIeskaujošās atbalss autors Carl van Schaik, 1999"
+msgstr ""
+"Atbalss spraudnis\n"
+"Autors Johan Levin, 1999\n"
+"\n"
+"Ieskaujošās atbalss autors Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Atbalss"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1218,9 +1346,15 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Daudzformātu audio dekodēšanas spraudnis atskaņotājam Audacious,\nizmantojot FFMpeg multitvides karkasu (http://www.ffmpeg.org/)\n\nAudacious spraudņa autori:\nWilliam Pitcock <nenolod@nenolod.net>\nMatti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Daudzformātu audio dekodēšanas spraudnis atskaņotājam Audacious,\n"
+"izmantojot FFMpeg multitvides karkasu (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious spraudņa autori:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg spraudnis"
 
@@ -1288,7 +1422,19 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Šī ir brīvā programmatūra. Jūs varat to izplatīt un/vai modificēt saskaņā\nar GNU GPL licenses nosacījumiem, kurus publicējis Free Software\nFoundation; lietojiet licenses 2. versiju, vai arī (pēc jūsu izvēles)\njebkuru vēlāku versiju.\n\nŠī programma tiek izplatīta cerot, ka tā būs noderīga, bet BEZ JEBKĀDAS\nGARANTIJAS; pat PIEPRASĪJUMA vai NODERĪBAS ĪPAŠAM MĒRĶIM garantijas.\nSīkākai informācijai skatiet GNU General Public License.\n\nGNU GPL licenses kopijai vajadzētu būt saņemtai kopā ar šo programmu.\nJa tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\nFifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Šī ir brīvā programmatūra. Jūs varat to izplatīt un/vai modificēt saskaņā\n"
+"ar GNU GPL licenses nosacījumiem, kurus publicējis Free Software\n"
+"Foundation; lietojiet licenses 2. versiju, vai arī (pēc jūsu izvēles)\n"
+"jebkuru vēlāku versiju.\n"
+"\n"
+"Šī programma tiek izplatīta cerot, ka tā būs noderīga, bet BEZ JEBKĀDAS\n"
+"GARANTIJAS; pat PIEPRASĪJUMA vai NODERĪBAS ĪPAŠAM MĒRĶIM garantijas.\n"
+"Sīkākai informācijai skatiet GNU General Public License.\n"
+"\n"
+"GNU GPL licenses kopijai vajadzētu būt saņemtai kopā ar šo programmu.\n"
+"Ja tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\n"
+"Fifth Floor, Boston, MA 02110-1301, USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1302,11 +1448,13 @@
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1320,7 +1468,7 @@
 
 #: src/filewriter/mp3.c:737
 msgid "Output Samplerate:"
-msgstr "Izvades iztveršanas temps:"
+msgstr "Izvades diskretizācijas frekvence:"
 
 #: src/filewriter/mp3.c:765
 msgid "(Hz)"
@@ -1354,7 +1502,7 @@
 msgid "Error protection"
 msgstr "Kļūdu aizsardzība"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Kvalitāte"
 
@@ -1434,429 +1582,500 @@
 msgid "Tags"
 msgstr "Tagi"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis kodētāja konfigurācija"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Kvalitātes līmenis (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "bezzudumu"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Oriģinālā koda autors\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Oriģinālā koda autors\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "FLAC dekodētājs"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "GIO spraudnis atskaņotājam Audacious\nAutortiesības 2009-2012 John Lindgren"
+msgstr ""
+"GIO spraudnis atskaņotājam Audacious\n"
+"Autortiesības 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "GIO spraudnis"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL spektra analizators atskaņotājam Audacious\n"
+"Autortiesības 2013 Christophe Budé un John Lindgren\n"
+"\n"
+"Balstīts uz XMMS spraudni:\n"
+"Autortiesības 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson "
+"un 4Front Technologies\n"
+"\n"
+"Licence: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL spektra analizators"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Gnome īsceļu spraudnis\nĻauj kontrolēt atskaņotāju ar Gnome īsceļiem.\n\nAutortiesības (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"Gnome īsceļu spraudnis\n"
+"Ļauj kontrolēt atskaņotāju ar Gnome īsceļiem.\n"
+"\n"
+"Autortiesības (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Gnome īsceļi"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Ieraksta numurs"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Nosaukums"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Izpildītājs"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Gads"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Albums"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Celiņš"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Žanrs"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Novietojums rindā"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Ilgums"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Faila ceļš"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Faila nosaukums"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Pielāgots nosaukums"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Bitātrums"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Izvēlēties kolonnas"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Pieejams:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Izvēlēts:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Pietauvot pa kreisi"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Pietauvot pa labi"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Pietauvot augšā"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Pietauvot apakšā"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Attauvot"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Atslēgt"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "Atvērt _failus ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Atvērt _URL ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "Pievienot f_ailus ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Pievienot U_RL ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Meklēt bibliotēkā"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "_Par ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Iestatījumi ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "I_ziet"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "A_tskaņot"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Pauz_e"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "_Iepriekšējais"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Nākamais"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "_Atkārtot"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "_Jaukt"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "Ne_virzīties uz priekšu repertuārā"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Apt_urēt pēc pašreizējās dziesmas"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Apt_urēt pēc šīs dziesmas"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "Dziesmas _info ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Pāriet uz _laiku ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "Pāriet uz _dziesmu ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Pēc celiņa _numura"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Iestatīt atkārtojuma punktu _A"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Iestatīt atkārtojuma punktu _B"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "_Notīrīt atkārtojuma punktus"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Pēc n_osaukuma"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "Pēc _faila nosaukuma"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "Pēc faila _ceļa"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Pēc celiņa _numura"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Pēc _izpildītāja"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
 msgstr "Pēc a_lbuma"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Pēc izlaišanas _datuma"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "Pēc _ilguma"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Pēc _faila ceļa"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Pēc _pielāgota nosaukuma"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "Apgri_eztā kārtībā"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "Nejaušā _kārtībā"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Atskaņot šo repertuāru"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "A_tsvaidzināt"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Izņemt _nepieejamos failus"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Kārtot"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Kārtot iezīmētos"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Izņemt _dublikātus"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Izņemt _nepieejamos failus"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Jauns"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Pā_rdēvēt ..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "Ai_zvērt"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importēt ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Eksportēt ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Reper_tuāru pārvaldnieks ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Ri_ndas pārvaldnieks ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "_Palielināt skaļumu"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "_Samazināt skaļumu"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Balansieris"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_fekti"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "S_askarne"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Vizualizācijas"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Rādīt _izvēlnes joslu"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Rādīt i_nfoapgabalu"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Rādīt infoapgabala viz_ualizāciju"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Rādīt _stāvokļjoslu"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Rādīt a_tlikušo laiku"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Rādīt ai_zvēršanas pogas"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Rādīt kolonnu _galvenes"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Izvēlēties _kolonnas ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Ritināt, _dziesmām mainoties"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Fails"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Atskaņošana"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Repertuārs"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Servisi"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "I_zvade"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "S_kats"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "Ie_rindot/Izņ. no rindas"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "_Izgriezt"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Kopēt"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "I_elīmēt"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Iezīmēt _visu"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "Pā_rdēvēt ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "GTK saskarne"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Buferizācija ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Kļūda"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1864,113 +2083,124 @@
 msgstr[1] "%d kanāli"
 msgstr[2] "%d kanālu"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr "Iepriekšējais celiņš"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Atskaņot"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pauze/Atsākt"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Stop"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "Nākamais celiņš"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
 msgstr "Uz priekšu par 5 sekundēm"
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
 msgstr "Atpakaļ par 5 sekundēm"
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
 msgstr "Apklusināt"
 
-#: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Palielināt skaļumu"
+#: src/hotkey/gui.c:78
+msgid "Volume up"
+msgstr "Skaļāk"
 
-#: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Samazināt skaļumu"
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr "Klusāk"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
 msgstr "Pāriet uz failu"
 
-#: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
 msgstr "Pārslēgt atskaņotāja logu(s)"
 
-#: src/hotkey/gui.c:84
+#: src/hotkey/gui.c:82
 msgid "Show On-Screen-Display"
-msgstr "Parādīt uz-ekrāna-attēlu"
+msgstr "Parādīt virsekrāna displeju"
 
-#: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
 msgstr "Pārslēgt atkārtošanu"
 
-#: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
 msgstr "Pārslēgt jaukšanu"
 
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr "Pārslēgt atkārtošanu pēc pašreizējā"
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
 msgstr "Pacelt atskaņotāja logu(s)"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(nekas)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Nav ieteicams piesaistīt primārās peles pogas bez modificētājtaustiņiem.\n\nVai vēlaties turpināt?"
+msgstr ""
+"Nav ieteicams piesaistīt primārās peles pogas bez modificētājtaustiņiem.\n"
+"\n"
+"Vai vēlaties turpināt?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Piesaista peles pogas"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Globālo īsinājumtaustiņu spraudņa konfigurācija"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Nospiediet taustiņu kombināciju teksta laukā.\nJūs varat piesaistīt arī peles pogas."
+msgstr ""
+"Nospiediet taustiņu kombināciju teksta laukā.\n"
+"Jūs varat piesaistīt arī peles pogas."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Īsinājumtaustiņi:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Darbība:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Taustiņa piesaiste:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1983,104 +2213,131 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "Globālo īsinājumtaustiņu spraudnis\nKontrolējiet atskaņotāju ar globālām taustiņu kombinācijām vai multitvides\ntaustiņiem.\n\nAutortiesības (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nPienesums arī no:\nAutortiesības (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nAutortiesības (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n Bryn Davies <curious@ihug.com.au>,\n Jonathan A. Davis <davis@jdhouse.org>,\n Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"Globālo īsinājumtaustiņu spraudnis\n"
+"Kontrolējiet atskaņotāju ar globālām taustiņu kombinācijām vai multitvides\n"
+"taustiņiem.\n"
+"\n"
+"Autortiesības (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Pienesums arī no:\n"
+"Autortiesības (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Autortiesības (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Globālie īsinājumtaustiņi"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Balstīts uz xmms-jack, autors Chris Morgan:\nhttp://xmms-jack.sourceforge.net/\n\nAudacious ports — Giacomo Lozito"
+msgstr ""
+"Balstīts uz xmms-jack, autors Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Audacious ports — Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "JACK izvade"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s iestatījumi"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "LADSPA saimnieka iestatījumi"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Moduļu ceļi:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Vairākus ceļus atdaliet ar kolu.\nŠie ir papildu ceļi mainīgajā LADSPA_PATH esošajiem.\nPēc jauno ceļu pievienošanas nospiediet 'Enter', lai skenētu jaunos spraudņus."
+msgstr ""
+"Vairākus ceļus atdaliet ar kolu.\n"
+"Šie ir papildu ceļi mainīgajā LADSPA_PATH esošajiem.\n"
+"Pēc jauno ceļu pievienošanas nospiediet 'Enter', lai skenētu jaunos "
+"spraudņus."
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Pieejamie spraudņi:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Ieslēgt"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Ieslēgtie spraudņi:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "LADSPA saimnieks atskaņotājam Audacious\nAutortiesības 2011 John Lindgren"
+msgstr ""
+"LADSPA saimnieks atskaņotājam Audacious\n"
+"Autortiesības 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "LADSPA saimnieks"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: neizdevās inicializēt LIRC atbalstu\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: neizdevās nolasīt LIRC konf. failu\n%s: lūdzu, lasiet LIRC dokumentācijā\n%s: kā izveidot pareizu konf. failu\n"
+msgstr ""
+"%s: neizdevās nolasīt LIRC konf. failu\n"
+"%s: lūdzu, lasiet LIRC dokumentācijā\n"
+"%s: kā izveidot pareizu konf. failu\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: mēģina pieslēgties vēlreiz...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: nezināma komanda \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: atvienots no LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: tiks mēģināts pieslēgties vēlreiz katras %d sekundes...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2094,155 +2351,324 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "Vienkāršs spraudnis Audacious vadīšanai izmantojot LIRC attālinātās vadības\ndēmonu\n\nAudacious adaptācijas autori:\nTony Vroon <chainsaw@gentoo.org>\nJoonas Harjumäki <jharjuma@gmail.com>\n\nBalstīts uz XMMS LIRC spraudņa, kura autori ir:\nCarl van Schaik <carl@leg.uct.ac.za>\nChristoph Bartelmus <xmms@bartelmus.de>\nAndrew O. Shadoura <bugzilla@tut.by>\n\nPapildu informācijai par LIRC skatiet http://lirc.org."
+msgstr ""
+"Vienkāršs spraudnis Audacious vadīšanai izmantojot LIRC attālinātās vadības\n"
+"dēmonu\n"
+"\n"
+"Audacious adaptācijas autori:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Balstīts uz XMMS LIRC spraudņa, kura autori ir:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Papildu informācijai par LIRC skatiet http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Savienojums"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Pieslēgties vēlreiz LIRC serverim"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Gaidīt, pirms atkārtoti pieslēgties:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "LIRC spraudnis"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Dziesmu vārdu teksti nav pieejami"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Neizdevās saņemt %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Neizdevās parsēt %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Meklē dziesmas vārdu tekstu ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Trūkst dziesmas metadatu"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Pieslēdzas lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki spraudnis"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "M3U repertuāri"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takts ģenerators: %d sit./min."
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takts ģenerators: %d sit./min. %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "Takts ģenerators, autors Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nLai to izmantotu, pievienojiet URL: tact://sitienu*skaitītājs/saucējs\npiem., tact://77, lai atskaņotu 77 sitienus minūtē\nvai tact://60*3/4, lai atskaņotu 60 s/min 3/4 taktsmērā"
+msgstr ""
+"Takts ģenerators, autors Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Lai to izmantotu, pievienojiet URL: tact://sitienu*skaitītājs/saucējs\n"
+"piem., tact://77, lai atskaņotu 77 sitienus minūtē\n"
+"vai tact://60*3/4, lai atskaņotu 60 s/min 3/4 taktsmērā"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Takts ģenerators"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Kanālu miksera spraudnis atskaņotājam Audacious\nAutortiesības 2011-2012 John Lindgren un Michał Lipski"
+msgstr ""
+"Kanālu miksera spraudnis atskaņotājam Audacious\n"
+"Autortiesības 2011-2012 John Lindgren un Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Kanālu mikseris"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Izvades kanāli:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Kanālu mikseris"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "MMS spraudnis"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Izšķirtspēja"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bit"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bit"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Kanāli"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Iztveršanas tempa pārveidošana"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Tuvākais (ātrākais)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Lineārs (ātrs)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Splaina (labs)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Polifāzes (labākais)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Iztveršanas temps"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Līmenis:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Nogriešana:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Atbalss"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Basu pastiprinājums"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Ieskaušana"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Priekšpastiprinājums"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Dažādi"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Pārdiskretizācija"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Trokšņu samazināšana"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Atskaņot Amiga MOD-us"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Atkārtot"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Atkārtojumu skaits:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Lai atkārtotu bezgalīgi, iestaties skaitu uz -1."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (moduļu atskaņotājs)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Ieskaušana"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "MPG123 spraudnis"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 serveris"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS spraudnis"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Apturēts"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious pašreiz neatskaņo."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Balstīts uz libnotify-aosd, autors Maximilian Bogner:\nhttp://www.mbogner.de/projects/libnotify-aosd/\n\nAutors (C) 2010 Maximilian Bogner\nAutors (C) 2011 John Lindgren\n\nŠī ir brīvā programmatūra. Jūs varat to izplatīt un/vai modificēt saskaņā\nar GNU GPL licenses nosacījumiem, kurus publicējis Free Software\nFoundation; lietojiet licenses 3. versiju, vai arī (pēc jūsu izvēles)\njebkuru vēlāku versiju.\n\nŠis spraudnis tiek izplatīts cerot, ka tas būs noderīgs, bet BEZ JEBKĀDAS\nGARANTIJAS; pat PIEPRASĪJUMA vai NODERĪBAS ĪPAŠAM MĒRĶIM garantijas.\nSīkākai informācijai skatiet GNU General Public License.\n\nGNU GPL licenses kopijai vajadzētu būt saņemtai kopā ar šo programmu.\nJa tā nav, skatiet: <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Darbvirsmas paziņojumu spraudnis atskaņotājam Audacious\n"
+"Autortiesības (C) 2010 Maximilian Bogner\n"
+"Autortiesības (C) 2011-2013 John Lindgren un Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Šis spraudnis ir brīvā programmatūra: varat to izplatīt un/vai modificēt zem "
+"GNU Vispārējās Publiskās licences, ko publicējis Brīvās Programmatūras fonds "
+"— licences versija 3 vai jebkura vēlāka.\n"
+"\n"
+"Šis spraudnis tiek izplatīts cerībā, ka tas būs noderīgs, bet BEZ JEBKĀDAS "
+"GARANTIJAS; pat bez IESPĒJAS PĀRDOT vai PIEMĒROTĪBAS NOTEIKTAM MĒRĶIM "
+"garantijas. Lai iegūtu vairāk detaļu, skatiet GNU Vispārējo Publisko "
+"licenci.\n"
+"\n"
+"GNU Vispārējās Publiskās licences kopijai vajadzētu būt saņemtai kopā ar šo "
+"programmu. Ja tā nav, skatiet <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Rādīt atskaņošanas vadīklas"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Vienmēr rādīt paziņojumu"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Darbvirsmas paziņojumi"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Rādīt"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pauze"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Nākamais"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. noklusētā ierīce"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Audio ierīce:"
 
@@ -2267,22 +2693,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "OSS4 izvades spraudnis atskaņotājam Audacious\nAutortiesības 2010-2012 Michał Lipski\n\nAutors vēlas pateikties cilvēkiem kanālā #audacious, īpaši Tony Vroon un John Lindgren, un, protams, iepriekšējā OSS spraudņa autoriem."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"OSS4 izvades spraudnis atskaņotājam Audacious\n"
+"Autortiesības 2010-2012 Michał Lipski\n"
+"\n"
+"Autors vēlas pateikties cilvēkiem kanālā #audacious, īpaši Tony Vroon un "
+"John Lindgren, un, protams, iepriekšējā OSS spraudņa autoriem."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "OSS4 izvade"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "PLS repertuāri"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 dekodētājs"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2300,155 +2732,231 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Audacious PulseAudio izvades spraudnis\n\nŠī ir brīvā programmatūra. Jūs varat to izplatīt un/vai modificēt saskaņā\nar GNU GPL licenses nosacījumiem, kurus publicējis Free Software\nFoundation; lietojiet licenses 2. versiju, vai arī (pēc jūsu izvēles)\njebkuru vēlāku versiju.\n\nŠī programma tiek izplatīta cerot, ka tā būs noderīga, bet BEZ JEBKĀDAS\nGARANTIJAS; pat PIEPRASĪJUMA vai NODERĪBAS ĪPAŠAM MĒRĶIM garantijas.\nSīkākai informācijai skatiet GNU General Public License.\n\nGNU GPL licenses kopijai vajadzētu būt saņemtai kopā ar šo programmu.\nJa tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\nFifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Audacious PulseAudio izvades spraudnis\n"
+"\n"
+"Šī ir brīvā programmatūra. Jūs varat to izplatīt un/vai modificēt saskaņā\n"
+"ar GNU GPL licenses nosacījumiem, kurus publicējis Free Software\n"
+"Foundation; lietojiet licenses 2. versiju, vai arī (pēc jūsu izvēles)\n"
+"jebkuru vēlāku versiju.\n"
+"\n"
+"Šī programma tiek izplatīta cerot, ka tā būs noderīga, bet BEZ JEBKĀDAS\n"
+"GARANTIJAS; pat PIEPRASĪJUMA vai NODERĪBAS ĪPAŠAM MĒRĶIM garantijas.\n"
+"Sīkākai informācijai skatiet GNU General Public License.\n"
+"\n"
+"GNU GPL licenses kopijai vajadzētu būt saņemtai kopā ar šo programmu.\n"
+"Ja tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\n"
+"Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "PulseAudio izvade"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Iztveršanas frekvences pārveidotāja spraudnis atskaņotājam\nAudacious\nAutortiesības 2010-2012 John Lindgren"
+msgstr ""
+"Diskretizācijas frekvences pārveidotāja spraudnis atskaņotājam\n"
+"Audacious\n"
+"Autortiesības 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Izlaist/atkārtot paraugus"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Lineārā interpolācija"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Ātrā sinc interpolācija"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Vidējā sinc interpolācija"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Labākā sinc interpolācija"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Pārveidošana"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Metode:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Temps:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Tempu kartējumi:"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Lietot tempu kartējumus"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
-msgstr "Iztveršanas tempa pārveidotājs"
+msgstr "Diskretizācijas frekvences pārveidotājs"
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "Labi. Nosūta atskaņojumu lietotājam: %s"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Pieeja liegta"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Mainīt paroli"
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Nospiediet uz sekojošās saites, lai ļautu Audacious nosūtīt jūsu "
+"atskaņojumus:"
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Servisi"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Paturiet šo logu atvērtu un vēlreiz noklikšķiniet uz 'Pārbaudīt pieeju'.\n"
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"Neuztraucieties. Jūsu atskaņojumi ir saglabāti jūsu datorā.\n"
+"Tie tiks nosūtīti tiklīdz Audacious tiks dota atļauja."
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Lietotājvārds:"
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Tīkla problēma."
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Parole:"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "Radās problēma, sazinoties ar Last.fm. Lūdzu, vēlāk mēģiniet vēlreiz."
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "Scrobbler URL:"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Pārbauda..."
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "Pār_baudīt pieeju"
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "At_celt pieeju"
+
+#: src/scrobbler2/config_window.c:221
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr "Jums jāatļauj Audacious nosūtīt atskaņojumu uz savu Last.fm kontu.\n"
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Neizdevās palaist atskaņojumu nosūtītāja spraudni.\n"
+"Iespējams, jūsu instalācijā radusies problēma."
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Audacious atskaņojumu nosūtīšanas spraudnis 2.0, autors Pitxyoki,\n"
+"\n"
+"Autortiesības © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Paldies John Lindgren par palīdzību projekta sākumā.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Audacious AudioScrobbler spraudnis\n\nOriģinālais autors Audun Hove <audun@nlc.no> un Pipian <pipian@pipian.com>"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Atskaņojumu nosūtītājs 2.0"
 
-#: src/sdlout/plugin.c:27
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious pašlaik izmanto Last.fm atskaņojumu nosūtītāja uzlabotu versiju.\n"
+"Lūdzu, pārbaudiet atskaņojumu nosūtītāja spraudņa iestatījumus."
+
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "SDL izvades spraudnis atskaņotājam Audacious\nAutortiesības 2010 John Lindgren"
+msgstr ""
+"SDL izvades spraudnis atskaņotājam Audacious\n"
+"Autortiesības 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "SDL izvade"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Bibliotēka"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Nezināms izpildītājs"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Nezināms albums"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\n albumā %s, izpilda %s"
+msgstr ""
+"%s\n"
+" albumā %s, izpilda %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
@@ -2456,7 +2964,7 @@
 msgstr[1] "%d albumi"
 msgstr[2] "%d albumu"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2464,11 +2972,17 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d dziesma"
-msgstr[1] "%s\n %s, %d dziesmas"
-msgstr[2] "%s\n %s, %d dziesmu"
+msgstr[0] ""
+"%s\n"
+" %s, %d dziesma"
+msgstr[1] ""
+"%s\n"
+" %s, %d dziesmas"
+msgstr[2] ""
+"%s\n"
+" %s, %d dziesmu"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2476,77 +2990,85 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d dziesma ar izpildītāju %s"
-msgstr[1] "%s\n %d dziesmas ar izpildītāju %s"
-msgstr[2] "%s\n %d dziesmu ar izpildītāju %s"
+msgstr[0] ""
+"%s\n"
+" %d dziesma ar izpildītāju %s"
+msgstr[1] ""
+"%s\n"
+" %d dziesmas ar izpildītāju %s"
+msgstr[2] ""
+"%s\n"
+" %d dziesmu ar izpildītāju %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "Iz_veidot repertuāru"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "Pi_evienot repertuāru"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Meklēt bibliotēkā"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Lai importētu jūsu mūzikas bibleotēku atskaņotājā Audacious, izvēlieties mapi un nospiediet uz ikonas \"atsvaidzināt\"."
+msgstr ""
+"Lai importētu jūsu mūzikas bibleotēku atskaņotājā Audacious, izvēlieties "
+"mapi un nospiediet uz ikonas \"atsvaidzināt\"."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Lūdzu, uzgaidiet ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Izvēlieties mapi"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Meklēšanas rīks"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Winamp klasiskā saskarne"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "A_tskaņotājs:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Izvēlieties galvenā atskaņotāja loga fontu:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "Re_pertuārs:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Izvēlieties repertuāra fontu:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Fonti"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Lietot bitmap fontus (atbalsta tikai ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Ritināt dziesmas nosaukumu abos virzienos"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Apdare"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Saskarnes iestatījumi"
 
@@ -2602,7 +3124,7 @@
 msgid "Presets"
 msgstr "Gatavie regulējumi"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Ielādēt sākumuzstādījumu"
 
@@ -2615,7 +3137,7 @@
 msgid "Load equalizer preset"
 msgstr "Ielādēt balansiera sākumuzstādījumu"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Saglabāt sākumuzstādījumu"
 
@@ -2627,7 +3149,7 @@
 msgid "Save equalizer preset"
 msgstr "Saglabāt balansiera sākumuzstādījumu"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Dzēst sākumuzstādījumu"
 
@@ -2635,739 +3157,752 @@
 msgid "Delete auto-preset"
 msgstr "Dzēst auto-sākumuzstādījumu"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Pāriet uz %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Skaļums: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balanss: %d%% pa kreisi"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Balanss: centrs"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balanss: %d%% pa labi"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Iestatījumu izvēlne"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Izslēgt 'Vienmēr virspusē'"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Ieslēgt 'Vienmēr virspusē'"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Faila info lodziņš"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Vizualizēšanas izvēlne"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Vieninstances režīms."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Repertuāra režīms."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Aptur pēc pašreizējās dziesmas."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Neaptur pēc pašreizējās dziesmas."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Atkārtošanas punkts A iestatīts."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Atkārtošanas punkts B iestatīts."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Atkārtošanas punkti notīrīti."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Automātiski tīt dziesmas nosaukumu"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Apturēt pēc pašreizējās dziesmas"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Maksimumi"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Atkārtot"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Jaukt"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Nevirzīties uz priekšu repertuārā"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Rādīt atskaņotāju"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Rādīt repertuāra redaktoru"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Rādīt balansieri"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Vienmēr virspusē"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Uzlikt uz visām darbvirsmām"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Saritināt atskaņotāju"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Saritināt repertuāra redaktoru"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Saritināt balansieri"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analizators"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Loks"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Balss vizualizēšana"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Izslēgts"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normāls"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Uguns"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Vertikālas līnijas"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Līnijas"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Joslas"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Punktēts loks"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Līnijveida loks"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Aizpildīts loks"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Ledus"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Gluds"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Lēnākais"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lēni"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Vidēji"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Ātri"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Ātrākais"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Pavadītais laiks"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Atlikušais laiks"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pauze"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Iepriekšējais"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Nākamais"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Vizualizēšana"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Vizualizēšanas režīms"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Analizatora režīms"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Loka režīms"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Balss vizualizēšanas režīms"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Loga saritināšanas VU režīms"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Analizatora krišana"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Maksimumu krišana"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Repertuārs"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Atskaņot repertuāru"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Jauns repertuārs"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Iezīmēt nākamo repertuāru"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Iezīmēt iepriekšējo repertuāru"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Dzēst repertuāru"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Importēt repertuāru"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Ielādē repertuāra failu izvēlētajā repertuārā."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Eksportēt repertuāru"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Saglabā izvēlēto repertuāru."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Atsvaidzināt repertuāru"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Atsvaidzina ar repertuāra ierakstu saistītos metadatus."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Repertuāru pārvaldnieks"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Rindas pārvaldnieks"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Skatīt"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Saskarne"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Saskarnes iestatījumi ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Pievienot interneta adresi..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Pievieno repertuāram attālinātu celiņu."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Pievienot failus..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Pievieno failus repertuāram."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Meklēt un iezīmēt"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Meklē un atlasa repertuāra ierakstus, balstoties uz norādītajiem kritērijiem."
+msgstr ""
+"Meklē un atlasa repertuāra ierakstus, balstoties uz norādītajiem kritērijiem."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Apgriezt iezīmēto"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Invertē iezīmētos un neiezīmētos ierakstus."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Iezīmēt visus"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Iezīmē visus repertuāra ierakstus."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Notīrīt iezīmējumu"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Noņem iezīmējumu no visiem ierakstiem."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Izņemt visus"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Izņem no repertuāra visus ierakstus."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Notīrīt ierindošanu"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Notīra ar šo repertuāru saistīto ierindošanu."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Izņemt nepieejamos failus"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Izņem no repertuāra nepieejamos failus."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Izņemt dublikātus"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Pēc nosaukuma"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Izņem no repertuāra dublikātus pēc nosaukuma."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Pēc faila nosaukuma"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Izņem no repertuāra dublikātus pēc faila nosaukuma."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Pēc ceļa + faila nosaukuma"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Izņem no repertuāra dublikātus pēc to pilna ceļa."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Izņemt neiezīmētos"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Izņem no repertuāra neiezīmētos ierakstus."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Izņemt iezīmētos"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Izņem no repertuāra iezīmētos ierakstus."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Sajaukt repertuāru"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Sajauc repertuāra ierakstu atskaņošanas kārtību."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Apgriezt repertuāru"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Apgriež repertuāru."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Kārtot repertuāru"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Kārto repertuāru pēc nosaukuma."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Pēc albuma"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Kārto sarakstu pēc albuma."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Pēc izpildītāja"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Kārto repertuāru pēc izpildītāja."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Kārto repertuāru pēc faila nosaukuma."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Kārto repertuāru pēc pilnā ceļa."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Pēc datuma"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Kārto repertuāru pēc izmaiņas datuma."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Pēc celiņa numura"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Kārto repertuāru pēc celiņa numura."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Kārtot iezīmētos"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Fails"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Spraudņu servisi"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Skatīt celiņa detaļas"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Skatīt celiņa detaļas"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Par Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Atskaņot failu"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Ielādēt un atskaņot failu"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Atskaņot vietu"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Atskaņot multitvides failu no izvēlētās vietas"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Spraudņu servisi"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Iestatījumi"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Atver iestatījumu logu"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Aizver Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Uzstādīt A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Notīrīt A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Pāriet uz failu"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Pāriet uz laiku"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Pārslēgt ierindošanau"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Ieslēdz/izslēdz repertuāra ieraksta ierindošanu."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Kopēt"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Izgriezt"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Ielīmēt"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Ielādēt"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importēt"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Saglabāt"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Dzēst"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Sākumuzstādījumi"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Auto-ielādes sākumuzstādījums"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Ielādē auto-ielādes sākumuzstādījumu"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Ielādēt noklusēto sākumuzstādījumu"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Nulle"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Uzstādīt balansiera sākumuzstādījumu līmeņus uz 0"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "No faila"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Ielādēt sākumuzstādījumu no faila"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "No WinAMP EQF faila"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Ielādēt sākumuzstādījumu no WinAMP EQF faila"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP sākumuzstādījumi"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importēt WinAMP sākumuzstādījumus"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Saglabāt auto-ielādes sākumuzstādījumu"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Saglabāt noklusēto sākumuzstādījumu"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Uz failu"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Saglabāt sākumuzstādījumu failā"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Uz WinAMP EQF failu"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Saglabāt sākumuzstādījumu WinAMP EQF failā"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Dzēst auto-ielādes sākumuzstādījumu"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Meklēt ierakstus aktīvajā repertuārā"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Iezīmējiet ierakstus repertuārā, aizpildot vienu vai vairākus laukus. Laukos jāizmanto regulāro izteiksmju sintakse, reģistrnejutīga. Ja neziniet, kā regulārās izteiksmes darbojas, vienkārši nosaukuma daļu tam, ko meklējat."
+msgstr ""
+"Iezīmējiet ierakstus repertuārā, aizpildot vienu vai vairākus laukus. Laukos "
+"jāizmanto regulāro izteiksmju sintakse, reģistrnejutīga. Ja neziniet, kā "
+"regulārās izteiksmes darbojas, vienkārši nosaukuma daļu tam, ko meklējat."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Nosaukums: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Albums: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Izpildītājs: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Faila nosaukums: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Notīrīt iepriekšējo iezīmējumu pirms meklēšanas"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Automātiski pārslēgt ierindošanu atbilstošajiem ierakstiem"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Izveidot jaunu repertuāru no atbilstošajiem ierakstiem"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Audacious repertuāra redaktors"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d of %d)"
@@ -3385,81 +3920,121 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Neizdevās izveidot mapi (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Balstīts uz xmms sndfile spraudņa:\n"
+"Autortiesības (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Audacious adaptācija — Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Šī ir brīvā programmatūra. Jūs varat to izplatīt un/vai modificēt saskaņā\n"
+"ar GNU GPL licenses nosacījumiem, kurus publicējis Free Software\n"
+"Foundation; lietojiet licenses 2. versiju, vai arī (pēc jūsu izvēles)\n"
+"jebkuru vēlāku versiju.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Balstīts uz xmms sndfile spraudņa:\nAutortiesības (C) 2000, 2002 Erik de Castro Lopo\n\nAudacious adaptācija — Tony Vroon <chainsaw@gentoo.org>\n\nŠī ir brīvā programmatūra. Jūs varat to izplatīt un/vai modificēt saskaņā\nar GNU GPL licenses nosacījumiem, kurus publicējis Free Software\nFoundation; lietojiet licenses 2. versiju, vai arī (pēc jūsu izvēles)\njebkuru vēlāku versiju.\n\nŠī programma tiek izplatīta cerot, ka tā būs noderīga, bet BEZ JEBKĀDAS\nGARANTIJAS; pat PIEPRASĪJUMA vai NODERĪBAS ĪPAŠAM MĒRĶIM garantijas.\nSīkākai informācijai skatiet GNU General Public License.\n\nGNU GPL licenses kopijai vajadzētu būt saņemtai kopā ar šo programmu.\nJa tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\nFifth Floor, Boston, MA 02110-1301, USA."
+"Šī programma tiek izplatīta cerot, ka tā būs noderīga, bet BEZ JEBKĀDAS\n"
+"GARANTIJAS; pat PIEPRASĪJUMA vai NODERĪBAS ĪPAŠAM MĒRĶIM garantijas.\n"
+"Sīkākai informācijai skatiet GNU General Public License.\n"
+"\n"
+"GNU GPL licenses kopijai vajadzētu būt saņemtai kopā ar šo programmu.\n"
+"Ja tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\n"
+"Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Sndfile spraudnis"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Par Sndio izvades spraudni"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Sndio izvades spraudnis\n\nAutors Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Sndio izvades spraudnis\n"
+"\n"
+"Autors Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Neatbalstīts formāts"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Tika pieprasīts formāts, ko neatbalsta audio ierīce.\n\nLūdzu, mēģiniet vēlreiz ar palaistu sndiod(1) serveri."
+msgstr ""
+"Tika pieprasīts formāts, ko neatbalsta audio ierīce.\n"
+"\n"
+"Lūdzu, mēģiniet vēlreiz ar palaistu sndiod(1) serveri."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "sndio ierīce"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(tukšs nozīmē noklusētais)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Labi"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Atcelt"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Dziesmas maiņa"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Komanda, ko palaist, kad Audacious sāk atskaņot jaunu dziesmu."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Komanda:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Komanda, ko palaist dziesmas beigās."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Komanda, ko palaist, kad Audacious sasniedz repertuāra beigas."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Komanda, ko palaist, kad nomainās dziesmas nosaukums (piem., tīkla plūsmas)."
+msgstr ""
+"Komanda, ko palaist, kad nomainās dziesmas nosaukums (piem., tīkla plūsmas)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3476,35 +4051,90 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Varat izmantot sekojoša formāta virknes, kuras\npirms komandas izsaukšanas tiks aizvietotas\n(ne visas ir derīgas repertuāra-beigas komandai)\n\n%F: Frekvence (hercos)\n%c: Kanālu skaits\n%f: faila nosaukums (pilns ceļš)\n%l: ilgums (milisekundēs)\n%n vai %s: Dziesmas nosaukums\n%r: Ātrums (bitos sekundē)\n%t: Repertuāra pozīcija (%02d)\n%p: Pašreiz atskaņo (1 vai 0)\n%a: Izpildītājs\n%b: Albums\n%T: Celiņa nosaukums"
+msgstr ""
+"Varat izmantot sekojoša formāta virknes, kuras\n"
+"pirms komandas izsaukšanas tiks aizvietotas\n"
+"(ne visas ir derīgas repertuāra-beigas komandai)\n"
+"\n"
+"%F: Frekvence (hercos)\n"
+"%c: Kanālu skaits\n"
+"%f: faila nosaukums (pilns ceļš)\n"
+"%l: ilgums (milisekundēs)\n"
+"%n vai %s: Dziesmas nosaukums\n"
+"%r: Ātrums (bitos sekundē)\n"
+"%t: Repertuāra pozīcija (%02d)\n"
+"%p: Pašreiz atskaņo (1 vai 0)\n"
+"%a: Izpildītājs\n"
+"%b: Albums\n"
+"%T: Celiņa nosaukums"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Parametrus, kuri tiek padoti čaulai, vajadzētu ietvert pēdiņās. Pretējā gadījumā rodas risks drošībai."
+msgstr ""
+"Parametrus, kuri tiek padoti čaulai, vajadzētu ietvert "
+"pēdiņās. Pretējā gadījumā rodas risks drošībai."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Komandas"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"SoX diskretizācijas frekvences pārveidošanas spraudnis\n"
+"Autortiesības 2013 Michał Lipski\n"
+"\n"
+"Balstīts uz diskretizācijas frekvences pārveidošanas spraudni:\n"
+"autortiesības 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Ātri"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Zema"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Augsta"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Ļoti augsta"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Kvalitāte:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "SoX diskretizācijas frekvences pārveidotājs"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Ātrums un augstums"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Ātrums:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Augstums:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Ātrums un augstums"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3513,94 +4143,114 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "Statusa ikonas spraudnis\n\nAutortiesības 2005-2007 Giacomo Lozito <james@develia.org>\nAutortiesības 2010 Michał Lipski <tallica@o2.pl>\n\nŠis spraudnis nodrošina ar statusa ikonu, kas novietota\nsistēmas ikonu joslas apgabalā."
+msgstr ""
+"Statusa ikonas spraudnis\n"
+"\n"
+"Autortiesības 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Autortiesības 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Šis spraudnis nodrošina ar statusa ikonu, kas novietota\n"
+"sistēmas ikonu joslas apgabalā."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Peles rullīša darbība"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Mainīt skaļumu"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Mainīt atskaņojamo dziesmu"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Citi iestatījumi"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Atslēgt izlecošo logu"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Aizvērt sistēmas ikonu joslu"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Tinot uz augšu, pāriet uz priekšu repertuārā"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Statusa ikona"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Papildu stereo spraudnis\n\nAutors Johan Levin, 1999"
+msgstr ""
+"Papildu stereo spraudnis\n"
+"\n"
+"Autors Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Papildu stereo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Papildu stereo"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Toņa ģenerators: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "Sinusa toņu ģenerators, autors Håvard Kvålen <havardk@xmms.org>\nModificējis Daniel J. Peng <danielpeng@bigfoot.com>\n\nLai to izmantotu, pievienojiet URL: tone://frekvence1;frekvence2;frekvence3;...\npiem., tone://2000;2005, lai atskaņotu 2000 Hz tonu un 2005 Hz toni"
+msgstr ""
+"Sinusa toņu ģenerators, autors Håvard Kvålen <havardk@xmms.org>\n"
+"Modificējis Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Lai to izmantotu, pievienojiet URL: tone://frekvence1;frekvence2;"
+"frekvence3;...\n"
+"piem., tone://2000;2005, lai atskaņotu 2000 Hz tonu un 2005 Hz toni"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Toņa ģenerators"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "Failu ievadizvades spraudnis atskaņotājam Audacious\nAutortiesības 2009-2012 John Lindgren\n\nŠIS SPRAUDNIS IR OBLIGĀTS. NEATSLĒDZIET TO."
+msgstr ""
+"Failu ievadizvades spraudnis atskaņotājam Audacious\n"
+"Autortiesības 2009-2012 John Lindgren\n"
+"\n"
+"ŠIS SPRAUDNIS IR OBLIGĀTS. NEATSLĒDZIET TO."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Failu ievadizvades spraudnis"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Balss izņemšana"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3619,46 +4269,74 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Audacious Ogg Vorbis dekodētājs\n\nBalstīts uz Xiph.org fonda Ogg Vorbis spraudņa: http://www.xiph.org/\n\nOriģinālā koda autors:\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nPienesumi no:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Audacious Ogg Vorbis dekodētājs\n"
+"\n"
+"Balstīts uz Xiph.org fonda Ogg Vorbis spraudņa: http://www.xiph.org/\n"
+"\n"
+"Oriģinālā koda autors:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Pienesumi no:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis dekodētājs"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr "Vortex failu formāta atskaņotājs, autors Sashnov Alexander <sashnov@ngs.ru>\nBalstīts uz in_vtx.dll, autors Roman Sherbakov <v_soft@microfor.ru>\nAudacious spraudņa autors Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Vortex failu formāta atskaņotājs, autors Sashnov Alexander <sashnov@ngs.ru>\n"
+"Balstīts uz in_vtx.dll, autors Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious spraudņa autors Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "VTX dekodētājs"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "zudumradošs (hibrīdais)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "zudumradošs"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Autortiesības 2006 William Pitcock <nenolod@nenolod.net>\n\nDaļai koda autors ir Miles Egan."
+msgstr ""
+"Autortiesības 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Daļai koda autors ir Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "WavPack dekodētājs"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "2SF dekodētājs"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML kopīgojamie repertuāri (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - izvēlieties failu"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Kārtot iz_vēlētos"

audacious-plugins-3.4.2.tar.bz2/po/ml_IN.po Added

@@ -0,0 +1,3956 @@
+# Malayalam translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# nandakumar <nandakumar96@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-10-16 05:04+0000\n"
+"Last-Translator: nandakumar <nandakumar96@gmail.com>\n"
+"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/"
+"audacious/language/ml_IN/)\n"
+"Language: ml_IN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
+msgid "mono"
+msgstr "മോണോ"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
+msgid "stereo"
+msgstr "സ്റ്റീരിയോ"
+
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
+msgid "surround"
+msgstr "സറൗണ്ട്"
+
+#: src/aac/libmp4.c:930
+msgid "AAC Decoder"
+msgstr "AAC ഡീകോഡര്‍"
+
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
+msgid "sequenced"
+msgstr "സീക്വന്‍സ്ഡ്"
+
+#: src/adplug/plugin.c:14
+msgid "AdPlug (AdLib Player)"
+msgstr "AdPlug (AdLib പ്ലേയര്‍)"
+
+#: src/alarm/alarm.c:809
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr ""
+
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
+msgid "Alarm"
+msgstr "അലാം"
+
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "ഇത് നിങ്ങളുടെ ഉണര്‍ത്തുപാട്ടാണ്."
+
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "ഇന്നേയ്ക്കുള്ള നിങ്ങളുടെ സ്മാരകം: "
+
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "സ്മാരകം"
+
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "തിങ്കളാഴ്ച"
+
+#: src/alarm/interface.c:140
+msgid "Tuesday"
+msgstr "ചൊവ്വാഴ്ച"
+
+#: src/alarm/interface.c:140
+msgid "Wednesday"
+msgstr "ബുധനാഴ്ച"
+
+#: src/alarm/interface.c:141
+msgid "Thursday"
+msgstr "വ്യാഴാഴ്ച"
+
+#: src/alarm/interface.c:141
+msgid "Friday"
+msgstr "വെള്ളിയാഴ്ച"
+
+#: src/alarm/interface.c:141
+msgid "Saturday"
+msgstr "ശനിയാഴ്ച"
+
+#: src/alarm/interface.c:141
+msgid "Sunday"
+msgstr "ഞായറാഴ്ച"
+
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "അലാം ക്രമീകരണങ്ങള്‍"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "സമയം"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "അലാം മുഴങ്ങേണ്ട സമയം (സ്വതവേയുള്ളത്):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr ""
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr ""
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "മണിക്കൂറുകള്‍"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "മിനിറ്റുകള്‍"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr ""
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "ദിവസം"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "സ്വതസ്സിദ്ധം"
+
+#: src/alarm/interface.c:310
+msgid "Days"
+msgstr "ദിവസങ്ങള്‍"
+
+#: src/alarm/interface.c:319
+msgid "Fading"
+msgstr "മായുന്നു"
+
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
+msgid "seconds"
+msgstr "സെക്കന്‍ഡുകള്‍"
+
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
+msgid "Volume"
+msgstr "ഉച്ചത"
+
+#: src/alarm/interface.c:339
+msgid "Start at"
+msgstr "ഇവിടെ തുടങ്ങുക: "
+
+#: src/alarm/interface.c:357
+msgid "Final"
+msgstr "അവസാനത്തേത്"
+
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "നിലവിലുള്ളത്"
+
+#: src/alarm/interface.c:387
+msgid "Additional Command"
+msgstr "അധികകല്‍പ്പന"
+
+#: src/alarm/interface.c:393
+msgid "enable"
+msgstr "സാദ്ധ്യമാക്കുക"
+
+#: src/alarm/interface.c:400
+msgid "Playlist (optional)"
+msgstr "പ്ലേലിസ്റ്റ് (നിര്‍ബന്ധമില്ല)"
+
+#: src/alarm/interface.c:407
+msgid "Select a playlist"
+msgstr "ഒരു പ്ലേലിസ്റ്റ് തിരഞ്ഞെടുക്കുക"
+
+#: src/alarm/interface.c:419
+msgid "Use reminder"
+msgstr "സ്മാരം ഉപയോഗിയ്ക്കുക"
+
+#: src/alarm/interface.c:428
+msgid "Options"
+msgstr "ഓപ്ഷനുകള്‍"
+
+#: src/alarm/interface.c:433
+msgid "What do these options mean?"
+msgstr "ഈ ഓപ്ഷനുകള്‍ എന്താണ് അര്‍ത്ഥമാക്കുന്നത്?"
+
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
+msgid "Help"
+msgstr "സഹായം"
+
+#: src/albumart/albumart.c:143
+msgid "Album Art"
+msgstr "ആല്‍ബം ആര്‍ട്ട്"
+
+#: src/alsa/config.c:212
+msgid "Default PCM device"
+msgstr "സ്വതവേയുള്ള PCM ഉപകരണം"
+
+#: src/alsa/config.c:241
+msgid "Default mixer device"
+msgstr "സ്വതവേയുള്ള മിക്സര്‍ ഉപകരണം"
+
+#: src/alsa/config.c:428
+msgid "ALSA Output Plugin Preferences"
+msgstr "അല്‍സ ഔട്പുട്ട് പ്ലഗ്ഗിന്‍ ഉപകരണങ്ങള്‍"
+
+#: src/alsa/config.c:434
+msgid "PCM device:"
+msgstr "PCM ഉപകരണം"
+
+#: src/alsa/config.c:436
+msgid "Mixer device:"
+msgstr "മിക്സര്‍ ഉപകരണം"
+
+#: src/alsa/config.c:438
+msgid "Mixer element:"
+msgstr "മിക്സര്‍ എലമെന്റ്:"
+
+#: src/alsa/config.c:441
+msgid "Work around drain hangup"
+msgstr ""
+
+#: src/alsa/plugin.c:25
+msgid ""
+"ALSA Output Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+
+#: src/alsa/plugin.c:32
+msgid "ALSA Output"
+msgstr "അല്‍സ ഔട്പുട്ട്"
+
+#: src/amidi-plug/amidi-plug.c:248
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr ""
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-പ്ലഗ്ഗ് (MIDI പ്ലേയര്‍)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
+msgid "ALSA Backend "
+msgstr "അല്‍സ ബാക്കെന്‍ഡ്"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
+msgid "FluidSynth Backend "
+msgstr "ഫ്ലൂയിഡ്സിന്ത് ബാക്കെന്‍ഡ്"
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+
+#: src/amidi-plug/i_configure-alsa.c:353
+msgid "Port"
+msgstr "പോര്‍ട്ട്"
+
+#: src/amidi-plug/i_configure-alsa.c:355
+msgid "Client name"
+msgstr "ക്ലയന്റിന്റെ പേര്"
+
+#: src/amidi-plug/i_configure-alsa.c:357
+msgid "Port name"
+msgstr "പോര്‍ട്ടിന്റെ പേര്"
+
+#: src/amidi-plug/i_configure-alsa.c:371
+msgid "ALSA output ports"
+msgstr "അല്‍സ ഔട്പുട്ട് പോര്‍ട്ടുകള്‍"
+
+#: src/amidi-plug/i_configure-alsa.c:432
+msgid "Soundcard: "
+msgstr "സൗണ്ട് കാര്‍ഡ്: "
+
+#: src/amidi-plug/i_configure-alsa.c:434
+msgid "Mixer control: "
+msgstr "മിക്സര്‍ കണ്‍ട്രോള്‍: "
+
+#: src/amidi-plug/i_configure-alsa.c:444
+msgid "Mixer settings"
+msgstr "മിക്സര്‍ ക്രമീകരണങ്ങള്‍"
+
+#: src/amidi-plug/i_configure-alsa.c:472
+msgid ""
+"ALSA\n"
+"backend"
+msgstr ""
+
+#: src/amidi-plug/i_configure-ap.c:63
+msgid "AMIDI-Plug - backend information"
+msgstr ""
+
+#: src/amidi-plug/i_configure-ap.c:221
+msgid "Backend selection"
+msgstr "ബാക്കെന്‍ഡ് തിരഞ്ഞെടുപ്പ്"
+
+#: src/amidi-plug/i_configure-ap.c:261
+msgid "Playback settings"
+msgstr "പ്ലേബാക്ക് ക്രമീകരണങ്ങള്‍"
+
+#: src/amidi-plug/i_configure-ap.c:266
+msgid "Transpose: "
+msgstr "ട്രാന്‍സ്പോസ്: "
+
+#: src/amidi-plug/i_configure-ap.c:275
+msgid "Drum shift: "
+msgstr "ഡ്രം ഷിഫ്റ്റ്"
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "Advanced settings"
+msgstr "സങ്കീര്‍ണമായ ക്രമീകരണങ്ങള്‍"
+
+#: src/amidi-plug/i_configure-ap.c:297
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr ""
+
+#: src/amidi-plug/i_configure-ap.c:304
+msgid "extract comments from MIDI file (if available)"
+msgstr ""
+
+#: src/amidi-plug/i_configure-ap.c:311
+msgid "extract lyrics from MIDI file (if available)"
+msgstr ""
+
+#: src/amidi-plug/i_configure-ap.c:344
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr ""
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug Settings"
+msgstr "AMIDI പ്ലഗ് ക്രമീകരണങ്ങള്‍"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:63
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:321
+msgid "SoundFont settings"
+msgstr "സൗണ്ട്ഫോണ്ട് ക്രമീകരണങ്ങള്‍"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:359
+msgid "Filename"
+msgstr "ഫയല്‍നെയിം"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:363
+msgid "Size (bytes)"
+msgstr "വലിപ്പം (ബൈറ്റുകള്‍)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:412
+msgid "Load SF on player start"
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:416
+msgid "Load SF on first MIDI file play"
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:431
+msgid "Synthesizer settings"
+msgstr "സിന്തസൈസര്‍ ക്രമീകരണങ്ങള്‍"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:440
+msgid "gain"
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
+msgid "use default"
+msgstr "സ്വതവേയുള്ളത് ഉപയോഗിയ്ക്കുക"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
+msgid "value:"
+msgstr "വില:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:470
+msgid "polyphony"
+msgstr "ബഹുസ്വരത"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:500
+msgid "reverb"
+msgstr "റിവേര്‍ബ്"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
+msgid "yes"
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
+msgid "no"
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:534
+msgid "chorus"
+msgstr "കോറസ്"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "sample rate"
+msgstr "സാമ്പിള്‍ റേറ്റ്"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:574
+msgid "22050 Hz "
+msgstr "22050 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:577
+msgid "44100 Hz "
+msgstr "44100 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:580
+msgid "96000 Hz "
+msgstr "96000 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:583
+msgid "custom "
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:592
+msgid "Hz "
+msgstr "Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:662
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr ""
+
+#: src/amidi-plug/i_fileinfo.c:175
+msgid "Name:"
+msgstr "പേര്:"
+
+#: src/amidi-plug/i_fileinfo.c:200
+msgid " MIDI Info "
+msgstr ""
+
+#: src/amidi-plug/i_fileinfo.c:214
+msgid "Format:"
+msgstr "ഫോര്‍മാറ്റ്:"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "Length (msec):"
+msgstr ""
+
+#: src/amidi-plug/i_fileinfo.c:220
+msgid "No. of Tracks:"
+msgstr "ട്രാക്കുകളുടെ എണ്ണം:"
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "variable"
+msgstr "ചരം"
+
+#: src/amidi-plug/i_fileinfo.c:228
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidi-plug/i_fileinfo.c:236
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidi-plug/i_fileinfo.c:239
+msgid "Time Div:"
+msgstr ""
+
+#: src/amidi-plug/i_fileinfo.c:250
+msgid " MIDI Comments and Lyrics "
+msgstr ""
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no comments available in this MIDI file *"
+msgstr ""
+
+#: src/amidi-plug/i_fileinfo.c:314
+msgid "* no lyrics available in this MIDI file *"
+msgstr ""
+
+#: src/amidi-plug/i_fileinfo.c:367
+msgid " (invalid UTF-8)"
+msgstr ""
+
+#: src/amidi-plug/i_utils.c:39
+msgid "About AMIDI-Plug"
+msgstr "AMIDI പ്ലഗ്ഗിനെപ്പറ്റി"
+
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI പ്ലഗ്ഗ്"
+
+#: src/amidi-plug/i_utils.c:54
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing"
+msgstr ""
+
+#: src/aosd/aosd.c:29
+msgid "Audacious OSD "
+msgstr "ഒഡാഷ്യസ് OSD "
+
+#: src/aosd/aosd.c:37
+msgid "AOSD (On-Screen Display)"
+msgstr ""
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "ചതുരം"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "വക്കുവളഞ്ഞ ചതും"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "അവതലചതുരം"
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "ശൂന്യം"
+
+#: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "പ്ലേബാക്ക് തുടങ്ങുക"
+
+#: src/aosd/aosd_trigger.c:75
+msgid "Triggers OSD when a playlist entry is played."
+msgstr ""
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Title Change"
+msgstr ""
+
+#: src/aosd/aosd_trigger.c:80
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr ""
+
+#: src/aosd/aosd_trigger.c:86
+msgid "Pause On"
+msgstr "പോസ് ഓണ്‍"
+
+#: src/aosd/aosd_trigger.c:87
+msgid "Triggers OSD when playback is paused."
+msgstr ""
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Pause Off"
+msgstr "പോസ് ഓഫ്"
+
+#: src/aosd/aosd_trigger.c:92
+msgid "Triggers OSD when playback is unpaused."
+msgstr ""
+
+#: src/aosd/aosd_ui.c:168
+msgid "Placement"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:200
+msgid "Relative X offset:"
+msgstr "താരതമ്യേനയുള്ള X ഓഫ്‌സെറ്റ്"
+
+#: src/aosd/aosd_ui.c:207
+msgid "Relative Y offset:"
+msgstr "താരതമ്യേനയുള്ള Y ഓഫ്‌സെറ്റ്"
+
+#: src/aosd/aosd_ui.c:214
+msgid "Max OSD width:"
+msgstr "പരമാവധി OSD നീളം"
+
+#: src/aosd/aosd_ui.c:225
+msgid "Multi-Monitor options"
+msgstr "മള്‍ട്ടി മോണിറ്റര്‍ ക്രമീകരണങ്ങള്‍"
+
+#: src/aosd/aosd_ui.c:229
+msgid "Display OSD using:"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:231
+msgid "all monitors"
+msgstr "എല്ലാ മോണിറ്ററുകളും"
+
+#: src/aosd/aosd_ui.c:234
+#, c-format
+msgid "monitor %i"
+msgstr "മോണിറ്റര്‍ %i"
+
+#: src/aosd/aosd_ui.c:287
+msgid "Timing (ms)"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:292
+msgid "Display:"
+msgstr "ഡിസ്പ്ലേ:"
+
+#: src/aosd/aosd_ui.c:297
+msgid "Fade in:"
+msgstr "ഫെയ്ഡ് ഇന്‍:"
+
+#: src/aosd/aosd_ui.c:302
+msgid "Fade out:"
+msgstr "ഫെയ്ഡ് ഔട്ട്"
+
+#: src/aosd/aosd_ui.c:383
+msgid "Fonts"
+msgstr "ഫോണ്ടുകള്‍"
+
+#: src/aosd/aosd_ui.c:391
+#, c-format
+msgid "Font %i:"
+msgstr "ഫോണ്ട് %i"
+
+#: src/aosd/aosd_ui.c:409
+msgid "Shadow"
+msgstr "നിഴല്‍"
+
+#: src/aosd/aosd_ui.c:439
+msgid "Internationalization"
+msgstr "ആഗോളീകരണം"
+
+#: src/aosd/aosd_ui.c:445
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:462
+msgid "Select Skin File"
+msgstr "സ്കിന്‍ ഫയല്‍ തിരഞ്ഞെടുക്കുക"
+
+#: src/aosd/aosd_ui.c:573
+msgid "Render Style"
+msgstr "റെന്‍ഡര്‍ സ്റ്റൈല്‍"
+
+#: src/aosd/aosd_ui.c:589
+msgid "Colors"
+msgstr "നിറങ്ങള്‍"
+
+#: src/aosd/aosd_ui.c:602
+#, c-format
+msgid "Color %i:"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:620
+msgid "Custom Skin"
+msgstr "സ്വേച്ഛയാലുള്ള സ്കിന്‍"
+
+#: src/aosd/aosd_ui.c:626
+msgid "Skin file:"
+msgstr "സ്കിന്‍ ഫയല്‍:"
+
+#: src/aosd/aosd_ui.c:630
+msgid "Browse"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:729
+msgid "Enable trigger"
+msgstr "കാഞ്ചി സാദ്ധ്യമാക്കുക"
+
+#: src/aosd/aosd_ui.c:756
+msgid "Event"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:784
+msgid "Composite manager detected"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:791
+msgid ""
+"Composite manager not detected;\n"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:799
+msgid "Composite manager not required for fake transparency"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:837
+msgid "Transparency"
+msgstr "സുതാര്യത"
+
+#: src/aosd/aosd_ui.c:843
+msgid "Fake transparency"
+msgstr "കപടസുതാര്യത"
+
+#: src/aosd/aosd_ui.c:845
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:887
+msgid "Composite extension not loaded"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:895
+msgid "Composite extension not available"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:914
+#, c-format
+msgid "Audacious OSD"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:995
+msgid "Audacious OSD - configuration"
+msgstr "ഒഡാഷ്യസ് OSD ക്രമീകരണം"
+
+#: src/aosd/aosd_ui.c:1016
+msgid "Test"
+msgstr ""
+
+#: src/aosd/aosd_ui.c:1031
+msgid "Position"
+msgstr "സ്ഥാനം"
+
+#: src/aosd/aosd_ui.c:1036
+msgid "Animation"
+msgstr "അനിമേഷന്‍"
+
+#: src/aosd/aosd_ui.c:1041
+msgid "Text"
+msgstr "എഴുത്ത്"
+
+#: src/aosd/aosd_ui.c:1046
+msgid "Decoration"
+msgstr "അലങ്കാരം"
+
+#: src/aosd/aosd_ui.c:1051
+msgid "Trigger"
+msgstr "കാഞ്ചി"
+
+#: src/aosd/aosd_ui.c:1056
+msgid "Misc"
+msgstr "പലവക"
+
+#: src/asx/asx.c:96
+msgid "ASXv1/ASXv2 Playlists"
+msgstr ""
+
+#: src/audpl/audpl.c:222
+msgid "Audacious Playlists (audpl)"
+msgstr ""
+
+#: src/blur_scope/blur_scope.c:47
+msgid "Color"
+msgstr "നിറം"
+
+#: src/blur_scope/blur_scope.c:56
+msgid "Blur Scope"
+msgstr "ബ്ലര്‍ സ്കോപ്പ്"
+
+#: src/bs2b/plugin.c:136
+msgid "Bauer Stereophonic-to-Binaural Preferences"
+msgstr ""
+
+#: src/bs2b/plugin.c:147
+msgid "Feed level:"
+msgstr "ഫീഡ് ലെവല്‍:"
+
+#: src/bs2b/plugin.c:161
+msgid "Cut frequency:"
+msgstr "ആവൃത്തി മുറിയ്ക്കുക:"
+
+#: src/bs2b/plugin.c:175
+msgid "Presets:"
+msgstr "പ്രീസെറ്റുകള്‍:"
+
+#: src/bs2b/plugin.c:197
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr ""
+
+#: src/cairo-spectrum/cairo-spectrum.c:297
+msgid "Spectrum Analyzer"
+msgstr "സ്പെക്ട്രം അനലൈസര്‍"
+
+#: src/cdaudio-ng/cdaudio-ng.c:103
+msgid ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"and to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you to Tony Vroon for mentoring and guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:121
+msgid "Device"
+msgstr "ഉപകരണം"
+
+#: src/cdaudio-ng/cdaudio-ng.c:122
+msgid "Read speed:"
+msgstr "വായനയുടെ വേഗം:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:125
+msgid "Override device:"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:127
+msgid "Metadata"
+msgstr "മെറ്റാഡേറ്റ"
+
+#: src/cdaudio-ng/cdaudio-ng.c:128
+msgid "Use CD-Text"
+msgstr "സി.ഡി.-ടെക്സ്റ്റ് ഉപയോഗിയ്ക്കുക"
+
+#: src/cdaudio-ng/cdaudio-ng.c:130
+msgid "Use CDDB"
+msgstr "CDDB ഉപയോഗിയ്ക്കുക"
+
+#: src/cdaudio-ng/cdaudio-ng.c:132
+msgid "Use HTTP instead of CDDBP"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:134
+msgid "Server:"
+msgstr "സെര്‍വര്‍:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:136
+msgid "Path:"
+msgstr "പാത്ത്:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:138
+msgid "Port:"
+msgstr "പോര്‍ട്ട്:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:148
+msgid "Audio CD Plugin"
+msgstr "ഓഡിയോ സി.ഡി. പ്ലഗ്ഗിന്‍"
+
+#: src/cdaudio-ng/cdaudio-ng.c:249
+msgid "Failed to initialize cdio subsystem."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:306
+#, c-format
+msgid "Invalid URI %s."
+msgstr "അസാധുവായ URI %s."
+
+#: src/cdaudio-ng/cdaudio-ng.c:308
+#, c-format
+msgid "Track %d not found."
+msgstr "ട്രാക്ക് %d കണ്ടുകിട്ടിയില്ല."
+
+#: src/cdaudio-ng/cdaudio-ng.c:310
+#, c-format
+msgid "Track %d is a data track."
+msgstr "ട്രാക്ക് %d ഒരു ഡേറ്റാ ട്രാക്ക് ആണ്."
+
+#: src/cdaudio-ng/cdaudio-ng.c:312
+msgid "Failed to open audio output."
+msgstr "ഓഡിയോ ഔട്പുട്ട് തുറക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
+
+#: src/cdaudio-ng/cdaudio-ng.c:395
+msgid "Error reading audio CD."
+msgstr "ഓഡിയോ സി.ഡി. വായിയ്ക്കുന്നതില്‍ പിശക്."
+
+#: src/cdaudio-ng/cdaudio-ng.c:505
+msgid "Audio CD"
+msgstr "ഓഡിയോ സി.ഡി."
+
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr "സി.ഡി. ഉപകരണം %s തുറക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
+
+#: src/cdaudio-ng/cdaudio-ng.c:547
+msgid "No audio capable CD drive found."
+msgstr "ഓഡിയോ ശേഷിയുള്ള സി.ഡി. ഡ്രൈവ് കണ്ടുകിട്ടിയില്ല."
+
+#: src/cdaudio-ng/cdaudio-ng.c:574
+msgid "Failed to finish initializing opened CD drive."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:587
+msgid "Failed to retrieve first/last track number."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:612
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:702
+msgid "Failed to create the cddb connection."
+msgstr "cddb ബന്ധം സാദ്ധ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
+
+#: src/cdaudio-ng/cdaudio-ng.c:777
+msgid "Failed to query the CDDB server"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:779
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:803
+#, c-format
+msgid "Failed to read the cddb info: %s"
+msgstr "cddb ഇന്‍ഫോ വായിയ്ക്കുന്നതില്‍ പരാജയം: %s"
+
+#: src/cdaudio-ng/cdaudio-ng.c:876
+msgid "Drive is empty."
+msgstr "ഡ്രൈവ് ശൂന്യമാണ്."
+
+#: src/cdaudio-ng/cdaudio-ng.c:878
+msgid "Unsupported disk type."
+msgstr "പിന്തുണയില്ലാത്ത തരം ഡിസ്ക്."
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Play CD"
+msgstr "സി.ഡി. പാടുക"
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Add CD"
+msgstr "സി.ഡി. ചേര്‍ക്കുക"
+
+#: src/cd-menu-items/cd-menu-items.c:57
+msgid "Audio CD Menu Items"
+msgstr "ഓഡിയോ സി.ഡി. മെനു അംഗങ്ങള്‍"
+
+#: src/compressor/plugin.c:35
+msgid "Compression"
+msgstr "കംപ്രഷന്‍"
+
+#: src/compressor/plugin.c:36
+msgid "Center volume:"
+msgstr ""
+
+#: src/compressor/plugin.c:39
+msgid "Dynamic range:"
+msgstr "ഡൈനാമിക് റെയ്ഞ്ച്:"
+
+#: src/compressor/plugin.c:53
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/compressor/plugin.c:58
+msgid "Dynamic Range Compressor"
+msgstr ""
+
+#: src/console/configure.c:134 src/console/plugin.c:42
+msgid "Game Console Music Decoder"
+msgstr "ഗെയിം കണ്‍സോള്‍ മ്യൂസിക് ഡീകോഡര്‍"
+
+#: src/console/configure.c:151
+msgid "General"
+msgstr "പൊതുവായവ"
+
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
+msgid "Playback"
+msgstr "പ്ലേബാക്ക്"
+
+#: src/console/configure.c:168
+msgid "Bass:"
+msgstr "ബേസ്:"
+
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
+msgid "secs"
+msgstr "സെക്കന്‍ഡുകള്‍"
+
+#: src/console/configure.c:179
+msgid "Treble:"
+msgstr "ട്രെബ്ള്‍:"
+
+#: src/console/configure.c:200
+msgid "Default song length:"
+msgstr ""
+
+#: src/console/configure.c:206
+msgid "Resampling"
+msgstr "റീസാംപ്ലിങ്"
+
+#: src/console/configure.c:212
+msgid "Enable audio resampling"
+msgstr "ഓഡിയോ റീസാംപ്ലിങ് സാദ്ധ്യമാക്കുക"
+
+#: src/console/configure.c:227
+msgid "Resampling rate:"
+msgstr "റീസാംപ്ലിങ് നിരക്ക്:"
+
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
+msgid "Hz"
+msgstr "Hz"
+
+#: src/console/configure.c:242
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/configure.c:243
+msgid "Ignore length from SPC tags"
+msgstr ""
+
+#: src/console/configure.c:244
+msgid "Increase reverb"
+msgstr ""
+
+#: src/console/configure.c:269
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+
+#: src/console/plugin.c:27
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+msgstr ""
+
+#: src/crossfade/crossfade.c:81
+msgid ""
+"Crossfading failed because the songs had a different number of channels. "
+"You can use the Channel Mixer to convert the songs to the same number of "
+"channels."
+msgstr ""
+
+#: src/crossfade/crossfade.c:88
+msgid ""
+"Crossfading failed because the songs had different sample rates. You can "
+"use the Sample Rate Converter to convert the songs to the same sample rate."
+msgstr ""
+
+#: src/crossfade/crossfade.c:254
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/crossfade/crossfade.c:258
+msgid "Crossfade"
+msgstr "ക്രോസ്‌ഫെയ്ഡ്"
+
+#: src/crossfade/crossfade.c:259
+msgid "Overlap:"
+msgstr "ഓവര്‍ലാപ്പ്:"
+
+#: src/crossfade/crossfade.c:269
+msgid "Crossfade"
+msgstr "ക്രോസ്‌ഫെയ്ഡ്"
+
+#: src/crystalizer/crystalizer.c:40
+msgid "Crystalizer"
+msgstr "ക്രിസ്റ്റലൈസര്‍"
+
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
+msgid "Intensity:"
+msgstr "തീവ്രത:"
+
+#: src/crystalizer/crystalizer.c:51
+msgid "Crystalizer"
+msgstr "ക്രിസ്റ്റലൈസര്‍"
+
+#: src/cue/cue.c:158
+msgid "Cue Sheet Plugin"
+msgstr ""
+
+#: src/echo_plugin/echo.c:24
+msgid "Echo"
+msgstr "പ്രതിധ്വനി"
+
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
+msgid "Delay:"
+msgstr "താമസം:"
+
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
+msgid "ms"
+msgstr ""
+
+#: src/echo_plugin/echo.c:28
+msgid "Feedback:"
+msgstr "അഭിപ്രായം:"
+
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
+msgid "Volume:"
+msgstr "ശബ്ദോച്ചത:"
+
+#: src/echo_plugin/echo.c:114
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"\n"
+"Surround echo by Carl van Schaik, 1999"
+msgstr ""
+
+#: src/echo_plugin/echo.c:120
+msgid "Echo"
+msgstr "പ്രതിധ്വനി"
+
+#: src/ffaudio/ffaudio-core.c:648
+msgid ""
+"Multi-format audio decoding plugin for Audacious using\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+
+#: src/ffaudio/ffaudio-core.c:695
+msgid "FFmpeg Plugin"
+msgstr "FFmpeg പ്ലഗ്ഗിന്‍"
+
+#: src/filewriter/filewriter.c:409
+msgid "FileWriter Configuration"
+msgstr "FileWriter ക്രമീകരണം"
+
+#: src/filewriter/filewriter.c:421
+msgid "Output file format:"
+msgstr "ഔട്പുട്ട് ഫയല്‍ ഫോര്‍മാറ്റ്:"
+
+#: src/filewriter/filewriter.c:439
+msgid "Configure"
+msgstr "ക്രമീകരിയ്ക്കുക"
+
+#: src/filewriter/filewriter.c:449
+msgid "Save into original directory"
+msgstr "യഥാര്‍ത്ഥഡയറക്റ്ററിയിലേയ്ക്ക സേവ് ചെയ്യുക"
+
+#: src/filewriter/filewriter.c:454
+msgid "Save into custom directory"
+msgstr "സ്വേച്ഛയാലുള്ള ഡയറക്റ്ററിയിലേയ്ക്ക് സേവ് ചെയ്യുക"
+
+#: src/filewriter/filewriter.c:464
+msgid "Output file folder:"
+msgstr "ഔട്പുട്ട് ഫയല്‍ ഫോള്‍ഡര്‍:"
+
+#: src/filewriter/filewriter.c:468
+msgid "Pick a folder"
+msgstr "ഒരു ഫോള്‍ഡര്‍ തിരഞ്ഞെടുക്കുക"
+
+#: src/filewriter/filewriter.c:481
+msgid "Get filename from:"
+msgstr ""
+
+#: src/filewriter/filewriter.c:484
+msgid "original file tags"
+msgstr "യഥാര്‍ത്ഥ ഫയല്‍ ടാഗുകള്‍"
+
+#: src/filewriter/filewriter.c:490
+msgid "original filename"
+msgstr "യഥാര്‍ത്ഥ ഫയല്‍നെയിം"
+
+#: src/filewriter/filewriter.c:497
+msgid "Don't strip file name extension"
+msgstr ""
+
+#: src/filewriter/filewriter.c:506
+msgid "Prepend track number to filename"
+msgstr ""
+
+#: src/filewriter/filewriter.c:515
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+
+#: src/filewriter/filewriter.c:532
+msgid "FileWriter Plugin"
+msgstr "FileWriter പ്ലഗ്ഗിന്‍"
+
+#: src/filewriter/mp3.c:37 src/filewriter/mp3.c:748
+msgid "Auto"
+msgstr ""
+
+#: src/filewriter/mp3.c:37
+msgid "Joint Stereo"
+msgstr ""
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
+msgid "Stereo"
+msgstr "സ്റ്റീരിയോ"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
+msgid "Mono"
+msgstr "മോണോ"
+
+#: src/filewriter/mp3.c:688
+msgid "MP3 Configuration"
+msgstr "MP3 ക്രമീകരണം"
+
+#: src/filewriter/mp3.c:712
+msgid "Algorithm Quality:"
+msgstr "ഓല്‍ഗൊരിതം ഗുണമേന്മ:"
+
+#: src/filewriter/mp3.c:737
+msgid "Output Samplerate:"
+msgstr "ഔട്പുട്ട് സാംപിള്‍നിരക്ക്:"
+
+#: src/filewriter/mp3.c:765
+msgid "(Hz)"
+msgstr "(Hz)"
+
+#: src/filewriter/mp3.c:772
+msgid "Bitrate / Compression ratio:"
+msgstr ""
+
+#: src/filewriter/mp3.c:796
+msgid "Bitrate (kbps):"
+msgstr "ബിറ്റ്‌റേറ്റ് (kbps):"
+
+#: src/filewriter/mp3.c:829
+msgid "Compression ratio:"
+msgstr "കംപ്രഷന്‍ നിരക്ക്:"
+
+#: src/filewriter/mp3.c:853
+msgid "Audio Mode:"
+msgstr "ഓഡിയോ മോഡ്:"
+
+#: src/filewriter/mp3.c:878
+msgid "Misc:"
+msgstr "പലവക:"
+
+#: src/filewriter/mp3.c:889
+msgid "Enforce strict ISO complience"
+msgstr ""
+
+#: src/filewriter/mp3.c:900
+msgid "Error protection"
+msgstr ""
+
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
+msgid "Quality"
+msgstr "ഗുണമേന്മ"
+
+#: src/filewriter/mp3.c:921
+msgid "Enable VBR/ABR"
+msgstr "VBR/ABR സാദ്ധ്യമാക്കുക"
+
+#: src/filewriter/mp3.c:931
+msgid "Type:"
+msgstr "തരം:"
+
+#: src/filewriter/mp3.c:964
+msgid "VBR Options:"
+msgstr "VBR ഓപ്ഷനുകള്‍"
+
+#: src/filewriter/mp3.c:980
+msgid "Minimum bitrate (kbps):"
+msgstr "കുറഞ്ഞ ബിറ്റ്‌റേറ്റ് (kbps):"
+
+#: src/filewriter/mp3.c:1007
+msgid "Maximum bitrate (kbps):"
+msgstr "പരമാവധി ബിറ്റ്‌റേറ്റ് (kbps):"
+
+#: src/filewriter/mp3.c:1030
+msgid "Strictly enforce minimum bitrate"
+msgstr ""
+
+#: src/filewriter/mp3.c:1042
+msgid "ABR Options:"
+msgstr "ABR ക്രമീകരണങ്ങള്‍:"
+
+#: src/filewriter/mp3.c:1052
+msgid "Average bitrate (kbps):"
+msgstr "ശരാശരി ബിറ്റ്റേറ്റ് (kbps):"
+
+#: src/filewriter/mp3.c:1080
+msgid "VBR quality level:"
+msgstr "VBR ഗുണനിലവാരം:"
+
+#: src/filewriter/mp3.c:1099
+msgid "Don't write Xing VBR header"
+msgstr ""
+
+#: src/filewriter/mp3.c:1112
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1121
+msgid "Frame parameters:"
+msgstr "ഫ്രേം പരാമീറ്ററുകള്‍:"
+
+#: src/filewriter/mp3.c:1133
+msgid "Mark as copyright"
+msgstr ""
+
+#: src/filewriter/mp3.c:1144
+msgid "Mark as original"
+msgstr ""
+
+#: src/filewriter/mp3.c:1156
+msgid "ID3 params:"
+msgstr ""
+
+#: src/filewriter/mp3.c:1167
+msgid "Force addition of version 2 tag"
+msgstr ""
+
+#: src/filewriter/mp3.c:1177
+msgid "Only add v1 tag"
+msgstr ""
+
+#: src/filewriter/mp3.c:1184
+msgid "Only add v2 tag"
+msgstr ""
+
+#: src/filewriter/mp3.c:1205
+msgid "Tags"
+msgstr ""
+
+#: src/filewriter/vorbis.c:209
+msgid "Vorbis Encoder Configuration"
+msgstr ""
+
+#: src/filewriter/vorbis.c:232
+msgid "Quality level (0 - 10):"
+msgstr ""
+
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
+msgid "lossless"
+msgstr "ലോസ്‌ലെസ്സ്"
+
+#: src/flacng/plugin.c:269
+msgid ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+
+#: src/flacng/plugin.c:277
+msgid "FLAC Decoder"
+msgstr "FLAC ഡീകോഡര്‍"
+
+#: src/gio/gio.c:300
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+
+#: src/gio/gio.c:322
+msgid "GIO Plugin"
+msgstr "GIO പ്ലഗ്ഗിന്‍"
+
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL സ്പെക്ട്രം അനലൈസര്‍"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Lets you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
+msgid "Gnome Shortcuts"
+msgstr "ഗ്നോം എളുപ്പവഴികള്‍"
+
+#: src/gtkui/columns.c:32
+msgid "Entry number"
+msgstr "എന്‍ട്രി നമ്പര്‍"
+
+#: src/gtkui/columns.c:32
+msgid "Title"
+msgstr "ടൈറ്റില്‍"
+
+#: src/gtkui/columns.c:33
+msgid "Artist"
+msgstr "ആര്‍ട്ടിസ്റ്റ്"
+
+#: src/gtkui/columns.c:33
+msgid "Year"
+msgstr "വര്‍ഷം"
+
+#: src/gtkui/columns.c:33
+msgid "Album"
+msgstr "ആല്‍ബം"
+
+#: src/gtkui/columns.c:33
+msgid "Track"
+msgstr "ട്രാക്ക്"
+
+#: src/gtkui/columns.c:33
+msgid "Genre"
+msgstr "തരം"
+
+#: src/gtkui/columns.c:34
+msgid "Queue position"
+msgstr "വരിയിലുള്ള സ്ഥാനം"
+
+#: src/gtkui/columns.c:34
+msgid "Length"
+msgstr "നീളം"
+
+#: src/gtkui/columns.c:34
+msgid "File path"
+msgstr "ഫയല്‍ പാത്ത്"
+
+#: src/gtkui/columns.c:34
+msgid "File name"
+msgstr "ഫയല്‍ നെയിം"
+
+#: src/gtkui/columns.c:35
+msgid "Custom title"
+msgstr "സ്വേച്ഛയാലുള്ള തലക്കെട്ട്"
+
+#: src/gtkui/columns.c:35
+msgid "Bitrate"
+msgstr "ബിറ്റ്‌റേറ്റ്"
+
+#: src/gtkui/columns.c:277
+msgid "Choose Columns"
+msgstr "നിരകള്‍ തിരഞ്ഞെടുക്കുക"
+
+#: src/gtkui/columns.c:293
+msgid "Available:"
+msgstr "ലഭ്യം:"
+
+#: src/gtkui/columns.c:327
+msgid "Chosen:"
+msgstr "തിരഞ്ഞെടുക്കപ്പെട്ടു:"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Left"
+msgstr "ഇടതുവശത്ത് ഡോക്ക് ചെയ്യുക"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Right"
+msgstr "വലതുവശത്ത് ഡോക്ക് ചെയ്യുക"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Top"
+msgstr "മുകളില്‍ ഡോക്ക് ചെയ്യുക"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Bottom"
+msgstr "താഴെ ഡോക്ക് ചെയ്യുക"
+
+#: src/gtkui/layout.c:120
+msgid "Undock"
+msgstr "ഡോക്കിങ് ഒഴിവാക്കുക"
+
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
+msgid "Disable"
+msgstr "അസാദ്ധ്യമാക്കുക"
+
+#: src/gtkui/menus.c:170
+msgid "_Open Files ..."
+msgstr "ഫയലുകള്‍ _തുറക്കുക ..."
+
+#: src/gtkui/menus.c:171
+msgid "Open _URL ..."
+msgstr "_URL തുറക്കുക"
+
+#: src/gtkui/menus.c:172
+msgid "_Add Files ..."
+msgstr "_ഫയലുകള്‍ ചേര്‍ക്കുക"
+
+#: src/gtkui/menus.c:173
+msgid "Add U_RL ..."
+msgstr "U_RL ചേര്‍ക്കുക"
+
+#: src/gtkui/menus.c:175
+msgid "_Search Library"
+msgstr ""
+
+#: src/gtkui/menus.c:177
+msgid "A_bout ..."
+msgstr "_ഇതേപ്പറ്റി ..."
+
+#: src/gtkui/menus.c:178
+msgid "_Preferences ..."
+msgstr "_മുന്‍ഗണനകള്‍ ..."
+
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
+msgid "_Quit"
+msgstr "_പുറത്തുകടക്കുക"
+
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
+msgid "_Play"
+msgstr "_പാടുക"
+
+#: src/gtkui/menus.c:183
+msgid "Paus_e"
+msgstr "പോ_സ് ചെയ്യുക"
+
+#: src/gtkui/menus.c:184
+msgid "_Stop"
+msgstr "_നിര്‍ത്തുക"
+
+#: src/gtkui/menus.c:185
+msgid "Pre_vious"
+msgstr "_മുമ്പത്തേത്"
+
+#: src/gtkui/menus.c:186
+msgid "_Next"
+msgstr "_അടുത്തത്"
+
+#: src/gtkui/menus.c:188
+msgid "_Repeat"
+msgstr "_ആവര്‍ത്തിയ്ക്കുക"
+
+#: src/gtkui/menus.c:189
+msgid "S_huffle"
+msgstr "_കശക്കുക"
+
+#: src/gtkui/menus.c:190
+msgid "N_o Playlist Advance"
+msgstr ""
+
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "_ഈ പാട്ട് കഴിഞ്ഞാല്‍ നിര്‍ത്തുക"
+
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
+msgid "Song _Info ..."
+msgstr "സോങ് ഇന്‍ഫോ ..."
+
+#: src/gtkui/menus.c:194
+msgid "Jump to _Time ..."
+msgstr ""
+
+#: src/gtkui/menus.c:195
+msgid "_Jump to Song ..."
+msgstr ""
+
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
+msgid "By _Title"
+msgstr "_ടൈറ്റില്‍ അനുസരിച്ച്"
+
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "_ഫയല്‍നെയിം അനുസരിച്ച്"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "ഫയല്‍_പാത്ത് അനുസരിച്ച്"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "ട്രാക്ക് _നമ്പര്‍ അനുസരിച്ച്"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
+msgid "By _Artist"
+msgstr "_ആര്‍ട്ടിസ്റ്റിനനുസരിച്ച്"
+
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "ആ_ല്‍ബമനുസരിച്ച്"
+
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
+msgid "By Release _Date"
+msgstr "റിലീസ് ഡേറ്റ് അനുസരിച്ച്"
+
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "_നീളമനുസരിച്ച്"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
+msgid "By _File Path"
+msgstr "ഫയല്‍ പാത്ത് അനുസരിച്ച്"
+
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
+msgid "By _Custom Title"
+msgstr "സ്വേച്ഛയാലുള്ള തലക്കെട്ട് അനുസരിച്ച്"
+
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
+msgid "R_everse Order"
+msgstr ""
+
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
+msgid "_Random Order"
+msgstr ""
+
+#: src/gtkui/menus.c:233
+msgid "_Play This Playlist"
+msgstr "ഈ പ്ലേലിസ്റ്റ് _പാടുക"
+
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
+msgid "_Refresh"
+msgstr "പു_തുക്കുക"
+
+#: src/gtkui/menus.c:236
+msgid "_Sort"
+msgstr "_ക്രമത്തിലാക്കുക"
+
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "തിരഞ്ഞെടുത്തവ ക്രമീകരിയ്ക്കുക"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "_പകര്‍പ്പുകള്‍ നീക്കം ചെയ്യുക"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "_ലഭ്യമല്ലാത്ത ഫയലുകള്‍ നീക്കം ചെയ്യുക"
+
+#: src/gtkui/menus.c:241
+msgid "_New"
+msgstr "_പുതിയത്"
+
+#: src/gtkui/menus.c:242
+msgid "Ren_ame ..."
+msgstr "പേര് _മാറ്റുക"
+
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
+msgid "_Close"
+msgstr "_അടയ്ക്കുക"
+
+#: src/gtkui/menus.c:245
+msgid "_Import ..."
+msgstr "_ഇറക്കുമതി ചെയ്യുക ..."
+
+#: src/gtkui/menus.c:246
+msgid "_Export ..."
+msgstr "_കയറ്റുമതി ചെയ്യുക ..."
+
+#: src/gtkui/menus.c:248
+msgid "Playlist _Manager ..."
+msgstr "പ്ലേലിസ്റ്റ് _മാനേജര്‍ ..."
+
+#: src/gtkui/menus.c:249
+msgid "_Queue Manager ..."
+msgstr "ക്യൂ മാനേജര്‍ ..."
+
+#: src/gtkui/menus.c:252
+msgid "Volume _Up"
+msgstr "ശബ്ദം കൂട്ടുക (_U)"
+
+#: src/gtkui/menus.c:253
+msgid "Volume _Down"
+msgstr "ശബ്ദം കുറയ്ക്കുക (_D)"
+
+#: src/gtkui/menus.c:255
+msgid "_Equalizer"
+msgstr "_ഈക്വലൈസര്‍"
+
+#: src/gtkui/menus.c:257
+msgid "E_ffects"
+msgstr "_പ്രഭാവങ്ങള്‍"
+
+#: src/gtkui/menus.c:260
+msgid "_Interface"
+msgstr "_ഇന്റര്‍ഫെയ്സ്"
+
+#: src/gtkui/menus.c:261
+msgid "_Visualizations"
+msgstr "_ദൃശ്യവത്കരണങ്ങള്‍"
+
+#: src/gtkui/menus.c:263
+msgid "Show _Menu Bar"
+msgstr "_മെനുബാര്‍ കാണിയ്ക്കുക"
+
+#: src/gtkui/menus.c:264
+msgid "Show I_nfo Bar"
+msgstr "_ഇന്‍ഫോബാര്‍ കാണിയ്ക്കുക"
+
+#: src/gtkui/menus.c:265
+msgid "Show Info Bar Vis_ualization"
+msgstr ""
+
+#: src/gtkui/menus.c:266
+msgid "Show _Status Bar"
+msgstr "_സ്റ്റാറ്റസ്ബാര്‍ കാണിയ്ക്കുക"
+
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
+msgid "Show Close _Buttons"
+msgstr "ക്ലോസ് _ബട്ടണുകള്‍ കാണിയ്ക്കുക"
+
+#: src/gtkui/menus.c:271
+msgid "Show Column _Headers"
+msgstr ""
+
+#: src/gtkui/menus.c:272
+msgid "Choose _Columns ..."
+msgstr "_കോളങ്ങള്‍ തിരഞ്ഞെടുക്കുക ..."
+
+#: src/gtkui/menus.c:273
+msgid "Scrol_l on Song Change"
+msgstr ""
+
+#: src/gtkui/menus.c:276
+msgid "_File"
+msgstr "_ഫയല്‍"
+
+#: src/gtkui/menus.c:277
+msgid "_Playback"
+msgstr "_പ്ലേബാക്ക്"
+
+#: src/gtkui/menus.c:278
+msgid "P_laylist"
+msgstr "പ്ലേ_ലിസ്റ്റ്"
+
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
+msgid "_Services"
+msgstr "_സേവനങ്ങള്‍"
+
+#: src/gtkui/menus.c:280
+msgid "_Output"
+msgstr "_ഔട്പുട്ട്"
+
+#: src/gtkui/menus.c:281
+msgid "_View"
+msgstr "_കാഴ്ച"
+
+#: src/gtkui/menus.c:285
+msgid "_Queue/Unqueue"
+msgstr "_ക്യൂ/അണ്‍ക്യൂ"
+
+#: src/gtkui/menus.c:288
+msgid "Cu_t"
+msgstr "_മുറിയ്ക്കുക"
+
+#: src/gtkui/menus.c:289
+msgid "_Copy"
+msgstr "_പകര്‍ത്തുക"
+
+#: src/gtkui/menus.c:290
+msgid "_Paste"
+msgstr "_ഒട്ടിയ്ക്കുക"
+
+#: src/gtkui/menus.c:291
+msgid "Select _All"
+msgstr "_എല്ലാം തിരഞ്ഞെടുക്കുക"
+
+#: src/gtkui/menus.c:297
+msgid "_Rename ..."
+msgstr "പേര് _മാറ്റുക ..."
+
+#: src/gtkui/ui_gtk.c:96
+msgid "GTK Interface"
+msgstr ""
+
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - ഒഡാഷ്യസ്"
+
+#: src/gtkui/ui_gtk.c:204
+msgid "Buffering ..."
+msgstr "ബഫര്‍ ചെയ്യുന്നു ..."
+
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
+msgid "Audacious"
+msgstr "ഒഡാഷ്യസ്"
+
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
+msgid "Error"
+msgstr "പിശക്"
+
+#: src/gtkui/ui_statusbar.c:108
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtkui/ui_statusbar.c:123
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr "മുമ്പത്തെ ട്രാക്ക്"
+
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
+msgid "Play"
+msgstr "പാടുക"
+
+#: src/hotkey/gui.c:72
+msgid "Pause/Resume"
+msgstr "പോസ്/റെസ്യൂം"
+
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
+msgid "Stop"
+msgstr "നിര്‍ത്തുക"
+
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr "അടുത്ത ട്രാക്ക്"
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "5 സെക്കന്‍ഡ് മുന്നോട്ട്"
+
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
+msgstr "5 സെക്കന്‍ഡ് പിന്നോട്ട്"
+
+#: src/hotkey/gui.c:77
+msgid "Mute"
+msgstr "നിശ്ശബ്ദമാക്കുക"
+
+#: src/hotkey/gui.c:78
+msgid "Volume up"
+msgstr "ശബ്ദം കൂട്ടുക"
+
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr "ശബ്ദം കുറയ്ക്കുക"
+
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
+msgstr ""
+
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr ""
+
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "ഓണ്‍-സ്ക്രീന്‍-ഡിസ്‌പ്ലേ കാണിയ്ക്കുക"
+
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
+msgstr ""
+
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
+msgstr ""
+
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr ""
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
+msgstr ""
+
+#: src/hotkey/gui.c:96
+msgid "(none)"
+msgstr "(ശൂന്യം)"
+
+#: src/hotkey/gui.c:233
+msgid ""
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+
+#: src/hotkey/gui.c:235
+msgid "Binding mouse buttons"
+msgstr ""
+
+#: src/hotkey/gui.c:385
+msgid "Global Hotkey Plugin Configuration"
+msgstr ""
+
+#: src/hotkey/gui.c:401
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+
+#: src/hotkey/gui.c:406
+msgid "Hotkeys:"
+msgstr "ഹോട്കീകള്‍"
+
+#: src/hotkey/gui.c:423
+msgid "Action:"
+msgstr ""
+
+#: src/hotkey/gui.c:430
+msgid "Key Binding:"
+msgstr ""
+
+#: src/hotkey/plugin.c:66
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+
+#: src/hotkey/plugin.c:78
+msgid "Global Hotkeys"
+msgstr ""
+
+#: src/jack/jack.c:410
+msgid ""
+"Based on xmms-jack, by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Ported to Audacious by Giacomo Lozito"
+msgstr ""
+
+#: src/jack/jack.c:416
+msgid "JACK Output"
+msgstr "ജാക്ക് ഔട്പുട്ട്"
+
+#: src/ladspa/plugin.c:493
+#, c-format
+msgid "%s Settings"
+msgstr "%s ക്രമീകരണങ്ങള്‍"
+
+#: src/ladspa/plugin.c:561
+msgid "LADSPA Host Settings"
+msgstr ""
+
+#: src/ladspa/plugin.c:570
+msgid "Module paths:"
+msgstr "മൊഡ്യൂള്‍ പാത്തുകള്‍:"
+
+#: src/ladspa/plugin.c:575
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+
+#: src/ladspa/plugin.c:591
+msgid "Available plugins:"
+msgstr "ലഭ്യമായ പ്ലഗ്ഗിന്നുകള്‍:"
+
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
+msgid "Enable"
+msgstr "സാദ്ധ്യമാക്കുക"
+
+#: src/ladspa/plugin.c:610
+msgid "Enabled plugins:"
+msgstr "പ്ലഗ്ഗിനുകള്‍ സാദ്ധ്യമാക്കുക:"
+
+#: src/ladspa/plugin.c:626
+msgid "Settings"
+msgstr "ക്രമീകരണങ്ങള്‍"
+
+#: src/ladspa/plugin.c:645
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+
+#: src/ladspa/plugin.c:650
+msgid "LADSPA Host"
+msgstr "LADSPA ഹോസ്റ്റ്"
+
+#: src/lirc/lirc.c:76
+#, c-format
+msgid "%s: could not init LIRC support\n"
+msgstr ""
+
+#: src/lirc/lirc.c:83
+#, c-format
+msgid ""
+"%s: could not read LIRC config file\n"
+"%s: please read the documentation of LIRC\n"
+"%s: how to create a proper config file\n"
+msgstr ""
+
+#: src/lirc/lirc.c:114
+#, c-format
+msgid "%s: trying to reconnect...\n"
+msgstr ""
+
+#: src/lirc/lirc.c:354
+#, c-format
+msgid "%s: unknown command \"%s\"\n"
+msgstr ""
+
+#: src/lirc/lirc.c:365
+#, c-format
+msgid "%s: disconnected from LIRC\n"
+msgstr ""
+
+#: src/lirc/lirc.c:371
+#, c-format
+msgid "%s: will try reconnect every %d seconds...\n"
+msgstr ""
+
+#: src/lirc/lirc.c:381
+msgid ""
+"A simple plugin to control Audacious using the LIRC remote control daemon\n"
+"\n"
+"Adapted for Audacious by:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Based on the XMMS LIRC plugin by:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"For more information about LIRC, see http://lirc.org."
+msgstr ""
+
+#: src/lirc/lirc.c:392
+msgid "Connection"
+msgstr "ബന്ധം"
+
+#: src/lirc/lirc.c:393
+msgid "Reconnect to LIRC server"
+msgstr "LIRC സെര്‍വറുമായി വീണ്ടും ബന്ധിപ്പിയ്ക്കുക"
+
+#: src/lirc/lirc.c:395
+msgid "Wait before reconnecting:"
+msgstr ""
+
+#: src/lirc/lirc.c:405
+msgid "LIRC Plugin"
+msgstr "LIRC പ്ലഗ്ഗിന്‍"
+
+#: src/lyricwiki/lyricwiki.c:117
+msgid "No lyrics available"
+msgstr "വരികള്‌ ലഭ്യമല്ല"
+
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
+#, c-format
+msgid "Unable to fetch %s"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
+#, c-format
+msgid "Unable to parse %s"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:260
+msgid "Looking for lyrics ..."
+msgstr "വരികള്‍ക്കായി നോക്കുന്നു ..."
+
+#: src/lyricwiki/lyricwiki.c:271
+msgid "Missing song metadata"
+msgstr "ചില മെറ്റാഡേറ്റ ലഭ്യമല്ല"
+
+#: src/lyricwiki/lyricwiki.c:284
+msgid "Connecting to lyrics.wikia.com ..."
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:411
+msgid "LyricWiki Plugin"
+msgstr "LyricWiki പ്ലഗ്ഗിന്‍"
+
+#: src/m3u/m3u.c:121
+msgid "M3U Playlists"
+msgstr "M3U പ്ലേലിസ്റ്റുകള്‍"
+
+#: src/metronom/metronom.c:127
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr ""
+
+#: src/metronom/metronom.c:129
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr ""
+
+#: src/metronom/metronom.c:246
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr ""
+
+#: src/metronom/metronom.c:255
+msgid "Tact Generator"
+msgstr "ടാക്റ്റ് ജനറേറ്റര്‍"
+
+#: src/mixer/mixer.c:169
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+
+#: src/mixer/mixer.c:173
+msgid "Channel Mixer"
+msgstr "ചാനല്‍ മിക്സര്‍"
+
+#: src/mixer/mixer.c:174
+msgid "Output channels:"
+msgstr "ഔട്പുട്ട് ചാനലുകള്‍:"
+
+#: src/mixer/mixer.c:184
+msgid "Channel Mixer"
+msgstr "ചാനല്‍ മിക്സര്‍"
+
+#: src/mms/mms.c:224
+msgid "MMS Plugin"
+msgstr "MMS പ്ലഗ്ഗിന്‍"
+
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "റെസല്യൂഷന്‍"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-ബിറ്റ്"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-ബിറ്റ്"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "ചാനലുകള്‍"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "റീസാംപ്ലിങ്"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "സാംപ്ലിങ് നിരക്ക്"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "തലം:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "കട്ടോഫ്:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "ബേസ് ബൂസ്റ്റ്"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "സറൗണ്ട്"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "പ്രീആംപ്"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "പലവക"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "ഓവര്‍സാമ്പ്ള്‍"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "നോയ്സ് റിഡക്ഷന്‍"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "ആവര്‍ത്തിയ്ക്കുക"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
+msgid "ModPlug (Module Player)"
+msgstr ""
+
+#: src/mpg123/mpg123.c:213
+msgid "Surround"
+msgstr "സറൗണ്ട്"
+
+#: src/mpg123/mpg123.c:569
+msgid "MPG123 Plugin"
+msgstr "MPG123 പ്ലഗ്ഗിന്‍"
+
+#: src/mpris2/plugin.c:403
+msgid "MPRIS 2 Server"
+msgstr "MPRIS 2 സെര്‍വര്‍"
+
+#: src/neon/neon.c:1228
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr ""
+
+#: src/notify/event.c:64
+msgid "Stopped"
+msgstr "നിര്‍ത്തി"
+
+#: src/notify/event.c:64
+msgid "Audacious is not playing."
+msgstr ""
+
+#: src/notify/notify.c:33
+msgid ""
+"Desktop Notifications Plugin for Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
+msgid "Desktop Notifications"
+msgstr "ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകള്‍"
+
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "കാണിയ്ക്കുക"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "പോസ് ചെയ്യുക"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "അടുത്തത്"
+
+#: src/oss4/plugin.c:36
+msgid "1. Default device"
+msgstr "1. സ്വതവേയുള്ള ഉപകരണം"
+
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
+msgid "Audio device:"
+msgstr "ഓഡിയോ ഉപകരണം:"
+
+#: src/oss4/plugin.c:77
+msgid "Use alternate device:"
+msgstr "ബദല്‍ ഉപകരണം ഉപയോഗിയ്ക്കുക"
+
+#: src/oss4/plugin.c:81
+msgid "Save volume between sessions."
+msgstr ""
+
+#: src/oss4/plugin.c:83
+msgid "Enable format conversions made by the OSS software."
+msgstr ""
+
+#: src/oss4/plugin.c:85
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr ""
+
+#: src/oss4/plugin.c:108
+msgid ""
+"OSS4 Output Plugin for Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+
+#: src/oss4/plugin.c:115
+msgid "OSS4 Output"
+msgstr "OSS4 ഔട്പുട്ട്"
+
+#: src/pls/pls.c:113
+msgid "PLS Playlists"
+msgstr ""
+
+#: src/psf/plugin.c:264
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr ""
+
+#: src/pulse_audio/pulse_audio.c:644
+msgid ""
+"Audacious PulseAudio Output Plugin\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+
+#: src/pulse_audio/pulse_audio.c:662
+msgid "PulseAudio Output"
+msgstr "പള്‍സ്‌ഓഡിയോ ഔട്പുട്ട്"
+
+#: src/resample/resample.c:161
+msgid ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/resample/resample.c:165
+msgid "Skip/repeat samples"
+msgstr ""
+
+#: src/resample/resample.c:166
+msgid "Linear interpolation"
+msgstr ""
+
+#: src/resample/resample.c:167
+msgid "Fast sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.c:168
+msgid "Medium sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.c:169
+msgid "Best sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.c:172
+msgid "Conversion"
+msgstr "കണ്‍വേര്‍ഷന്‍"
+
+#: src/resample/resample.c:173
+msgid "Method:"
+msgstr "രീതി:"
+
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
+msgid "Rate:"
+msgstr "തോത്:"
+
+#: src/resample/resample.c:179
+msgid "Rate Mappings"
+msgstr ""
+
+#: src/resample/resample.c:180
+msgid "Use rate mappings"
+msgstr ""
+
+#: src/resample/resample.c:182
+msgid "8 kHz:"
+msgstr "8 kHz:"
+
+#: src/resample/resample.c:185
+msgid "16 kHz:"
+msgstr "16 kHz:"
+
+#: src/resample/resample.c:188
+msgid "22.05 kHz:"
+msgstr "22.05 kHz:"
+
+#: src/resample/resample.c:191
+msgid "44.1 kHz:"
+msgstr "44.1 kHz:"
+
+#: src/resample/resample.c:194
+msgid "48 kHz:"
+msgstr "48 kHz:"
+
+#: src/resample/resample.c:197
+msgid "96 kHz:"
+msgstr "96 kHz:"
+
+#: src/resample/resample.c:200
+msgid "192 kHz:"
+msgstr "192 kHz:"
+
+#: src/resample/resample.c:210
+msgid "Sample Rate Converter"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr ""
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+
+#: src/sdlout/plugin.c:26
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+
+#: src/sdlout/plugin.c:31
+msgid "SDL Output"
+msgstr ""
+
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
+msgid "Library"
+msgstr ""
+
+#: src/search-tool/search-tool.c:219
+msgid "Unknown Artist"
+msgstr ""
+
+#: src/search-tool/search-tool.c:221
+msgid "Unknown Album"
+msgstr ""
+
+#: src/search-tool/search-tool.c:632
+#, c-format
+msgid ""
+"%s\n"
+" on %s by %s"
+msgstr ""
+
+#: src/search-tool/search-tool.c:638
+#, c-format
+msgid "%d album"
+msgid_plural "%d albums"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/search-tool/search-tool.c:640
+#, c-format
+msgid ""
+"%s\n"
+" %s, %d song"
+msgid_plural ""
+"%s\n"
+" %s, %d songs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/search-tool/search-tool.c:646
+#, c-format
+msgid ""
+"%s\n"
+" %d song by %s"
+msgid_plural ""
+"%s\n"
+" %d songs by %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/search-tool/search-tool.c:687
+msgid "_Create Playlist"
+msgstr ""
+
+#: src/search-tool/search-tool.c:694
+msgid "_Add to Playlist"
+msgstr "പ്ലേലിസ്റ്റിലേയ്ക്ക് _ചേര്‍ക്കുക"
+
+#: src/search-tool/search-tool.c:734
+msgid "Search library"
+msgstr ""
+
+#: src/search-tool/search-tool.c:739
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+
+#: src/search-tool/search-tool.c:747
+msgid "Please wait ..."
+msgstr ""
+
+#: src/search-tool/search-tool.c:769
+msgid "Choose Folder"
+msgstr ""
+
+#: src/search-tool/search-tool.c:808
+msgid "Search Tool"
+msgstr ""
+
+#: src/skins/plugin.c:49
+msgid "Winamp Classic Interface"
+msgstr ""
+
+#: src/skins/skins_cfg.c:204
+msgid "_Player:"
+msgstr "_പ്ലേയര്‍:"
+
+#: src/skins/skins_cfg.c:205
+msgid "Select main player window font:"
+msgstr ""
+
+#: src/skins/skins_cfg.c:207
+msgid "_Playlist:"
+msgstr "പ്ലേ_ലിസ്റ്റ്:"
+
+#: src/skins/skins_cfg.c:208
+msgid "Select playlist font:"
+msgstr ""
+
+#: src/skins/skins_cfg.c:212
+msgid "_Fonts"
+msgstr "_ഫോണ്ടുകള്‍"
+
+#: src/skins/skins_cfg.c:215
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr ""
+
+#: src/skins/skins_cfg.c:217
+msgid "Scroll song title in both directions"
+msgstr ""
+
+#: src/skins/skins_cfg.c:295
+msgid "_Skin"
+msgstr "_സ്കിന്‍"
+
+#: src/skins/skins_cfg.c:342
+msgid "Interface Preferences"
+msgstr "ഇന്റര്‍ഫെയ്സ് ക്രമീകരണങ്ങള്‍"
+
+#: src/skins/ui_equalizer.c:328
+msgid "Preamp"
+msgstr "പ്രീആംപ്"
+
+#: src/skins/ui_equalizer.c:332
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/ui_equalizer.c:375
+msgid "Audacious Equalizer"
+msgstr "ഒഡാഷ്യസ് ഈക്വലൈസര്‍"
+
+#: src/skins/ui_equalizer.c:890
+msgid "Presets"
+msgstr "പ്രീസെറ്റുകള്‍"
+
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
+msgid "Load preset"
+msgstr "പ്രീസെറ്റ് ലോഡ് ചെയ്യുക"
+
+#: src/skins/ui_equalizer.c:988
+msgid "Load auto-preset"
+msgstr "ഓട്ടോ-പ്രീസെറ്റ് ലോഡ് ചെയ്യുക"
+
+#: src/skins/ui_equalizer.c:1018 src/skins/ui_equalizer.c:1036
+#: src/skins/ui_equalizer.c:1052
+msgid "Load equalizer preset"
+msgstr "ഈക്വലൈസര്‍ പ്രീസെറ്റ് ലോഡ് ചെയ്യുക"
+
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
+msgid "Save preset"
+msgstr "പ്രീസെറ്റ് സേവ് ചെയ്യുക"
+
+#: src/skins/ui_equalizer.c:1087
+msgid "Save auto-preset"
+msgstr "ഓട്ടോ പ്രീസെറ്റ് സേവ് ചെയ്യുക"
+
+#: src/skins/ui_equalizer.c:1118 src/skins/ui_equalizer.c:1154
+msgid "Save equalizer preset"
+msgstr "ഈക്വലൈസര്‍ പ്രീസെറ്റ് സേവ് ചെയ്യുക"
+
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
+msgid "Delete preset"
+msgstr "പ്രീസെറ്റ് നീക്കംചെയ്യുക"
+
+#: src/skins/ui_equalizer.c:1190
+msgid "Delete auto-preset"
+msgstr "ഓട്ടോ പ്രീസെറ്റ് നീക്കം ചെയ്യുക"
+
+#: src/skins/ui_main.c:414
+msgid "kbps"
+msgstr "kbps"
+
+#: src/skins/ui_main.c:422
+msgid "kHz"
+msgstr "kHz"
+
+#: src/skins/ui_main.c:770
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr ""
+
+#: src/skins/ui_main.c:791
+#, c-format
+msgid "Volume: %d%%"
+msgstr "ശബ്ദം: %d%%"
+
+#: src/skins/ui_main.c:814
+#, c-format
+msgid "Balance: %d%% left"
+msgstr ""
+
+#: src/skins/ui_main.c:816
+msgid "Balance: center"
+msgstr ""
+
+#: src/skins/ui_main.c:818
+#, c-format
+msgid "Balance: %d%% right"
+msgstr ""
+
+#: src/skins/ui_main.c:942
+msgid "Options Menu"
+msgstr "ഓപ്ഷന്‍സ് മെനു"
+
+#: src/skins/ui_main.c:946
+msgid "Disable 'Always On Top'"
+msgstr "'എപ്പോഴും മുകളില്‍' അസാദ്ധ്യമാക്കുക"
+
+#: src/skins/ui_main.c:948
+msgid "Enable 'Always On Top'"
+msgstr "'എപ്പോഴും മുകളില്‍' സാദ്ധ്യമാക്കുക"
+
+#: src/skins/ui_main.c:951
+msgid "File Info Box"
+msgstr "ഫയല്‍ ഇന്‍ഫോ ജാലകം"
+
+#: src/skins/ui_main.c:956
+msgid "Visualization Menu"
+msgstr "ദൃശ്യവത്കരണമെനു"
+
+#: src/skins/ui_main.c:1591
+msgid "Single mode."
+msgstr "സിംഗ്ള്‍ മോഡ്"
+
+#: src/skins/ui_main.c:1593
+msgid "Playlist mode."
+msgstr "പ്ലേലിസ്റ്റ് മോഡ്"
+
+#: src/skins/ui_main.c:1615
+msgid "Stopping after song."
+msgstr ""
+
+#: src/skins/ui_main.c:1617
+msgid "Not stopping after song."
+msgstr ""
+
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
+msgid "Autoscroll Song Name"
+msgstr ""
+
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
+msgid "Stop after Current Song"
+msgstr ""
+
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
+msgid "Peaks"
+msgstr ""
+
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
+msgid "Repeat"
+msgstr "ആവര്‍ത്തിയ്ക്കുക"
+
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
+msgid "Shuffle"
+msgstr "കശക്കുക"
+
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
+msgid "No Playlist Advance"
+msgstr ""
+
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
+msgid "Show Player"
+msgstr "പ്ലേയര്‍ പ്രദര്‍ശിപ്പിയ്ക്കുക"
+
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
+msgid "Show Playlist Editor"
+msgstr ""
+
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
+msgid "Show Equalizer"
+msgstr "ഈക്വലൈര്‍ പ്രദര്‍ശിപ്പിയ്ക്കുക"
+
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
+msgid "Always on Top"
+msgstr "എപ്പോഴും മുകളില്‍"
+
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
+msgid "Put on All Workspaces"
+msgstr ""
+
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
+msgid "Roll up Player"
+msgstr ""
+
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
+msgid "Roll up Playlist Editor"
+msgstr ""
+
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
+msgid "Roll up Equalizer"
+msgstr ""
+
+#: src/skins/ui_manager.c:114
+msgid "Analyzer"
+msgstr "അനലൈസര്‍"
+
+#: src/skins/ui_manager.c:115
+msgid "Scope"
+msgstr "സ്കോപ്പ്"
+
+#: src/skins/ui_manager.c:116
+msgid "Voiceprint"
+msgstr "വോയ്സ്‌പ്രിന്റ്"
+
+#: src/skins/ui_manager.c:117
+msgid "Off"
+msgstr "ഓഫ്"
+
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
+msgid "Normal"
+msgstr "സാധാരണം"
+
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+msgid "Fire"
+msgstr "തീ"
+
+#: src/skins/ui_manager.c:123
+msgid "Vertical Lines"
+msgstr "കുത്തനെയുള്ള വരകളം‍"
+
+#: src/skins/ui_manager.c:127
+msgid "Lines"
+msgstr "വരകള്‍"
+
+#: src/skins/ui_manager.c:128
+msgid "Bars"
+msgstr "നാടകള്‍"
+
+#: src/skins/ui_manager.c:132
+msgid "Dot Scope"
+msgstr "ഡോട്ട് സ്കോപ്പ്"
+
+#: src/skins/ui_manager.c:133
+msgid "Line Scope"
+msgstr "ലൈന്‍ സ്കോപ്പ്"
+
+#: src/skins/ui_manager.c:134
+msgid "Solid Scope"
+msgstr "സോളിഡ് സ്കോപ്പ്"
+
+#: src/skins/ui_manager.c:140
+msgid "Ice"
+msgstr ""
+
+#: src/skins/ui_manager.c:145
+msgid "Smooth"
+msgstr "മൃദുലം"
+
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
+msgid "Slowest"
+msgstr "വളരെപ്പതുക്കെ"
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slow"
+msgstr "പതുക്കെ"
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
+msgid "Medium"
+msgstr "പാകം"
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Fast"
+msgstr "വേഗം"
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fastest"
+msgstr "അതിദ്രുതം"
+
+#: src/skins/ui_manager.c:165
+msgid "Time Elapsed"
+msgstr "കഴിഞ്ഞ സമയം"
+
+#: src/skins/ui_manager.c:166
+msgid "Time Remaining"
+msgstr "ബാക്കിയുള്ള സമയം"
+
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
+msgid "Previous"
+msgstr "മുമ്പത്തേത്"
+
+#: src/skins/ui_manager.c:195
+msgid "Visualization"
+msgstr "ദൃശ്യവത്കരണം"
+
+#: src/skins/ui_manager.c:196
+msgid "Visualization Mode"
+msgstr "ദൃശ്യവത്കരണമോഡ്"
+
+#: src/skins/ui_manager.c:197
+msgid "Analyzer Mode"
+msgstr "അനലൈസര്‍ മോഡ്"
+
+#: src/skins/ui_manager.c:198
+msgid "Scope Mode"
+msgstr "സ്കോപ്പ് മോഡ്"
+
+#: src/skins/ui_manager.c:199
+msgid "Voiceprint Mode"
+msgstr "വോയ്സ്‌പ്രിന്റ് മോഡ്"
+
+#: src/skins/ui_manager.c:200
+msgid "WindowShade VU Mode"
+msgstr ""
+
+#: src/skins/ui_manager.c:201
+msgid "Analyzer Falloff"
+msgstr "അനലൈസര്‍ ഫാളോഫ്"
+
+#: src/skins/ui_manager.c:202
+msgid "Peaks Falloff"
+msgstr "പീക്ക്സ് ഫാളോഫ്"
+
+#: src/skins/ui_manager.c:207
+msgid "Playlist"
+msgstr "പ്ലേലിസ്റ്റ്"
+
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
+msgid "Play Playlist"
+msgstr "പ്ലേലിസ്റ്റ് പാടുക"
+
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
+msgid "New Playlist"
+msgstr "പുതിയ പ്ലേലിസ്റ്റ്"
+
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
+msgid "Select Next Playlist"
+msgstr "അടുത്ത പ്ലേലിസ്റ്റ് തിരഞ്ഞെടുക്കുക"
+
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
+msgid "Select Previous Playlist"
+msgstr "മുമ്പത്തെ പ്ലേലിസ്റ്റ് തിരഞ്ഞെടുക്കുക"
+
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
+msgid "Delete Playlist"
+msgstr "പ്ലേലിസ്റ്റ് നീക്കംചെയ്യുക"
+
+#: src/skins/ui_manager.c:224
+msgid "Import Playlist"
+msgstr "പ്ലേലിസ്റ്റ് ഇറക്കുമതി ചെയ്യുക"
+
+#: src/skins/ui_manager.c:225
+msgid "Loads a playlist file into the selected playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:228
+msgid "Export Playlist"
+msgstr "പ്ലേലിസ്റ്റ് കയറ്റുമതി ചെയ്യുക"
+
+#: src/skins/ui_manager.c:229
+msgid "Saves the selected playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:231
+msgid "Refresh List"
+msgstr "പട്ടിക പുതുക്കുക"
+
+#: src/skins/ui_manager.c:232
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr ""
+
+#: src/skins/ui_manager.c:235
+msgid "Playlist Manager"
+msgstr "പ്ലേലിസ്റ്റ് മാനേജര്‍"
+
+#: src/skins/ui_manager.c:238
+msgid "Queue Manager"
+msgstr "ക്യൂ മാനേജര്‍"
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "കാണുക"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "ഇന്റര്‍ഫെയ്സ്"
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr "ഇന്റര്‍ഫെയ്സ് മുന്‍ഗണനകള്‍"
+
+#: src/skins/ui_manager.c:250
+msgid "Add Internet Address..."
+msgstr "ഇന്റര്‍നെറ്റ് വിലാസം ചേര്‍ക്കുക"
+
+#: src/skins/ui_manager.c:251
+msgid "Adds a remote track to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:254
+msgid "Add Files..."
+msgstr "ഫയലുകള്‍ ചേര്‍ക്കുക..."
+
+#: src/skins/ui_manager.c:255
+msgid "Adds files to the playlist."
+msgstr "പ്ലേലിസ്റ്റിലേയ്ക്ക് ഫയലുകള്‍ ചേര്‍ക്കുക"
+
+#: src/skins/ui_manager.c:260
+msgid "Search and Select"
+msgstr "തിരയുക, തിരഞ്ഞെടുക്കുക"
+
+#: src/skins/ui_manager.c:261
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr ""
+
+#: src/skins/ui_manager.c:264
+msgid "Invert Selection"
+msgstr "തിരഞ്ഞെടുപ്പ് ഇന്‍വേര്‍ട്ട് ചെയ്യുക"
+
+#: src/skins/ui_manager.c:265
+msgid "Inverts the selected and unselected entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:268
+msgid "Select All"
+msgstr "എല്ലാം തിരഞ്ഞെടുക്കുക"
+
+#: src/skins/ui_manager.c:269
+msgid "Selects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:272
+msgid "Select None"
+msgstr "ഒന്നും തിരഞ്ഞെടുക്കേണ്ട"
+
+#: src/skins/ui_manager.c:273
+msgid "Deselects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:278
+msgid "Remove All"
+msgstr "എല്ലാം നീക്കം ചെയ്യുക"
+
+#: src/skins/ui_manager.c:279
+msgid "Removes all entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:282
+msgid "Clear Queue"
+msgstr "വരി വെടിപ്പാക്കുക"
+
+#: src/skins/ui_manager.c:283
+msgid "Clears the queue associated with this playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:286
+msgid "Remove Unavailable Files"
+msgstr "ലഭ്യമല്ലാത്ത ഫയലുകള്‍ നീക്കംചെയ്യുക"
+
+#: src/skins/ui_manager.c:287
+msgid "Removes unavailable files from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:290
+msgid "Remove Duplicates"
+msgstr ""
+
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
+msgid "By Title"
+msgstr "ടൈറ്റിലിനനുസരിച്ച്"
+
+#: src/skins/ui_manager.c:293
+msgid "Removes duplicate entries from the playlist by title."
+msgstr ""
+
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
+msgid "By Filename"
+msgstr "ഫയല്‍നെയിമനുസരിച്ച്"
+
+#: src/skins/ui_manager.c:297
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr ""
+
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
+msgid "By Path + Filename"
+msgstr ""
+
+#: src/skins/ui_manager.c:301
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr ""
+
+#: src/skins/ui_manager.c:304
+msgid "Remove Unselected"
+msgstr "തിരഞ്ഞെടുക്കാത്തവ നീക്കംചെയ്യുക"
+
+#: src/skins/ui_manager.c:305
+msgid "Remove unselected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:308
+msgid "Remove Selected"
+msgstr "തിരഞ്ഞെടുത്തവ നീക്കംചെയ്യുക"
+
+#: src/skins/ui_manager.c:309
+msgid "Remove selected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:314
+msgid "Randomize List"
+msgstr ""
+
+#: src/skins/ui_manager.c:315
+msgid "Randomizes the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:318
+msgid "Reverse List"
+msgstr "പട്ടിക തലതിരിയ്ക്കുക"
+
+#: src/skins/ui_manager.c:319
+msgid "Reverses the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:322
+msgid "Sort List"
+msgstr "പട്ടിക അക്ഷരമാലാക്രമത്തിലാക്കുക"
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "Sorts the list by title."
+msgstr ""
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+msgid "By Album"
+msgstr "ആല്‍ബമനുസരിച്ച്"
+
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+msgid "Sorts the list by album."
+msgstr ""
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+msgid "By Artist"
+msgstr "ആര്‍ട്ടസ്റ്റിനനുസരിച്ച്"
+
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+msgid "Sorts the list by artist."
+msgstr ""
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "Sorts the list by filename."
+msgstr ""
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "Sorts the list by full pathname."
+msgstr ""
+
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+msgid "By Date"
+msgstr "തീയതിയ്ക്കനുസരിച്ച്"
+
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+msgid "Sorts the list by modification time."
+msgstr ""
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+msgid "By Track Number"
+msgstr "ട്രാക്ക് നമ്പര്‍ അനുസരിച്ച്"
+
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+msgid "Sorts the list by track number."
+msgstr ""
+
+#: src/skins/ui_manager.c:352
+msgid "Sort Selected"
+msgstr "തിരഞ്ഞെടുത്തവ ക്രമീകരിയ്ക്കുക"
+
+#: src/skins/ui_manager.c:388
+msgid "File"
+msgstr "ഫയല്‍"
+
+#: src/skins/ui_manager.c:391
+msgid "Plugin Services"
+msgstr "പ്ലഗ്ഗിന്‍ സേവങ്ങള്‍"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View Track Details"
+msgstr "ട്രാക്ക് വിശദാംശങ്ങള്‍ കാണുക"
+
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+msgid "View track details"
+msgstr "ട്രാക്ക് വിശദാംശങ്ങള്‍ കാണുക"
+
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
+msgid "About Audacious"
+msgstr "ഒഡാഷ്യസ്സിനെപ്പറ്റി"
+
+#: src/skins/ui_manager.c:402
+msgid "Play File"
+msgstr "ഫയല്‍ പാടുക"
+
+#: src/skins/ui_manager.c:403
+msgid "Load and play a file"
+msgstr "ഒരു ഫയല്‍ തുറന്ന് പാടുക"
+
+#: src/skins/ui_manager.c:405
+msgid "Play Location"
+msgstr "ലൊക്കേഷന്‍ പാടുക"
+
+#: src/skins/ui_manager.c:406
+msgid "Play media from the selected location"
+msgstr ""
+
+#: src/skins/ui_manager.c:408
+msgid "Plugin services"
+msgstr "പ്ലഗ്ഗിന്‍ സേവനങ്ങള്‍"
+
+#: src/skins/ui_manager.c:410
+msgid "Preferences"
+msgstr "മുന്‍ഗണനകള്‍"
+
+#: src/skins/ui_manager.c:411
+msgid "Open preferences window"
+msgstr "മുന്‍ഗണനാജാലകം തുറക്കുക"
+
+#: src/skins/ui_manager.c:414
+msgid "Quit Audacious"
+msgstr "ഒഡാഷ്യസ്സില്‍നിന്ന് പുറത്തുകടക്കുക"
+
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
+msgid "Set A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
+msgid "Clear A-B"
+msgstr ""
+
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "ഫയലിലേയ്ക്ക് ചാടുക"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
+msgid "Jump to Time"
+msgstr ""
+
+#: src/skins/ui_manager.c:428
+msgid "Queue Toggle"
+msgstr ""
+
+#: src/skins/ui_manager.c:429
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr ""
+
+#: src/skins/ui_manager.c:432
+msgid "Copy"
+msgstr "പകര്‍ത്തുക"
+
+#: src/skins/ui_manager.c:435
+msgid "Cut"
+msgstr "മുറിയ്ക്കുക"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "ഒട്ടിയ്ക്കുക"
+
+#: src/skins/ui_manager.c:445
+msgid "Load"
+msgstr "ലോഡ് ചെയ്യുക"
+
+#: src/skins/ui_manager.c:446
+msgid "Import"
+msgstr "ഇറക്കുമതി ചെയ്യുക"
+
+#: src/skins/ui_manager.c:447
+msgid "Save"
+msgstr "സേവ്"
+
+#: src/skins/ui_manager.c:448
+msgid "Delete"
+msgstr "നീക്കം ചെയ്യുക"
+
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
+msgid "Preset"
+msgstr "പ്രീസെറ്റ്"
+
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
+msgid "Auto-load preset"
+msgstr "പ്രീസെറ്റ് സ്വയം ലോഡ് ചെയ്യുക"
+
+#: src/skins/ui_manager.c:454
+msgid "Load auto-load preset"
+msgstr ""
+
+#: src/skins/ui_manager.c:457
+msgid "Load default preset into equalizer"
+msgstr ""
+
+#: src/skins/ui_manager.c:459
+msgid "Zero"
+msgstr "പൂജ്യം"
+
+#: src/skins/ui_manager.c:460
+msgid "Set equalizer preset levels to zero"
+msgstr ""
+
+#: src/skins/ui_manager.c:462
+msgid "From file"
+msgstr "ഫയലില്‍നിന്ന്"
+
+#: src/skins/ui_manager.c:463
+msgid "Load preset from file"
+msgstr "ഫയലില്‍നിന്ന് പ്രീസെറ്റ് ലോഡ് ചെയ്യുക"
+
+#: src/skins/ui_manager.c:465
+msgid "From WinAMP EQF file"
+msgstr ""
+
+#: src/skins/ui_manager.c:466
+msgid "Load preset from WinAMP EQF file"
+msgstr ""
+
+#: src/skins/ui_manager.c:468
+msgid "WinAMP Presets"
+msgstr "WinAMP പ്രീസെറ്റുകള്‍"
+
+#: src/skins/ui_manager.c:469
+msgid "Import WinAMP presets"
+msgstr "WinAMP പ്രീസെറ്റുകള്‍ ഇറക്കുമതിചെയ്യുക"
+
+#: src/skins/ui_manager.c:475
+msgid "Save auto-load preset"
+msgstr "ഓട്ടോ-ലോഡ് പ്രീസെറ്റ് സേവ് ചെയ്യുക"
+
+#: src/skins/ui_manager.c:478
+msgid "Save default preset"
+msgstr ""
+
+#: src/skins/ui_manager.c:480
+msgid "To file"
+msgstr "ഫയലിലേയ്ക്ക്"
+
+#: src/skins/ui_manager.c:481
+msgid "Save preset to file"
+msgstr "പ്രീസെറ്റ് ഫയലിലേയ്ക്ക് സേവ് ചെയ്യുക"
+
+#: src/skins/ui_manager.c:483
+msgid "To WinAMP EQF file"
+msgstr ""
+
+#: src/skins/ui_manager.c:484
+msgid "Save preset to WinAMP EQF file"
+msgstr ""
+
+#: src/skins/ui_manager.c:490
+msgid "Delete auto-load preset"
+msgstr "ഓട്ടോ-ലോഡ് പ്രീസെറ്റ് നീക്കംചെയ്യുക"
+
+#: src/skins/ui_playlist.c:244
+msgid "Search entries in active playlist"
+msgstr "സജീവമായ പ്ലേലിസ്റ്റിലെ എന്‍ട്രികള്‍ തിരയുക"
+
+#: src/skins/ui_playlist.c:251
+msgid ""
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr ""
+
+#: src/skins/ui_playlist.c:259
+msgid "Title: "
+msgstr "ടൈറ്റില്‍:"
+
+#: src/skins/ui_playlist.c:267
+msgid "Album: "
+msgstr "ആല്‍ബം:"
+
+#: src/skins/ui_playlist.c:275
+msgid "Artist: "
+msgstr "ആര്‍ട്ടിസ്റ്റ്:"
+
+#: src/skins/ui_playlist.c:283
+msgid "Filename: "
+msgstr "ഫയല്‍നെയിം:"
+
+#: src/skins/ui_playlist.c:292
+msgid "Clear previous selection before searching"
+msgstr "തിരയുന്നതിനുമുമ്പ് മുമ്പുള്ള തിരഞ്ഞെടുപ്പ് വെടിപ്പാക്കുക"
+
+#: src/skins/ui_playlist.c:295
+msgid "Automatically toggle queue for matching entries"
+msgstr ""
+
+#: src/skins/ui_playlist.c:298
+msgid "Create a new playlist with matching entries"
+msgstr "യോജിയ്ക്കുന്ന എന്‍ട്രികള്‍ ഉപയോഗിച്ച് പുതിയൊരു പ്ലേലിസ്റ്റ് ഉണ്ടാക്കുക"
+
+#: src/skins/ui_playlist.c:738
+msgid "Audacious Playlist Editor"
+msgstr "ഒഡാഷ്യസ് പ്ലേലിസ്റ്റ് എഡിറ്റര്‍"
+
+#: src/skins/ui_playlist.c:772
+#, c-format
+msgid "%s (%d of %d)"
+msgstr ""
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr ""
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr ""
+
+#: src/skins/util.c:773
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr ""
+
+#: src/sndfile/plugin.c:416
+msgid ""
+"Based on the xmms_sndfile plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+
+#: src/sndfile/plugin.c:435
+msgid "Sndfile Plugin"
+msgstr "Sndfile പ്ലഗ്ഗിന്‍"
+
+#: src/sndio/sndio.c:172
+msgid "About Sndio Output Plugin"
+msgstr ""
+
+#: src/sndio/sndio.c:173
+msgid ""
+"Sndio Output Plugin\n"
+"\n"
+"Written by Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+
+#: src/sndio/sndio.c:248
+msgid "Unsupported format"
+msgstr "പിന്തുണയില്ലാത്ത ഫോര്‍മാറ്റ്"
+
+#: src/sndio/sndio.c:249
+msgid ""
+"A format not supported by the audio device was requested.\n"
+"\n"
+"Please try again with the sndiod(1) server running."
+msgstr ""
+
+#: src/sndio/sndio.c:384
+msgid "sndio device"
+msgstr ""
+
+#: src/sndio/sndio.c:400
+msgid "(empty means default)"
+msgstr ""
+
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "ശരി"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "റദ്ദാക്കുക"
+
+#: src/song_change/song_change.c:54
+msgid "Song Change"
+msgstr ""
+
+#: src/song_change/song_change.c:436
+msgid "Command to run when Audacious starts a new song."
+msgstr ""
+
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
+msgid "Command:"
+msgstr "കല്‍പ്പന:"
+
+#: src/song_change/song_change.c:442
+msgid "Command to run toward the end of a song."
+msgstr ""
+
+#: src/song_change/song_change.c:448
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr ""
+
+#: src/song_change/song_change.c:454
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr ""
+
+#: src/song_change/song_change.c:460
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command):\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%l: Length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr ""
+
+#: src/song_change/song_change.c:487
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr ""
+
+#: src/song_change/song_change.c:498
+msgid "Commands"
+msgstr "കല്‍പ്പനകള്‍"
+
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "ദ്രുതം"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "താഴ്ന്നത്"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "ഉയര്‍ന്നത്"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "വളരെ ഉയര്‍ന്നത്"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "ഗുണമേന്മ:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "SoX റീസാംപ്ലര്‍"
+
+#: src/speed-pitch/speed-pitch.c:225
+msgid "Speed and Pitch"
+msgstr "വേഗവും ശ്രുതിയും"
+
+#: src/speed-pitch/speed-pitch.c:226
+msgid "Speed:"
+msgstr "വേഗം:"
+
+#: src/speed-pitch/speed-pitch.c:229
+msgid "Pitch:"
+msgstr "ശ്രൂതി:"
+
+#: src/speed-pitch/speed-pitch.c:264
+msgid "Speed and Pitch"
+msgstr "വേഗവും ശ്രുതിയും"
+
+#: src/statusicon/statusicon.c:390
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+
+#: src/statusicon/statusicon.c:397
+msgid "Mouse Scroll Action"
+msgstr ""
+
+#: src/statusicon/statusicon.c:398
+msgid "Change volume"
+msgstr "ശബ്ദോച്ചത മാറ്റുക"
+
+#: src/statusicon/statusicon.c:401
+msgid "Change playing song"
+msgstr "പാടുന്ന പാട്ട് മാറ്റുക"
+
+#: src/statusicon/statusicon.c:404
+msgid "Other Settings"
+msgstr "മറ്റു ക്രമീകരണങ്ങള്‍"
+
+#: src/statusicon/statusicon.c:405
+msgid "Disable the popup window"
+msgstr "പോപ്പപ്പ് ജാലകം അസാദ്ധ്യമാക്കുക"
+
+#: src/statusicon/statusicon.c:407
+msgid "Close to the system tray"
+msgstr "സിസ്റ്റം ട്രേയിലേയ്ക്ക് അടച്ചിടുക"
+
+#: src/statusicon/statusicon.c:409
+msgid "Advance in playlist when scrolling upward"
+msgstr ""
+
+#: src/statusicon/statusicon.c:418
+msgid "Status Icon"
+msgstr "സ്റ്റാറ്റസ് ഐക്കണ്‍"
+
+#: src/stereo_plugin/stereo.c:17
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+
+#: src/stereo_plugin/stereo.c:25
+msgid "Extra Stereo"
+msgstr "എക്സ്ട്രാ സ്റ്റീരിയോ"
+
+#: src/stereo_plugin/stereo.c:36
+msgid "Extra Stereo"
+msgstr "എക്സ്ട്രാ സ്റ്റീരിയോ"
+
+#: src/tonegen/tonegen.c:84
+#, c-format
+msgid "%s %.1f Hz"
+msgstr ""
+
+#: src/tonegen/tonegen.c:84
+msgid "Tone Generator: "
+msgstr "ടോണ്‍ ജനറേറ്റര്‍: "
+
+#: src/tonegen/tonegen.c:197
+msgid ""
+"Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
+msgstr ""
+
+#: src/tonegen/tonegen.c:206
+msgid "Tone Generator"
+msgstr "ടോണ്‍ ജനറേറ്റര്‍"
+
+#: src/unix-io/unix-io.c:243
+msgid ""
+"File I/O Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
+msgstr ""
+
+#: src/unix-io/unix-io.c:266
+msgid "File I/O Plugin"
+msgstr "ഫയല്‍ I/O പ്ലഗ്ഗിന്‍"
+
+#: src/voice_removal/voice_removal.c:58
+msgid "Voice Removal"
+msgstr "വോയ്സ് റിമൂവല്‍"
+
+#: src/vorbis/vorbis.c:562
+msgid ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Based on the Xiph.org Foundation's Ogg Vorbis Plugin:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Original code by:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contributions from:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+
+#: src/vorbis/vorbis.c:582
+msgid "Ogg Vorbis Decoder"
+msgstr "Ogg Vorbis ഡീകോഡര്‍"
+
+#: src/vtx/vtx.c:242
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+
+#: src/vtx/vtx.c:248
+msgid "VTX Decoder"
+msgstr "VTX ഡീകോഡര്‍"
+
+#: src/wavpack/wavpack.c:282
+msgid "lossy (hybrid)"
+msgstr "ലോസി (സങ്കരം)"
+
+#: src/wavpack/wavpack.c:284
+msgid "lossy"
+msgstr "ലോസി"
+
+#: src/wavpack/wavpack.c:334
+msgid ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
+msgstr ""
+
+#: src/wavpack/wavpack.c:341
+msgid "WavPack Decoder"
+msgstr "WavPack ഡീകോഡര്‍"
+
+#: src/xsf/plugin.c:274
+msgid "2SF Decoder"
+msgstr "2SF ഡീകോഡര്‍"
+
+#: src/xspf/xspf.c:440
+msgid "XML Shareable Playlists (XSPF)"
+msgstr ""
+
+#~ msgid "Sort S_elected"
+#~ msgstr "_തിരഞ്ഞെടുത്തവ ക്രമത്തിലാക്കുക"

audacious-plugins-3.3.4.tar.bz2/po/pl.po -> audacious-plugins-3.4.2.tar.bz2/po/pl.po Changed

@@ -1,595 +1,675 @@
 # Polish translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# <259095+transifex@gmail.com>, 2012.
-# <felikstayson@o2.pl>, 2012.
-# Piotr Sokół <psokol@jabster.pl>, 2012.
-# <sz.weihs@gmail.com>, 2011.
-# Szymon Weihs <sz.weihs@gmail.com>, 2011-2012.
+# CH <259095+transifex@gmail.com>, 2012
+# CH <259095+transifex@gmail.com>, 2012
+# felikstayson <felikstayson@o2.pl>, 2012
+# felikstayson <felikstayson@o2.pl>, 2012
+# mkkot <marcin2006@gmail.com>, 2013
+# mgrvnwald <marco@mgrvnwald.com>, 2013
+# mgrvnwald <marco@mgrvnwald.com>, 2013
+# mgrvnwald <marco@mgrvnwald.com>, 2013
+# Piotr Sokół <psokol@jabster.pl>, 2012
+# Szymon Weihs <sz.weihs@gmail.com>, 2011
+# Szymon Weihs <sz.weihs@gmail.com>, 2011-2012
+# vojcek <vojcek@tlen.pl>, 2013
+# vojcek <vojcek@tlen.pl>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-16 23:46+0000\n"
-"Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: Polish\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-07-07 13:21+0000\n"
+"Last-Translator: mkkot <marcin2006@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/projects/p/audacious/"
+"language/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "stereo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "surround"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Dekoder AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "sekwencjonowane"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Odtwarzacz AdLib)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "A plugin that can be used to start playing at a certain time.\nOriginally written by Adam Feakin and Daniel Stodden."
+msgstr ""
+"A plugin that can be used to start playing at a certain time.\n"
+"Originally written by Adam Feakin and Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "To jest twój sygnał budzenia."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Ustawienia alarmu"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Czas"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "godziny"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Czas\n"
+"Alarmuj o:\n"
+"Czas, o której uruchomiony zostanie alarm.\n"
+"\n"
+"Wyłącz alarm po:\n"
+"Wyłącz alarm po tym okresie czasu.\n"
+"(dopóki komunikat budzenia nie zostanie zamknięty)\n"
+"\n"
+"\n"
+"Dni\n"
+"Dzień:\n"
+"Wybierz dni, w których alarm ma być aktywny.\n"
+"\n"
+"Czas:\n"
+"Wybierz porę uruchamiania alarmu dla każdego z tych dni\n"
+"lub naciśnij przycisk przełączania,\n"
+"by użyć ustawienia domyślnego.\n"
+"\n"
+"\n"
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minuty"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Głośność\n"
+" Wyciszanie:\n"
+" Wycisz głośność do żądanego poziomu\n"
+" na ten okres czasu.\n"
+"\n"
+" Rozpocznij przy:\n"
+" Rozpocznij wyciszanie przy tym poziomie głośności.\n"
+"\n"
+" Zakończ przy:\n"
+" Głośność zakończenia wyciszania. Kiedy długość\n"
+" wyciszania wynosi 0 wówczas ustaw głośność do\n"
+" tego poziomu i rozpocznij odtwarzanie.\n"
+"\n"
+"\n"
+"Opcje:\n"
+" Dodatkowe komendy:\n"
+" Uruchom tą komendę podczas alarmu.\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Wyciszenie po:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+" Playlista:\n"
+" Wczytaj tą playlistę. Jeśli żadna playlista\n"
+" nie jest wskazana to obecna zostanie użyta.\n"
+" Adres URL dla mp3/ogg również może być\n"
+" tutaj użyty.\n"
+"\n"
+" Przypomnienie:\n"
+" Wyświetl przypomnienie gdy podniesie się alarm.\n"
+" Wpisz informację do wyświetlenia przy alarmie\n"
+" oraz zaznacz przycisk gdy chcesz by się ukazała."
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Włącz alarm o... (domyślnie):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "To jest twój sygnał budzenia."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Wybierz dni, w których alarm będzie aktywny"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Twoje przypomnienie na dzisiaj to..."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Domyślny"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Przypominacz"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Dzień"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Poniedziałek"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Wtorek"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Środa"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Piątek"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Poniedziałek"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Ustawienia alarmu"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Czas"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Włącz alarm o... (domyślnie):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Wyciszenie po:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "godziny"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minuty"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Wybierz dni, w których alarm będzie aktywny"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Dzień"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Domyślny"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Dni"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Czas przejścia"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "sekundy"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Głośność"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Bieżąca"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Początkowa"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Końcowa"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Bieżąca"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Dodatkowe polecenie"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "włącz"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Lista odtwarzania (opcjonalnie)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Wybierz listę odtwarzania"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Przypominacz"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Użyj przypominacza"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Ustawienia"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Co oznaczają te ustawienia?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nCzas\n Alarm o: \n Określ czas uruchomienia.\n\n Wycisz po: \n Zatrzymaj alarm po upływie określonego czasu.\n (jeśli okno alarmu nie zostanie wcześniej zamknięte)\n\n\nDni\n Dzień:\n Wybierz dni, w których alarm zostanie włączony.\n\n Czas:\n Wybierz czas dla budzika każdego dnia,\n albo ustaw opcję domyślną.\n\n\nGłośność\n Narastanie: \n Ustaw czas narastania głośności \n do wybranej wartości.\n\n Narastaj od: \n Narastaj od tej głośności.\n\n Końcowa głośność: \n Końcowa głośność dla alarmu. Jeśli czas narastania\n ustawiony jest na 0, to wtedy następuje natychmiastowe\n ustawienie tej głośności i rozpoczęcie odtwarzania.\n\n\nUstawienia:\n Dodatkowe komendy:\n Uruchom wybrane programy/skrypty podczas alarmu.\n\n Playlista: \n Załaduj wybraną listę odtwarzania \n (musi mieć rozszerzenie .m3u). Jeśli nie wybrano\n playlisty, to zostaną użyte utwory znajdujące się\n w danej chwili na liście.\n Adres URL strumienia mp3/ogg może również zostać\n tutaj użyty, ale ładowanie playlist z adresów\n URL nie jest na razie wspierane przez xmms.\n\n Przypominacz:\n Wyświetl powiadomienie, gdy alarm zostanie wyłączony.\n Wpisz treść komunkatu i zaznacz odpowiednią\n opcję, jeśli chcesz, aby było ono pokazywane..\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Pomoc"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Anuluj"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Przypomnienie na dzisiaj to.."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Dziękuję"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Okładka Albumu"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Domyślne urządzenie PCM"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Domyślne urządzenie miksera"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Ustawienia wtyczki ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Urządzenie PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Urządzenie miksera:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Element miksera:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Obejdź rozłączenie"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "ALSA Output Plugin for Audacious\nCopyright 2009-2012 John Lindgren\n\nMy thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"ALSA Output Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
-msgstr "Wyjście ALSA"
+msgstr "ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (Odtwarzacz MIDI)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Nie wybrałeś żadnych portów sekwencera dla odtwarzania MIDI. Możesz to zrobić w ustawieniach wtyczki MIDI."
+msgstr ""
+"Nie wybrałeś żadnych portów sekwencera dla odtwarzania MIDI. Możesz to "
+"zrobić w ustawieniach wtyczki MIDI."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (Odtwarzacz MIDI)"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Część funkcjonalna ALSA"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Ta część funkcjonalna wysyła zdarzenia MIDI do grupy wybranych przez użytkownika portów sekwencera ALSA. Interfejs sekwencera ALSA jest bardzo wszechstronny, może on dostarczyć porty dla sprzętowych syntezatorów kart dźwiękowych (np. emu10k1), a także dla programowych syntezatorów, zewnętrznych urządzeń itp.\nTa część funkcjonalna nie wytwarza dźwięku, zdarzenia MIDI są obsługiwane bezpośrednio przez urządzenia/programy poprzez porty ALSA; na przykład, zdarzenia MIDI wysłane do sprzętowego syntezatora zostaną bezpośrednio odtworzone.\nCzęść funkcjonalna autorstwa Giacomo Lozito."
+msgstr ""
+"Ta część funkcjonalna wysyła zdarzenia MIDI do grupy wybranych przez "
+"użytkownika portów sekwencera ALSA. Interfejs sekwencera ALSA jest bardzo "
+"wszechstronny, może on dostarczyć porty dla sprzętowych syntezatorów kart "
+"dźwiękowych (np. emu10k1), a także dla programowych syntezatorów, "
+"zewnętrznych urządzeń itp.\n"
+"Ta część funkcjonalna nie wytwarza dźwięku, zdarzenia MIDI są obsługiwane "
+"bezpośrednio przez urządzenia/programy poprzez porty ALSA; na przykład, "
+"zdarzenia MIDI wysłane do sprzętowego syntezatora zostaną bezpośrednio "
+"odtworzone.\n"
+"Część funkcjonalna autorstwa Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Część funkcjonalna FluidSynth"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Ta część funkcjonalna wytwarza dźwięk poprzez wysyłanie zdarzeń MIDI do FluidSynth, programowego syntezatora czasu rzeczywistego opartego o specyfikację SoundFont2 (www.fluidsynth.org).\nUzyskany dźwięk może być modyfikowany przez wtyczki efektów odtwarzacza oraz przetworzony przez dowolnie wybraną wtyczkę wyjściową.\nCześć funkcjonalna autorstwa Giacomo Lozito."
+msgstr ""
+"Ta część funkcjonalna wytwarza dźwięk poprzez wysyłanie zdarzeń MIDI do "
+"FluidSynth, programowego syntezatora czasu rzeczywistego opartego o "
+"specyfikację SoundFont2 (www.fluidsynth.org).\n"
+"Uzyskany dźwięk może być modyfikowany przez wtyczki efektów odtwarzacza oraz "
+"przetworzony przez dowolnie wybraną wtyczkę wyjściową.\n"
+"Cześć funkcjonalna autorstwa Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Port"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Nazwa klienta"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Nazwa portu"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Porty wyjściowe ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Karta dźwiękowa: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Kontroler miksera: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Ustawienia miksera"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "Część funkcjonalna\nALSA"
+msgstr ""
+"Część funkcjonalna\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - informacje o części funkcjonalnej"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Wybór części funkcjonalnej"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Ustawienia odtwarzania"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transpozycja: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Przesunięcie perkusji: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Zaawansowane ustawienia"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "oblicz wstępnie długość plików MIDI z playlisty"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "wyodrębnij komentarze z pliku MIDI (jeśli dostępne)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "wyodrębnij słowa piosenki z pliku MIDI (jeśli dostępne)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - wybierz plik"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Ustawienia Plugina AMIDI"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - wybierz plik SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Ustawienia SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Wielkość (w bajtach)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Załaduj SF przy starcie odtwarzacza"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Wczytaj efekty specjalne przy pierwszym odtwarzanym pliku MIDI"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Ustawienia syntezatora"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "wzmocnienie"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "użyj domyślnej"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "wartość:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "polifonia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "pogłos"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "tak"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "nie"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "chór"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "częstotliwość próbkowania"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "własna"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Backend\nFluidSynth"
+msgstr ""
+"Backend\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " Info MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Długość (msek):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Liczba utworów"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "zmienna"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Podział czasu:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " Komentarze i teksty utworów MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* brak dostępnych komentarzy w tym pliku MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* brak dostępnych tekstów utworów w tym pliku MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (invalid UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "O Pluginie AMIDI"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr ""
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -611,6 +691,24 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"\n"
+"odtwarzacz modularny muzyki MIDI\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"napisany przez Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"specjalne podziękowania dla...\n"
+"\n"
+"Clemens Ladisch i Jaroslav Kysela\n"
+"za ich wspaniałe programy aplaymidi i amixer; były bardzo pomocne wraz "
+"dokumentacją alsa-lib, która pozwoliła dowiedzieć się więcej o ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"za loga klawiatur midi\n"
+"\n"
+"Tony Vroon\n"
+"za pomoc przy testowaniu wersji alpha"
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
@@ -653,7 +751,9 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Wyświetla menu ekranowe po zmianie tytułu ścieżki, bez zmiany odtwarzanego pliku. Użyteczne podczas odtwarzania strumieni internetowych."
+msgstr ""
+"Wyświetla menu ekranowe po zmianie tytułu ścieżki, bez zmiany odtwarzanego "
+"pliku. Użyteczne podczas odtwarzania strumieni internetowych."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -785,12 +885,18 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Nie wykryto menedżera okien obsługującego kompozycje.\nAby menu ekranowe było wyświetlanie prawidowo, należy uruchomić menedżer okien obsługujący kompozycje (np. Compiz)."
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Nie wykryto menedżera okien obsługującego kompozycje.\n"
+"Aby menu ekranowe było wyświetlanie prawidowo, należy uruchomić menedżer "
+"okien obsługujący kompozycje (np. Compiz)."
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
-msgstr "Menedżer okien obsługujący kompozycje nie jest wymagany dla udawanej przezroczystości"
+msgstr ""
+"Menedżer okien obsługujący kompozycje nie jest wymagany dla udawanej "
+"przezroczystości"
 
 #: src/aosd/aosd_ui.c:837
 msgid "Transparency"
@@ -849,47 +955,47 @@
 msgid "Misc"
 msgstr "Różne"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "Listy odtwarzania ASXv1/ASXv2"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Listy odtwarzania Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Kolor"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Rozmyty zakres"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Ustawienia Bauer Stereophonic-to-Binaural"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Poziom sygnału wejściowego:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Częstotliwość obcięcia:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Profile ustawień:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Analizator spektrum"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -899,233 +1005,244 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\nMany thanks to libcdio developers <http://www.gnu.org/software/libcdio/> and to libcddb developers <http://libcddb.sourceforge.net/>.\n\nAlso thank you to Tony Vroon for mentoring and guiding me. This was a Google Summer of Code 2007 project."
+msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/> and "
+"to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you to Tony Vroon for mentoring and guiding me. This was a Google "
+"Summer of Code 2007 project."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Urządzenie"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Prędkość odczytu:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Zastąp urządzenie:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metadane"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Użyj CD-Tekstu"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Użyj CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Używanie protokołu HTTP zamiast CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Ścieżka:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Wtyczka Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Nie udało się zainicjalizować podsystemu cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Nieprawidłowy URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Ścieżka %d nie znaleziona."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "Ścieżka %d jest ścieżką danych."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Nie udało się otworzyć wyjścia audio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "Wystąpił błąd przy odczycie płyty CD Audio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Nie udało się otworzyć urządzenia CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "Nie znaleziono napędu CD."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Nie udało się zainicjalizować otwarcia napędu CD."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Nie udało się odzyskać pierwszego/ostatniego numeru ścieżki."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Nie mogę odczytać LSN początku/końca ścieżki %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Nie udało się połączyć z cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Nie udało się uzyskać odpowiedzi z serwera cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Nie udało się uzyskać odpowiedzi z serwera cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Nie udało się odczytać informacji z cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Brak płyty w napędzie."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Nieobsługiwany rodzaj płyty."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Odtwórz płytę CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Dodaj płytę CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Pozycje menu Audio CD"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Kompresja"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Centralna głośność:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Zakres dynamiki:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Dynamic Range Compression Plugin for Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Kompresor zakresu dynamicznego"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Game Console Music Decoder"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Ogólne"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Odtwarzanie"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Basy:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "s"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Soprany:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Domyślny czas trwania ścieżki:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Konwersja częstotliwości próbkowania"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Włączenie"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Częstotliwość:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignorowanie czasu trwania w etykietach SPC"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Zwiększenie pogłosu"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "Określa domyślny czas trwania ścieżki, wyrażony w sekundach. Używany w przypadku ścieżek, dla których nie określono czasu trwania (np. zapętlane)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Określa domyślny czas trwania ścieżki, wyrażony w sekundach. Używany w "
+"przypadku ścieżek, dla których nie określono czasu trwania (np. zapętlane)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1133,88 +1250,106 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "Console music decoder engine based on Game_Music_Emu 0.5.2\nSupported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n\nAudacious plugin by:\nWilliam Pitcock <nenolod@dereferenced.org>\nShay Green <gblargg@gmail.com>"
+msgstr ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "Płynne przechodzenie zawiodło, ponieważ piosenki miały różną liczbę kanałów. Możesz użyć Miksera Kanałów, by przekonwertować piosenki do tej samej liczby kanałów."
+msgstr ""
+"Płynne przechodzenie zawiodło, ponieważ piosenki miały różną liczbę kanałów. "
+"Możesz użyć Miksera Kanałów, by przekonwertować piosenki do tej samej liczby "
+"kanałów."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Wtyczka Crossfade zawiodła, gdyż utwory posiadają różną częstotliwość próbkowania. Możesz użyć konwertera częstotliwości próbkowania, aby sprowadzić utwory do tej samej częstotliwości."
+msgstr ""
+"Wtyczka Crossfade zawiodła, gdyż utwory posiadają różną częstotliwość "
+"próbkowania. Możesz użyć konwertera częstotliwości próbkowania, aby "
+"sprowadzić utwory do tej samej częstotliwości."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Crossfade Plugin for Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Płynne przechodzenie"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Nakładanie się:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Przenikanie ścieżek"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Krystaliczność"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intensywność:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Krystalizator"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Wtyczka Cue Sheet"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Echo"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Opóźnienie:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Sprzężenie zwrotne:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Głośność:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Crossfade Plugin for Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1222,9 +1357,15 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Multi-format audio decoding plugin for Audacious using\nFFmpeg multimedia framework (http://www.ffmpeg.org/)\n\nAudacious plugin by:\nWilliam Pitcock <nenolod@nenolod.net>\nMatti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Multi-format audio decoding plugin for Audacious using\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Wtyczka FFmpeg"
 
@@ -1292,7 +1433,20 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1306,11 +1460,13 @@
 msgid "Joint Stereo"
 msgstr "Połączone stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1358,7 +1514,7 @@
 msgid "Error protection"
 msgstr "Zabezpieczenie przed błędami"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Jakość"
 
@@ -1438,429 +1594,496 @@
 msgid "Tags"
 msgstr "Tagi"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Konfiguracja kodera Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Jakość (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "bezstratna"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Original code by Ralf Ertzinger <ralf@skytale.net>\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Original code by Ralf Ertzinger <ralf@skytale.net>\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Dekoder FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "GIO Plugin for Audacious\nCopyright 2009-2012 John Lindgren"
+msgstr ""
+"Wtyczka GIO Audaciousa\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Wtyczka GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analizator Spectrum OpenGL dla Audacious\n"
+"Copyright 2013 Christophe Budé i John Lindgren\n"
+"\n"
+"W oparciu o wtyczkę dla XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, i "
+"4Front Technologies\n"
+"\n"
+"Licencja: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Analizator spektrum OpenGL"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "GIO Plugin for Audacious\nCopyright 2009-2012 John Lindgren"
+msgstr ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Skróty Gnome"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Numer porządkowy"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Tytuł"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Wykonawca"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Rok"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Numer ścieżki"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Gatunek"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Pozycja w kolejce"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Czas trwania"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Położenie pliku"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Własny tytuł (z ustawień)"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Tempo transmisji"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Wybierz kolumny"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Dostępne:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Wybrane:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Zaczep po lewej"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Zaczep po prawej"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Zaczep na górze"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Zaczep na dole"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Odczep"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Otwórz pliki ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Otwórz adres _URL ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Dodaj pliki ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Dodaj adres U_RL ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "Przeszukaj _bibliotekę"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "O _programie ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Ustawienia ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Odtwarzaj"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "_Wstrzymaj"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Zatrzymaj"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "P_oprzednie"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Następne"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "Powta_rzanie"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "_Losowo"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "_Pojedyńczo"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Zatrzymaj p_o bieżącej ścieżce"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Zatrzymaj odtwarzanie po tym utworze"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "_Informacje o ścieżce ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Przejdź do _czasu ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "Przejdź do ścież_ki ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "według _numeru ścieżki"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Ustaw punkt początkowy pętli"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Ustaw punkt końcowy pętli"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "_Resetuj punkty graniczne pętli"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "według _tytułu"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "według _nazwy pliku"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "według ścieżki _pliku"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "według _numeru ścieżki"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "według _wykonawcy"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "według _albumu"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "według al_bumu"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "według _daty wydania"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "według _długości"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "według p_ołożenia pliku"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "według wła_snego tytułu"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "_Odwróć kolejność"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "Wy_losuj kolejność"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Odtwórz listę odtwarzania"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Wczytaj ponownie"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "_Usuń niedostępne pliki"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Sortuj"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Posortuj zaznaczone"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Usuń _duplikaty"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "_Usuń niedostępne pliki"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Nowa"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Z_mień nazwę "
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Zamknij"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importuj ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Eksportuj ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Menedżer _listy odtwarzania ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Menedżer _kolejki ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "Z_większ głośność"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "Z_mniejsz głośność"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Korektor graficzny"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "_Efekty"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Interfejs"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Wizualizacje"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Pasek _menu"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Pasek _informacji"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Pokaż pasek wiz_ualizacji"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Pasek _stanu"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Pokaż pozostały czas"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Pokaż przyciski _zamknięcia"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "_Nagłówki kolumn"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Wybierz _kolumny..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "_Przewiń listę po zmianie ścieżki"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Plik"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "Odt_warzanie"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Lista"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "W_tyczki"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Dźwięk"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Widok"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Dodaj/usuń kolejkę"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "_Wytnij"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "K_opiuj"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "_Zaznacz wszystko"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "Z_mień nazwę ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Interfejs GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Buforowanie ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Błąd"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1868,113 +2091,125 @@
 msgstr[1] "%d kanały"
 msgstr[2] "%d kanałów"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Poprzednia ścieżka"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr "Poprzedni utwór"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Odtwarzaj"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Wstrzymaj/wznów"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Zatrzymaj"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr "Następny utwór"
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "Przewiń o 5 sekund do przodu"
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Następna ścieżka"
+msgid "Rewind 5 seconds"
+msgstr "Przewiń o 5 sekund do tyłu"
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Naprzód 5 sekund"
+msgid "Mute"
+msgstr "Wyciszenie dźwięku"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Wstecz 5 sekund"
+msgid "Volume up"
+msgstr "Zwiększ głośność"
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Wyciszenie dźwięku"
+msgid "Volume down"
+msgstr "Zmniejsz głośność"
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Zwiększenie głośności"
+msgid "Jump to file"
+msgstr "Przejdź do pliku"
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Zmniejszenie głośności"
+msgid "Toggle player window(s)"
+msgstr "Przełącz okno(a) odtwarzacza"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Następna ścieżka"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Pokaż menu ekranowe"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Przełącz okna odtwarzacza"
+msgid "Toggle repeat"
+msgstr "Włącz/Wyłącz powtarzanie"
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Pokaż menu ekranowe"
+msgid "Toggle shuffle"
+msgstr "Włącz/Wyłącz odtwaranie losowe"
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Przełączenie powtarzania"
+msgid "Toggle stop after current"
+msgstr "Zatrzymanie po bieżącej ścieżce"
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Przełączenie losowania"
+msgid "Raise player window(s)"
+msgstr "Przesuń na wierzch okno(a) odtwarzacza"
 
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr "Przesuń na wierzch okno odtwarzacza"
-
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(brak)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Niezalecane jest dowiązywanie podstawowych przycisków myszy bez dodatkowych klawiszy.\n\nKontynuować?"
+msgstr ""
+"Niezalecane jest dowiązywanie podstawowych przycisków myszy bez dodatkowych "
+"klawiszy.\n"
+"\n"
+"Kontynuować?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Przyciski dowiązań myszy"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Ustawienia wtyczki Global Hotkey"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Proszę wcisnąć kombinację klawiszy wewnątrz pola\ntekstowego. Można również użyć przycisków myszy."
+msgstr ""
+"Proszę wcisnąć kombinację klawiszy wewnątrz pola\n"
+"tekstowego. Można również użyć przycisków myszy."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Skróty klawiszowe:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Czynność:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Kombinacja klawiszy:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1987,104 +2222,142 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "Global Hotkey Plugin\nControl the player with global key combinations or multimedia keys.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nContributers include: \n\nCopyright (C) 2006-2007 \nVladimir Paskov <vlado.paskov@gmail.com>\n\nCopyright (C) 2000-2002 \nVille Syrjälä <syrjala@sci.fi>\nBryn Davies <curious@ihug.com.au>\nJonathan A. Davis <davis@jdhouse.org>\nJeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include: \n"
+"\n"
+"Copyright (C) 2006-2007 \n"
+"Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"\n"
+"Copyright (C) 2000-2002 \n"
+"Ville Syrjälä <syrjala@sci.fi>\n"
+"Bryn Davies <curious@ihug.com.au>\n"
+"Jonathan A. Davis <davis@jdhouse.org>\n"
+"Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Globalne skróty klawiszowe"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Based on xmms-jack, by Chris Morgan:\nhttp://xmms-jack.sourceforge.net/\nPorted to Audacious by Giacomo Lozito"
+msgstr ""
+"Based on xmms-jack, by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"Ported to Audacious by Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
-msgstr "Wyjście JACK"
+msgstr "JACK"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Ustawienia %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Ustawienia wtyczki LADSPA Host"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Położenia modułów:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Ścieżki należy rozdzielać dwukropkiem.\nWprowadzone położenia będą przeszukiwane wraz z położeniem LADSPA_PATH.\nPo dodaniu nowych ścieżek proszę wcisnąć Enter, aby wyszukać nowe wtyczki."
+msgstr ""
+"Ścieżki należy rozdzielać dwukropkiem.\n"
+"Wprowadzone położenia będą przeszukiwane wraz z położeniem LADSPA_PATH.\n"
+"Po dodaniu nowych ścieżek proszę wcisnąć Enter, aby wyszukać nowe wtyczki.</"
+"small>"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Dostępne wtyczki:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Włącz"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Włączone wtyczki:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "LADSPA Host for Audacious\nCopyright 2011 John Lindgren"
+msgstr ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "Host LADSPA"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
-msgstr "%s: nie można zainicjować wsparcia LIRC\n\n\n"
+msgstr ""
+"%s: nie można zainicjować wsparcia LIRC\n"
+"\n"
+"\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: nie udało się odczytać pliku konfiguracji LIRC\n %s: proszę przeczytać dokumentację LIRC\n %s: jak stworzyć prawidłowy plik konfiguracji\n\n\n"
+msgstr ""
+"%s: nie udało się odczytać pliku konfiguracji LIRC\n"
+" %s: proszę przeczytać dokumentację LIRC\n"
+" %s: jak stworzyć prawidłowy plik konfiguracji\n"
+"\n"
+"\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
-msgstr "%s: próba ponownego podłączenia...\n\n"
+msgstr ""
+"%s: próba ponownego podłączenia...\n"
+"\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
-msgstr "%s: nienzana komenda \"%s\"\n\n"
+msgstr ""
+"%s: nienzana komenda \"%s\"\n"
+"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: rozłączono z LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: próbuj ponownie połączyć co %d sekund...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2098,155 +2371,326 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "A simple plugin to control Audacious using the LIRC remote control daemon\nAdapted for Audacious by: \nTony Vroon <chainsaw@gentoo.org>\nJoonas Harjumäki <jharjuma@gmail.com>\n\nBased on the XMMS LIRC plugin by: \nCarl van Schaik <carl@leg.uct.ac.za>\nChristoph Bartelmus <xmms@bartelmus.de>\nAndrew O. Shadoura <bugzilla@tut.by>\n\nFor more information about LIRC, see http://lirc.org."
+msgstr ""
+"A simple plugin to control Audacious using the LIRC remote control daemon\n"
+"Adapted for Audacious by: \n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Based on the XMMS LIRC plugin by: \n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"For more information about LIRC, see http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Połącznenie"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Podłącz ponownie do serwera LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Odczekaj przed ponownym połączeniem:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "Wtyczka LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Nie znaleziono tekstu piosenki"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Nie można pobrać %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Nie można odczytać %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Szukanie tekstu piosenk i ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Brakujące metadane utworu"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Łączenie z lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "Wtyczka LyricWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "Lista odtwarzania M3U"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generator taktu: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generator taktu: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nTo use it, add a URL: tact://beats*num/den e.g. tact://77 to play 77 beats per minute or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den e.g. tact://77 to play 77 beats "
+"per minute or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Generator taktu"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Channel Mixer Plugin for Audacious\nCopyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Mikser kanałów"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Ilość kanałów wyjściowych:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Mikser kanałów"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Wtyczka MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Rozdzielczość bitowa"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8 bitów"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16 bitów"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Kanały"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+"Konwersja częstotliwości\n"
+"próbkowania"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Najbliższa (najszybsza)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Liniowa (szybka)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Krzywa (dobra)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Przesunięcie fazowe (najlepsza)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Częstotliwość próbkowania"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Poziom:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Odcięcie:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Echo"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Podbicie basów"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Dźwięk przestrzenny"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Przedwzmacniacz"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Różne"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Próbkowanie nadmiarowe"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Redukcja szumów"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Odtwórz MOD-y Amigi"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Powtórz"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Ilość powtórzeń:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "By powtarzać bez końca ustaw -1."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
-msgstr "ModPlug (odtwarzacz modułowy)"
+msgstr "ModPlug (odtwarzacz modułów)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
-msgstr "Surround"
+msgstr "Dźwięk przestrzenny"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "Wtyczka MPG123"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "Serwer MPRIS 2"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Wtyczka Neon HTTP/HTTPS"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious nie odtwarza."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
-"\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Based on libnotify-aosd by Maximilian Bogner: http://www.mbogner.de/projects/libnotify-aosd/\nCopyright (C) 2010 Maximilian Bogner\nCopyright (C) 2011 John Lindgren\nThis plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\nThis plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\nYou should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Wtyczka powiadomień pulpitowych Audaciousa\n"
+"Prawa autorskie (C) 2010: Maximilian Bogner\n"
+"Prawa autorskie (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès "
+"d'Auriac\n"
+"\n"
+"Niniejsza wtyczka jest wolnym oprogramowaniem; można ją rozprowadzać dalej i/"
+"lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej "
+"przez Fundację Wolnego Oprogramowania - według wersji trzeciej tej Licencji "
+"lub którejś z późniejszych wersji.\n"
+"\n"
+"Wtyczka jest rozpowszechniana jest z nadzieją, iż będzie użyteczna, jednak "
+"BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI "
+"HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania "
+"bliższych informacji przeczytaj Powszechną Licencję Publiczną GNU.\n"
+"\n"
+" Z pewnością wraz z wtyczką otrzymałeś też egzemplarz Powszechnej Licencji "
+"Publicznej GNU (GNU General Public License); jeśli nie, odwiedź <http://www."
+"gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Pokaż kontrolki odtwarzania"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Zawsze pokazuj powiadomienia"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Powiadomienia na pulpicie"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Pokaż"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Wstrzymaj"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Następne"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Domyślne urządzenie"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Urządzenie dźwiękowe:"
 
@@ -2271,22 +2715,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "OSS4 Output Plugin for Audacious\nCopyright 2010-2012 Michał Lipski\n\nI would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"OSS4 Output Plugin for Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
-msgstr "Wyjście OSS4"
+msgstr "OSS4"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "Listy odtwarzania PLS"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Dekoder OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2304,155 +2754,229 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Audacious PulseAudio Output Plugin\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
+msgstr ""
+"Audacious PulseAudio Output Plugin\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
-msgstr "Wyjście PulseAudio"
+msgstr "PulseAudio"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Sample Rate Converter Plugin for Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Pomiń/powtórz próbki"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Liniowa interpolacja"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Szybka interpolacja funkcji sinc"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Pośrednia interpolacja funkcji sinc"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Najlepsza interpolacja funkcji sinc"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Konwersja"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Klasa:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Mapowanie klasy"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Użyj klasy mapowania"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Konwerter częstotliwości próbkowania"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Zmień hasło"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "OK, Scrobblowanie dla użytkownika: %s"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Brak zezwolenia"
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr "Użyj tego linku by zezwolić Audacious na scrobblowanie twoich utworów."
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr "Pozostaw to okno otwarte i naciśnij ponownie 'Sprawdź Uprawnienia'.\n"
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"Nie martw się. Twoje scrobblowanie zostało zapisane na komputerze.\n"
+"Będą przekazane do Audacious tak szybko jak tylko będzie miał na to "
+"pozwolenie."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Problem sieciowy."
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+"Wystąpił problem przy skontaktowaniu się z Last.fm. Proszę spróbuj ponownie."
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Usługi"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Sprawdzanie..."
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "S_prawdź zezwolenia"
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Nazwa użytkownika:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "U_nieważnij pozwolenia"
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Hasło:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Musisz zezwolić Audacious na scrobblowanie utworów do twojego konta Last."
+"fm.\n"
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "Adres URL Scrobblera:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Plugin Scrobbler nie mógł zostać uruchomiony.\n"
+"Prawdopodobnie ma miejsce problem z twoją instalacją."
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Plugin Scrobbler dla Audacious 2.0 przez Pitxyoki,\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Audacious AudioScrobbler Plugin\nOriginally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Podziękowania dla John Lindgren za wsparcie a początku projektu.\n"
+"\n"
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Ustawienia wtyczki Scrobbler"
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious używa obecnie poprawionej wersji Scrobblera Last.fm.\n"
+"Proszę sprawdź ustawienia dla wtyczki Scrobbler."
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "SDL Output Plugin for Audacious\nCopyright 2010 John Lindgren"
+msgstr ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
-msgstr "Wyjście SDL"
+msgstr "SDL"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Biblioteka"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Nieznany artysta"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Nieznany album"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\n na %s przez %s"
+msgstr ""
+"%s\n"
+" na %s przez %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
@@ -2460,7 +2984,7 @@
 msgstr[1] "%d albumy"
 msgstr[2] "%d albumów"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2468,11 +2992,17 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d piosenka"
-msgstr[1] "%s\n %s, %d piosenki"
-msgstr[2] "%s\n %s, %d piosenek"
+msgstr[0] ""
+"%s\n"
+" %s, %d piosenka"
+msgstr[1] ""
+"%s\n"
+" %s, %d piosenki"
+msgstr[2] ""
+"%s\n"
+" %s, %d piosenek"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2480,77 +3010,85 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d piosenka przez %s"
-msgstr[1] "%s\n %d piosenek przez %s"
-msgstr[2] "%s\n %d piosenek przez %s"
+msgstr[0] ""
+"%s\n"
+" %d piosenka przez %s"
+msgstr[1] ""
+"%s\n"
+" %d piosenek przez %s"
+msgstr[2] ""
+"%s\n"
+" %d piosenek przez %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Utwórz listę odtwarzania"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Dodaj do listy odtwarzania"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Przeszukaj bibliotekę"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Aby zaimportować kolekcję muzyczną, proszę wybrać katalog i kliknąć przycisk ponownego wczytywania."
+msgstr ""
+"Aby zaimportować kolekcję muzyczną, proszę wybrać katalog i kliknąć przycisk "
+"ponownego wczytywania."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Proszę czekać ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Wybierz katalog"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Narzędzie wyszukiwania"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Klasyczny interfejs Winampa"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "Odtwa_rzacz:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Wybór czcionki okna odtwarzacza"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Lista odtwarzania:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Wybór czcionki listy odtwarzania"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Czcionki"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Czcionki bitmapowe (obsługuje tylko kodowanie ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Przewijanie tytułu utworu w obydwu kierunkach"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Styl"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Ustawienia interfejsu"
 
@@ -2606,7 +3144,7 @@
 msgid "Presets"
 msgstr "Profile ustawień"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Wczytaj ustawienia"
 
@@ -2619,7 +3157,7 @@
 msgid "Load equalizer preset"
 msgstr "Wczytaj ustawienia korektora"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Zapisz ustawienia"
 
@@ -2631,7 +3169,7 @@
 msgid "Save equalizer preset"
 msgstr "Zapisz ustawienia korektora"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Usuń ustawienia"
 
@@ -2639,739 +3177,754 @@
 msgid "Delete auto-preset"
 msgstr "Usuń automatyczne ustawienia"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kb/s"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Skocz do: %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Głośność: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Balans: %d%% lewy"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Balans: centralny"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Balans: %d%% prawy"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Menu opcji"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Wyłącz 'Zawsze na wierzchu'"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Włącz 'Zawsze na wierzchu'"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Obszar informacji o pliku"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Menu wizualizacji"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Tryb prosty."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Tryb listy odtwarzania."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Zatrzymaj po tym utworze."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Nie zatrzymuj po utworze."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Ustawiono punkt początkowy pętli."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Ustawiono punkt końcowy pętli."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Zresetowano punkty graniczne pętli."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Automatycznie przewiń nazwę piosenki"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Zatrzymaj po bieżącej ścieżce"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Wierzchołki"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Powtarzaj"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Losowa kolejność"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Pojedyńczo"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Okno odtwarzacza"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Okno listy odtwarzania"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Okno korektora graficznego"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Zawsze na wierzchu"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Zawsze na widocznym obszarze roboczym"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Zwiń okno odtwarzacza"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Zwiń okno listy odtwarzania"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Zwiń okno korektora graficznego"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analizator"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Zakres"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Spektogram"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Wyłączony"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Zwykły"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Ognisty"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Pionowe linie"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Linie"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Kolumny"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Kropkowany"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Przerywany"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Ciągły"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Lodowy"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Wygładzony"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Najwolniejszy"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Wolny"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Średni"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Szybki"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Najszybszy"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Bieżący czas"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Pozostały czas"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Wstrzymaj"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Poprzednie"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Następne"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Wizualizacja"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Tryb wizualizacji"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Tryb analizatora"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Tryb zakresu"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Tryb spektogramu"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Tryb WindowShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Opadanie linii/kolumn"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Opadanie wierzchołków"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Lista odtwarzania"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Odtwórz listę odtwarzania"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Nowa lista odtwarzania"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Następna lista odtwarzania"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Poprzednia lista odtwarzania"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Usuń listę odtwarzania"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Importuj listę odtwarzania"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Wczytuje listę odtwarzania z pliku do bieżącej listy"
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Eksportuj listę odtwarzania"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Zapisuje wybraną listę odtwarzania"
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Odśwież listę"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Odświeża metadane związane z wpisem na liście."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Menedżer list odtwarzania"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Menedżer kolejki"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Widok"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Ustawienia interfejsu ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Dodaj adres URL..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Dodaje zdalny utwór do listy odtwarzania"
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Dodaj pliki..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Dodaje pliki do listy odtwarzania"
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Szukaj i wybierz"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Przeszukuje listę odtwarzania i zaznacza elementy na podstawie ustalonych kryteriów"
+msgstr ""
+"Przeszukuje listę odtwarzania i zaznacza elementy na podstawie ustalonych "
+"kryteriów"
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Odwróć zaznaczenie"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Odwraca zaznaczone i niezaznaczone elementy"
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Zaznacz wszystko"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Zaznacza wszystkie wpisy na liście odtwarzania"
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Wyczyść zaznaczenie"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Odznacza wszystkie wpisy na liście odtwarzania"
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Usuń wszystkie"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Usuwa wszystkie wpisy z listy odtwarzania"
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Wyczyść kolejkę"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Usuwa kolejkę powiązaną z tą listą odtwarzania."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Usuń niedostępne"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Usuwa niedostępne pliki z listy odtwarzania"
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Usuń duplikaty"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "według tytułu"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Usuwa duplikaty z playlisty na podstawie tytułu utworu."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "według nazwy pliku"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Usuwa duplikaty z playlisty na podstawie nazwy pliku."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "według ścieżki i nazwy pliku"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Usuwa duplikaty z playlisty na podstawie ich pełnej ścieżki."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Usuń niezaznaczone"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Usuń niezaznaczone wpisy z listy odtwarzania."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Usuń zaznaczone"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Usuń zaznaczone wpisy z listy odtwarzania."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Wymieszaj listę odtwarzania"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Losowo zmienia kolejność wpisów na liście odtwarzania"
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Odwróć kolejność listy odtwarzania"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Odwraca kolejność pozycji na liście odtwarzania"
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Sortuj"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Porządkuje listę na podstawie tytułu."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "według albumu"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Porządkuje listę na podstawie albumu."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "według wykonawcy"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Porządkuje listę na podstawie artysty."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Porządkuje listę na podstawie nazwy pliku."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Porządkuje listę na podstawie pełnej ścieżki."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "według daty"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Porządkuje listę na podstawie daty modyfikacji."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "według numeru ścieżki"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Porządkuje listę na podstawie numeru ścieżki."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Posortuj zaznaczone"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Plik"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Wtyczki"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Informacje o ścieżce"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Informacje o ścieżce"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "O programie Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Odtwórz plik"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Wczytuje i odtwarza wybrany plik"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Odtwórz położenie"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Odtwarza utwór z wybranego położenia"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Wtyczki"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Otwórz okno ustawień"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Zakończ"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Ustaw pętlę"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Wyczyść pętlę"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Następna ścieżka"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Przejdź do czasu"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Przełącz kolejkę"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Dodaje/usuwa wpis z kolejki listy odtwarzania"
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Skopiuj"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Wytnij"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Wklej"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Wczytaj"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Zaimportuj"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Zapisz"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Bieżący"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Automatyczne ustawienia"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Wczytaj automatyczne ustawienia"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Wczytaj domyślne ustawienia korektora graficznego"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Wyzeruj"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Wyzeruj ustawienia korektora graficznego"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Z pliku"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Wczytaj ustawienia z pliku"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Z pliku EQF programu WinAMP"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Wczytaj ustawienia korektora graficznego z pliku EQF programu WinAMP"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Profil programu WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importuj ustawienia korektora graficznego programu WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Zapisz auto-ładowane ustawienia"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Zapisz domyślne ustawienia"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Do pliku"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Zapisz ustawienia do pliku"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Do pliku EQF programu WinAMP"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
-msgstr "Zapisz profil ustawień korektora graficznego do pliku EQF programu WinAMP"
+msgstr ""
+"Zapisz profil ustawień korektora graficznego do pliku EQF programu WinAMP"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Usuń automatyczne ustawienia"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Wyszukaj wpisy w aktywnej playliście"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Zaznacz wpisy na playliście poprzez wypełnienie jednego lub więcej pól. Pola używają składni wyrażeń regularnych, bez uwzględniania wielkości liter. Jeśli nie wiesz, jak działają wyrażenia regularne, wpisz to czego szukasz."
+msgstr ""
+"Zaznacz wpisy na playliście poprzez wypełnienie jednego lub więcej pól. Pola "
+"używają składni wyrażeń regularnych, bez uwzględniania wielkości liter. "
+"Jeśli nie wiesz, jak działają wyrażenia regularne, wpisz to czego szukasz."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Tytuł: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album:"
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Wykonawca:"
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Nazwa pliku:"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Wyczyść poprzednie zaznaczenie przed szukaniem"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Automatycznie przełącz kolejkę dla pasujących wpisów"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Utwórz nową playlistę z pasującymi wpisami"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Edytor listy odtwarzania Audacious"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
@@ -3389,81 +3942,117 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nie można utworzyć katalogu (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Based on the xmms_sndfile plugin: Copyright (C) 2000, 2002 Erik de Castro Lopo\nAdapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Based on the xmms_sndfile plugin: Copyright (C) 2000, 2002 Erik de Castro "
+"Lopo\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Wtyczka Sndfile"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "O wtyczce wyjścia Sndio"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Wtyczka wyjścia Sndio\n\nAutorstwo Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Wtyczka wyjścia Sndio\n"
+"\n"
+"Autorstwo Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Nieobsługiwany format pliku"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Format jest nieobsługiwany przez urządzenie.\n\nSpróbuj ponownie z uruchomionym serwerem sndiod(1)."
+msgstr ""
+"Format jest nieobsługiwany przez urządzenie.\n"
+"\n"
+"Spróbuj ponownie z uruchomionym serwerem sndiod(1)."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "urządzenie sndio"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(pusty oznacza domyślne)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Anuluj"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
-msgstr "Ustawienia wtyczki Song Change"
+msgstr "Polecenie przy zmianie ścieżki"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Wykonaj polecenie kiedy uruchamiasz odtwarzanie."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Polecenie:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Kończ odtwarzanie ścieżki."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Zakończenie odtwarzania listy odtwarzania."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr "Zmień tytułu ścieżki (np. użyteczne dla internetowych strumieni)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3480,35 +4069,90 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Możesz użyć następujących ciągów formatowania, które\nzostaną zastąpione przez wywołaniem komendy\n(nie wszystkie są użyteczne przy komendach 'koniec playlisty'):\n\n%F: Częstotliwość (Hz)\n%c: Liczba kanałów\n%f: Nazwa pliku (pełna ścieżka)\n%l: Długość (ms)\n%n lub %s: Nazwa piosenki\n%r: Szybkość (b/s)\n%t: Pozycja playlisty (%02d)\n%p: Aktualnie odtwarzane (1 or 0)\n%a: Artysta\n%b: Album\n%T: Tytuł utworu"
+msgstr ""
+"Możesz użyć następujących ciągów formatowania, które\n"
+"zostaną zastąpione przez wywołaniem komendy\n"
+"(nie wszystkie są użyteczne przy komendach 'koniec playlisty'):\n"
+"\n"
+"%F: Częstotliwość (Hz)\n"
+"%c: Liczba kanałów\n"
+"%f: Nazwa pliku (pełna ścieżka)\n"
+"%l: Długość (ms)\n"
+"%n lub %s: Nazwa piosenki\n"
+"%r: Szybkość (b/s)\n"
+"%t: Pozycja playlisty (%02d)\n"
+"%p: Aktualnie odtwarzane (1 or 0)\n"
+"%a: Artysta\n"
+"%b: Album\n"
+"%T: Tytuł utworu"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Parametry przekazywane do powłoki powinny być zawarte w cudzysłowach. Ich brak jest zagrożeniem dla bezpieczeństwa systemu."
+msgstr ""
+"Parametry przekazywane do powłoki powinny być zawarte w "
+"cudzysłowach. Ich brak jest zagrożeniem dla bezpieczeństwa systemu."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Polecenia"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Plugin SoX Resampler dla Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Bazowany na wtyczce Sample Rate Converter:\n"
+"Copyright 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Szybki"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Wolny"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Wysoki"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Bardzo wysoki"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Jakość:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "Konwerter częstotliwości SoX"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Szybkość i wysokość tonu"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Szybkość:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Wysokość tonu:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Szybkość i wysokość tonu"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3517,94 +4161,109 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "Status Icon Plugin\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\nThis plugin provides a status icon, placed in the system tray area of the window manager."
+msgstr ""
+"Status Icon Plugin\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"This plugin provides a status icon, placed in the system tray area of the "
+"window manager."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Akcja dla przewijania kółkiem myszy"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Zmiana głośności"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Zmiana bieżącej ścieżki"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Inne ustawienia"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Wyłączenie wyskakujących komunikatów"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Zamknij do zasobnika systemowego"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Przejdź do następnej ścieżki przewijając w górę"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Ikona statusu"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Extra Stereo Plugin\nBy Johan Levin, 1999"
+msgstr ""
+"Extra Stereo Plugin\n"
+"By Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Dodatkowe Stereo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
-msgstr "Extra stereo"
+msgstr "Dodatkowe stereo"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Generator sygnałów: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "Sine tone generator by Håvard Kvålen <havardk@xmms.org> \nModified by Daniel J. Peng <danielpeng@bigfoot.com>\n\nTo use it, add a URL: tone://frequency1;frequency2;frequency3;... e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
+msgstr ""
+"Sine tone generator by Håvard Kvålen <havardk@xmms.org> \n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;... e.g. "
+"tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Generator sygnałów"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "File I/O Plugin for Audacious\nCopyright 2009-2012 John Lindgren\nTA WTYCZKA JEST NIEZBĘDNA, NIE WYŁĄCZAJ JEJ."
+msgstr ""
+"Operacje wejścia/wyjścia na plikach dla Audaciousa\n"
+"Copyright 2009-2012 John Lindgren\n"
+"TA WTYCZKA JEST NIEZBĘDNA, NIE WYŁĄCZAJ JEJ."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Wtyczka wejścia/wyjścia pliku"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Usuwanie głosu (karaoke)"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3623,46 +4282,74 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Audacious Ogg Vorbis Decoder\n\nBased on the Xiph.org Foundation's Ogg Vorbis Plugin: http://www.xiph.org/\n\nOriginal code by:\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nContributions from: \nChris Montgomery <monty@xiph.org>, \nPeter Alm <peter@xmms.org>, \nMichael Smith <msmith@labyrinth.edu.au>, \nJack Moffitt <jack@icecast.org>, \nJorn Baayen <jorn@nl.linux.org>, \nHåvard Kvålen <havardk@xmms.org>, \nGian-Carlo Pascutto <gcp@sjeng.org>, \nEugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Based on the Xiph.org Foundation's Ogg Vorbis Plugin: http://www.xiph.org/\n"
+"\n"
+"Original code by:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contributions from: \n"
+"Chris Montgomery <monty@xiph.org>, \n"
+"Peter Alm <peter@xmms.org>, \n"
+"Michael Smith <msmith@labyrinth.edu.au>, \n"
+"Jack Moffitt <jack@icecast.org>, \n"
+"Jorn Baayen <jorn@nl.linux.org>, \n"
+"Håvard Kvålen <havardk@xmms.org>, \n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>, \n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Dekoder Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\nBased on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\nAudacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Dekoder VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "stratna (hybryda)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "stratna"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n\nSome of the plugin code was by Miles Egan."
+msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Dekoder WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Dekoder 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Współdzielone playlisty XML (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - wybierz plik"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Sortuj wybran_e"

audacious-plugins-3.3.4.tar.bz2/po/process-transifex-po -> audacious-plugins-3.4.2.tar.bz2/po/process-transifex-po Changed

@@ -7,18 +7,27 @@
 be.po)
     LANGUAGE="Belarusian"
     ;;
+bg.po)
+    LANGUAGE="Bulgarian"
+    ;;
 ca.po)
     LANGUAGE="Catalan"
     ;;
 cs.po)
     LANGUAGE="Czech"
     ;;
+da.po)
+    LANGUAGE="Danish"
+    ;;
 de.po)
     LANGUAGE="German"
     ;;
 el.po)
     LANGUAGE="Greek"
     ;;
+en_GB.po)
+    LANGUAGE="English (United Kingdom)"
+    ;;
 es.po)
     LANGUAGE="Spanish"
     ;;
@@ -61,12 +70,12 @@
 ja.po)
     LANGUAGE="Japanese"
     ;;
-ky.po)
-    LANGUAGE="Kirgyz"
-    ;;
 ko.po)
     LANGUAGE="Korean"
     ;;
+ky.po)
+    LANGUAGE="Kirgyz"
+    ;;
 lt.po)
     LANGUAGE="Lithuanian"
     ;;
@@ -76,6 +85,9 @@
 nl.po)
     LANGUAGE="Dutch"
     ;;
+ml_IN.po)
+    LANGUAGE="Malayalam"
+    ;;
 pl.po)
     LANGUAGE="Polish"
     ;;
@@ -91,6 +103,9 @@
 ru.po)
     LANGUAGE="Russian"
     ;;
+si.po)
+    LANGUAGE="Sinhala"
+    ;;
 sk.po)
     LANGUAGE="Slovak"
     ;;
@@ -100,6 +115,12 @@
 sr@latin.po)
     LANGUAGE="Serbian (Latin)"
     ;;
+ta.po)
+    LANGUAGE="Tamil"
+    ;;
+tr.po)
+    LANGUAGE="Turkish"
+    ;;
 tr.po)
     LANGUAGE="Turkish"
     ;;

audacious-plugins-3.3.4.tar.bz2/po/pt_BR.po -> audacious-plugins-3.4.2.tar.bz2/po/pt_BR.po Changed

@@ -1,599 +1,672 @@
 # Portuguese (Brazil) translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Fuad Saud <fuadksd@gmail.com>, 2012.
-# <glauber_gf@hotmail.com>, 2012.
-# <john.norum4@gmail.com>, 2012.
-# <mail2buy8@gmail.com>, 2012.
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2012.
-# Rodrigo Macedo <rodrigomacedo@rmsolucoeseminformatica.com>, 2012.
-# <shorterfire@gmail.com>, 2012-2013.
-# <vitorgatti@yahoo.com.br>, 2012.
-# <wraeslew@temporarioemail.com.br>, 2012.
+# salmora8 <shorterfire@gmail.com>, 2013
+# Fuad Saud <fuadksd@gmail.com>, 2012
+# mcnd2 <glauber_gf@hotmail.com>, 2012
+# John_Norum <john.norum4@gmail.com>, 2012
+# Bruno Bacelar <mail2buy8@gmail.com>, 2012
+# Rafael Ferreira <rafael.f.f1@gmail.com>, 2012
+# Rodrigo Macedo <rodrigomacedo@rmsolucoeseminformatica.com>, 2012
+# salmora8 <shorterfire@gmail.com>, 2012-2013
+# vitorgatti <vitorgatti@yahoo.com.br>, 2012
+# salmora8 <shorterfire@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2013-01-12 19:11+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-07 12:29+0000\n"
 "Last-Translator: salmora8 <shorterfire@gmail.com>\n"
-"Language-Team: Portuguese (Brazil)\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
+"audacious/language/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "stereo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "surround"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Decodificador AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "sequenciado"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib Player)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "Um plugin que pode ser utilizado para iniciar a reprodução num tempo determinado.\n\nOriginalmente escrito por Adam Feakin e Daniel Stodden."
+msgstr ""
+"Um plugin que pode ser utilizado para iniciar a reprodução num tempo "
+"determinado.\n"
+"\n"
+"Originalmente escrito por Adam Feakin e Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarme"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Este é o seu alerta."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Configurações do Alarme"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Horário"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minutos"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Horário\n"
+" Alarme ás:\n"
+" A hora em que o alarme inicia.\n"
+"\n"
+" Silenciar após:\n"
+" Parar o alarme após este período de tempo.\n"
+" (se a caixa de diálogo não for fechada)\n"
+"\n"
+"\n"
+"Dias\n"
+" Dia:\n"
+" Selecione os dias do alarme para ativar.\n"
+"\n"
+" Horário:\n"
+" Escolha a hora do alarme em cada dia,\n"
+" ou selecione o botão de alternância para usar o horário\n"
+" padrão.\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Silenciar após:"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Volume\n"
+" Enfraquecimento:\n"
+" Aumentar o volume até ao volume escolhido\n"
+" para este período de tempo.\n"
+"\n"
+" Começar no:\n"
+" Começar enfraquecendo neste valor.\n"
+"\n"
+" Final:\n"
+" O volume para ser enfraquecido em. Se o enfraquecer\n"
+" a hora é 0 quanto se define o volume para começar\n"
+" tocando.\n"
+"\n"
+"\n"
+"Opções:\n"
+" Comando Adicional:\n"
+" Executar esse comando no momento do alarme.\n"
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+" Lista de Reprodução:\n"
+" Carregar esta lista de reprodução.\n"
+" Se nenhuma lista for dada, as músicas\n"
+" atuais na lista será usada.\n"
+" A URL de um mp3/ogg stream\n"
+" também pode ser inserido aqui.\n"
+"\n"
+" Lembrete:\n"
+" Exibir um aviso quando o alarme for desligado,\n"
+" Digite o lembrete na caixa e ligue-o\n"
+" botão habilitar/desabilitar, se você quer que ele seja mostrado."
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Alarme às (padrão):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Este é o seu alerta."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Escolha os dias para o alarme tocar"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Seu lembrete para hoje é..."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Padrão"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Lembrete"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Dia"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Segunda-feira"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Terça-feira"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Quarta-feira"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Quinta-feira"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Sexta-feira"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Sábado"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Domingo"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Segunda-feira"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Configurações do Alarme"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Horário"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Alarme às (padrão):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Silenciar após:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "horas"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minutos"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Escolha os dias para o alarme tocar"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Dia"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Padrão"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Dias"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Enfraquecimento"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "segundos"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Atual"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Começar no"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Final"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Atual"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Comando Adicional"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "habilitar"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Lista de Reprodução (opcional)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Selecionar uma Lista de Reprodução"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Lembrete"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Utilizar lembrete "
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Opções"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "O que significam estas opções?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nHorário\nAlarme ás:\nA hora em que o alarme inicia.\n\nSilenciar após:\nA duração do alarme.\n(se a caixa de diálogo não for fechada)\n\n\nDias\nDia:\nSelecionar os dias do alarme.\n\nHorário:\nEscolha a hora do alarme em cada dia,\nou selecione o botão habilitar/desabilitar para usar o padrão\nhora.\n\n\nVolume\nEnfraquecimento:\nAumentar o volume até ao volume escolhido\npara este período de tempo.\n\nComeçar no:\nComeçar enfraquecendo neste valor.\n\nFinal:\nO volume para ser enfraquecido em. Se o enfraquecer\na hora é 0 quanto se define o volume para começar\ntocando.\n\n\nOpções:\nComando Adicional:\nExecutar esse comando no momento do alarme.\n\nLista de Reprodução:\nCarregar esta lista de reprodução e reproduzir\nSe nenhuma lista for dada, as músicas são\natualmente na lista sera usada.\nA URL de um mp3/ogg stream também pode ser\ncoloque aqui.\n\nLembrete:\nExibir um aviso quando o alarme for desligado\ndigite o lembrete na caixa e ligue-o\nbotão habilitar/desabilitar, se você quer que ele seja mostrado.\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Seu lembrete de hoje é..."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Obrigado"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Imagem do Álbum"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Dispositivo PCM padrão"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Dispositivo mixer padrão"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Preferências do plugin de saída ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Dispositivo PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Dispositivo mixer:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Elemento mixer:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Solução para impedir a suspensão"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "Plugin de saída ALSA para Audacious\n\nCopyright 2009-2012 John Lindgren\n\nMeus agradecimentos a Willian Pitcock, autor do Plugin NG de saída ALSA, cujo código serviu como referencia quando a documentação ALSA não era o suficiente."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"Plugin de saída ALSA para Audacious\n"
+"\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"Meus agradecimentos a Willian Pitcock, autor do Plugin NG de saída ALSA, "
+"cujo código serviu como referencia quando a documentação ALSA não era o "
+"suficiente."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "Saída ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (Player MIDI)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Ainda não escolheu as portas para a reprodução Midi. Pode escolher as opções nas preferências do plugin."
+msgstr ""
+"Ainda não escolheu as portas para a reprodução Midi. Pode escolher as opções "
+"nas preferências do plugin."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (Player MIDI)"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Infraestrutura ALSA "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Esta infraestrutura envia os eventos Midi para as portas do grupo de utilizadores Alsa. A interface Alsa é versátil e providencia as portas para os sintetizadores das placas de som internas (ex.: emu10k1) e para os dispositivos externos e aplicações de sintetização\nEsta infraestrutura não produz som, uma vez que os eventos Midi são geridos pelos programas ou dispositivos das portas Alsa. Por exemplo, os eventos Midi enviados para os dispositivos sintetizadores serão reproduzidos diretamente\nInfraestrutura desenvolvida por Giacomo Lozito."
+msgstr ""
+"Esta infraestrutura envia os eventos Midi para as portas do grupo de "
+"utilizadores Alsa. A interface Alsa é versátil e providencia as portas para "
+"os sintetizadores das placas de som internas (ex.: emu10k1) e para os "
+"dispositivos externos e aplicações de sintetização\n"
+"Esta infraestrutura não produz som, uma vez que os eventos Midi são geridos "
+"pelos programas ou dispositivos das portas Alsa. Por exemplo, os eventos "
+"Midi enviados para os dispositivos sintetizadores serão reproduzidos "
+"diretamente\n"
+"Infraestrutura desenvolvida por Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Infraestrutura FluidSynth "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Esta infraestrutura produz sons, enviando os eventos MIDI para o FluidSynth, um sintetizador baseado nas especificações SoundFont2 (www.fluidsynth.org).\nOs sons produzidos podem ser manipulados através dos plugins e são processadas pela saída do som escolhida pelo utilizador\nInfraestrutura escrita por Giacomo Lozito."
+msgstr ""
+"Esta infraestrutura produz sons, enviando os eventos MIDI para o FluidSynth, "
+"um sintetizador baseado nas especificações SoundFont2 (www.fluidsynth.org).\n"
+"Os sons produzidos podem ser manipulados através dos plugins e são "
+"processadas pela saída do som escolhida pelo utilizador\n"
+"Infraestrutura escrita por Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Porta"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Nome do cliente"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Nome da porta"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Portas de saída"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Placa de som:"
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Controle do Mixer:"
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Configurações do Mixer"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "Infraestrutura\nALSA"
+msgstr ""
+"Infraestrutura\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "Informações da infraestrutura Amidi"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Seleção de infraestrutura"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Configurações de reprodução"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transposição"
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Mudança de tambor:"
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Configurações avançadas"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "calcular duração de arquivos MIDI em lista de reprodução"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "extrair comentários do arquivo MIDI (se disponível)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "extrair letras de arquivo MIDI (se disponível)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - selecione o arquivo"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Configurações do AMIDI-Plug"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - Selecione o arquivo SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Configurações SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Nome do arquivo"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Tamanho (bytes)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Carregar SF ao iniciar player"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Carregar SF ao reproduzir o arquivo MIDI"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Configuração do sintetizador"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "ganho"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "usar padrão"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "valor:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "polifonia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "reverso"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "sim"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "não"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "coro"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "taxa de amostragem"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "personalizado"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Infraestrutura\nFluidSynth"
+msgstr ""
+"Infraestrutura\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr "Informações MIDI"
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Duração (msec):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "N.º de Faixas;"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "variável"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Div. de tempo:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
-msgstr "Comentários e letras das faixas MIDI"
+msgstr " Comentários de MIDI e Letras "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* Sem comentários disponíveis neste arquivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* Sem letras disponíveis neste arquivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 invalido)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Sobre o AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -614,7 +687,26 @@
 "\n"
 "Tony Vroon\n"
 "for the good help with alpha testing"
-msgstr "\nPlayer de música modular MIDI\nhttp://www.develia.org/projects.php?p=amidiplug\n\nEscrito por Giacomo Lozito\n<james@develia.org>\n\nAgradecimentos especias para...\n\nClemens Ladisch e Jaroslav Kysela\npelos excelentes programas aplaymidi e amixer; foram\nrealmente úteis, juntamente com a documentação alsa-lib, de modo\na aprender mais sobre a API ALSA\n\nAlfredo Spadafina\npelo bonito logotipo do teclado midi\n\nTony Vroon\npela boa ajuda como um testador alpha."
+msgstr ""
+"\n"
+"Player de música modular MIDI\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"Escrito por Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"Agradecimentos especias para...\n"
+"\n"
+"Clemens Ladisch e Jaroslav Kysela\n"
+"pelos excelentes programas aplaymidi e amixer; foram\n"
+"realmente úteis, juntamente com a documentação alsa-lib, de modo\n"
+"a aprender mais sobre a API ALSA\n"
+"\n"
+"Alfredo Spadafina\n"
+"pelo bonito logotipo do teclado midi\n"
+"\n"
+"Tony Vroon\n"
+"pela boa ajuda como um testador alpha."
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
@@ -657,7 +749,9 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Ativar OSD quando, durante a reprodução, o título da faixa for alterado, mas o nome do ficheiro permanecer igual. Útil nas reproduções de emissões web."
+msgstr ""
+"Ativar OSD quando, durante a reprodução, o título da faixa for alterado, mas "
+"o nome do ficheiro permanecer igual. Útil nas reproduções de emissões web."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -789,8 +883,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Gerenciador Composite não detectado;\nao menos que você saiba que tenha executado, por favor ative um gerenciador composite, caso contrario o OSD não vai funcionar corretamente "
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Gerenciador Composite não detectado;\n"
+"ao menos que você saiba que tenha executado, por favor ative um gerenciador "
+"composite, caso contrario o OSD não vai funcionar corretamente "
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -853,47 +951,47 @@
 msgid "Misc"
 msgstr "Vários"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "Listas de Reproduções ASXv1/ASXv2"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de Reproduções Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Cor"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Ofuscar Escopo"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Preferências - Estereofônico Bauer para Binaural"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Nível alimentar:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Frequência de corte:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Pré-ajuste:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Estereofônico Bauer para Binaural (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Analisador Espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -903,233 +1001,247 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> e outros.\n\nMuito obrigado aos desenvolvedores de libcdio <http://www.gnu.org/software/libcdio/>\ne aos desenvolvedores do libcddb <http://libcddb.souceforge.net/>.\n\nTambém agradeço a Tony Vroon por orientar e guiar-me.\n\nEste foi um projeto do Google Summer of Code 2007."
+msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> e outros.\n"
+"\n"
+"Muito obrigado aos desenvolvedores de libcdio <http://www.gnu.org/software/"
+"libcdio/>\n"
+"e aos desenvolvedores do libcddb <http://libcddb.souceforge.net/>.\n"
+"\n"
+"Também agradeço a Tony Vroon por orientar e guiar-me.\n"
+"\n"
+"Este foi um projeto do Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Velocidade de Leitura:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Substituir dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Metadados"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Utilizar CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Usar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Use HTTP em vez de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Caminho:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Plugin de CD de Áudio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Falha ao iniciar o subsistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI Inválido %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Faixa %d não encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr "A faixa %d é uma faixa de dados."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Falha ao abrir a saída de áudio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Erro ao ler CD de áudio. "
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Audio CD "
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Falha ao abrir dispositivo de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "Não se encontrou drive de CD capaz de reproduzir áudio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Falha ao terminar de inicializar drive de CD aberto."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Falha ao recuperar primeiro/ultimo número de faixa."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Não foi possível começar/terminar LSN da faixa %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Falha ao criar a conexão cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Falha ao consultar o servidor CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Falha ao consultar o servidor CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Falha ao ler as informações cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Unidade está vazia."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Tipo de disco não suportado."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Reproduzir CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Adicionar CD "
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Itens do Menu do Áudio CD"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Compressão"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Volume Central:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Latitude de exposição:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Latitude de Exposição do Compressor, Plugin para Audacious\nCopyright 2010-2012 John Lindgren."
+msgstr ""
+"Plugin Latitude de Exposição do Compressor para Audacious\n"
+"Copyright 2010-2012 John Lindgren."
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Latitude de Exposição do Compressor"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Decodificador Game Console Music"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Geral"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Reprodução:"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Graves:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "segundos"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Agudos:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Duração da música:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Reamostragem"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Ativar reamostragem de audio"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Taxa de reamostragem:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignorar duração de tags SPC"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Acrescentar \"reverb\""
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "A duração da música, expressa em segundos, é usado para canções que não fornecem informações de duração (exemplo: faixas de looping)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"A duração da música, expressa em segundos, é usado para canções que não "
+"fornecem informações de duração (exemplo: faixas de looping)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1137,88 +1249,107 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "Engine decodificador de musicas de console, baseado no Game_Music_Emu 0.5.2\nFormatos suportados: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n\nPlugin Audacious por:\nWilliam Pitcock <nenolod@dereferenced.org>\nShay Green <gblargg@gmail.com>."
+msgstr ""
+"Engine decodificador de musicas de console, baseado no Game_Music_Emu 0.5.2\n"
+"Formatos suportados: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Plugin Audacious por:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>."
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "A sobreposição falhou porque existem faixas com um número de canais diferente. Pode utilizar o canal mixer para converter o número das faixas."
+msgstr ""
+"A sobreposição falhou porque existem faixas com um número de canais "
+"diferente. Pode utilizar o canal mixer para converter o número das faixas."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Crossfading falhou porque as musicas tinham diferentes taxas de amostragem. Você pode usar o Conversor de Taxa de Amostragem para converter as músicas para a mesma taxa de amostragem."
+msgstr ""
+"Crossfading falhou porque as musicas tinham diferentes taxas de amostragem. "
+"Você pode usar o Conversor de Taxa de Amostragem para converter as músicas "
+"para a mesma taxa de amostragem."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Crossfade Plugin para Audacious\nCopyright 2010-2012 John Lindgren."
+msgstr ""
+"Plugin Crossfade para Audacious\n"
+"Copyright 2010-2012 John Lindgren."
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Sobrepor:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Cristalizar"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intensidade:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Plugin Cue Sheet"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Comentários:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Volume:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Plugin Eco\nPor Johan Levin, 1999\n\nEco evolvente por Carl van Schaik, 1999."
+msgstr ""
+"Plugin Eco\n"
+"Por Johan Levin, 1999\n"
+"\n"
+"Eco evolvente por Carl van Schaik, 1999."
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1226,9 +1357,16 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Multi-formato, plugin decodificador de áudio usando o Audacious\n\nFFmpeg multimídia framework (http://www.ffmpeg.org/)\n\nPlugin Audacious por:\nWilliam Pitcock <nenolod@nenolod.net>\nMatti Hämäläinen <ccr@tnsp.org>."
+msgstr ""
+"Multi-formato, plugin decodificador de áudio usando o Audacious\n"
+"\n"
+"FFmpeg multimídia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Plugin Audacious por:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>."
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Plugin FFmpeg"
 
@@ -1296,7 +1434,20 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Este programa é um software livre, você pode redistribuir e/ou modifica-lo\ndentro dos termos da GNU General Public License, tal como publicado pela\nFree Software Foundation, tanto a versão 2 da licença, ou\n(a sua opção) qualquer versão posterior.\nEsse programa é distribuído na esperança que seja útil, MAS SEM QUALQUER GARANTIA, mesmo sem garantia implicada de\nCOMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM DETERMINADO FIM. Veja a\nGNU General Public License para mais detalhes.\n\nVocê poderá receber uma copia de GNU General Public License\njunto a esse programa; se não, escreva para Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"Este programa é um software livre, você pode redistribuir e/ou modifica-lo\n"
+"dentro dos termos da GNU General Public License, tal como publicado pela\n"
+"Free Software Foundation, tanto a versão 2 da licença, ou\n"
+"(a sua opção) qualquer versão posterior.\n"
+"Esse programa é distribuído na esperança que seja útil, MAS SEM QUALQUER "
+"GARANTIA, mesmo sem garantia implicada de\n"
+"COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM DETERMINADO FIM. Veja a\n"
+"GNU General Public License para mais detalhes.\n"
+"\n"
+"Você poderá receber uma copia de GNU General Public License\n"
+"junto a esse programa; se não, escreva para Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1310,11 +1461,13 @@
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1362,7 +1515,7 @@
 msgid "Error protection"
 msgstr "Proteção de erros"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Qualidade"
 
@@ -1442,542 +1595,624 @@
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Configuração do codificador Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Nível de Qualidade (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "sem perdas"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Código original por\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Código original por\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Decodificador FLAG"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "Plugin GIO para Audacious\nCopyright 2009-2012 John Lindgren."
+msgstr ""
+"Plugin GIO para Audacious\n"
+"Copyright 2009-2012 John Lindgren."
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Plugin GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analisador Spectrum OpenGl para Audacious\n"
+"Copyright 2013 Christophe Budé e John Lindgren\n"
+"\n"
+"Baseado no plugin do XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson e "
+"4Front Technologies\n"
+"\n"
+"Licença: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Analisador Spectrum OpenGl"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Plugin Atalhos GNOME\nPermite controlar o player com atalhos do gnome.\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>."
+msgstr ""
+"Plugin Atalhos GNOME\n"
+"Permite controlar o player com atalhos do gnome.\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>."
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Atalhos Gnome"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Ano"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Álbum"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Faixa"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Gênero"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Posição na fila"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Duração"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Caminho do arquivo"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Nome do Arquivo"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Título personalizado"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Taxa de dados"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Escolher colunas"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Disponíveis:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Escolhidas:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Apontar na esquerda"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Apontar na direita"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Apontar no topo"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Apontar na parte inferior"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Desencaixar"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Abrir Arquivo(s) ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Abrir _URL ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Adicionar Arquivo(s) ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Adicionar U_RL ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Procurar na Biblioteca"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "S_obre ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Preferências ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Sair"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Reproduzir"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Paus_ar"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Parar"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Próxima"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "_Repetir"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "E_mbaralhar"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "N_ão avançar faixa"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Parar _depois desta faixa"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Parar D_epois Desta Faixa"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "_Informações da faixa ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Ir para posição _temporal ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "_Ir para a faixa ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Por _Número da faixa"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Definir Ponto de Repetição _A"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Definir Ponto de Repetição _B"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "_Limpar Pontos de Repetição"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Por _Título"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "Por _Nome do Arquivo"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "Por Arquivo de _Diretório"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Por _Número da Faixa"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Por _Artista"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Por Á_Ibum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "Por Ál_bum "
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
-msgstr "Por _Data de lançamento"
+msgstr "Por _Data de Lançamento"
+
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "Por _Duração"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
-msgstr "Por _Arquivo de diretório"
+msgstr "Por _Arquivo de Diretório"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Por _Título Personalizado"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "I_nverter Ordem"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "_Aleatório"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Reproduzir esta Lista de Reprodução"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Atualizar"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Remover _Arquivos Indisponíveis"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Organizar Lista de Reprodução"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Organizar Selecionado"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Remover _Duplicatas"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Remover _Arquivos Indisponíveis"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Novo"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Re_nomear ..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Fechar"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importar"
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Exportar"
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Gerenciador de _Lista de Reprodução ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Gerenciador de _Fila de Reprodução ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "Aumentar _Volume"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "Abaixar _Volume"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Equalizador"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_feitos"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Interface"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Visualizações"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Mostrar Barra de _Menu"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Mostrar Barra de _Informação"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar vis_ualização da barra de informaçoes"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Mostrar Barra de _Status"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Mostrar _Tempo Restante"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Mostrar _Botão Fechar"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Mostrar _Cabeçalhos de Colunas"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Escolher _Colunas ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Des_locar ao Alterar Faixa"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Arquivo"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Reprodução"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Lista de Reprodução"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Serviços"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Saída"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Visualizar"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "Colocar/Retirar da fila"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "Recor_tar"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Colar"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Selecionar _Tudo"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Renomear ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "A processar ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Erro"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canais"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Faixa Anterior"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr "Faixa anterior"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Reproduzir"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pausa/Retornar"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Parar"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr "Próxima faixa"
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "Avançar 5 segundos"
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Próxima Faixa"
+msgid "Rewind 5 seconds"
+msgstr "Retroceder 5 segundos"
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Avançar 5 segundos"
+msgid "Mute"
+msgstr "Mudo"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Voltar 5 segundos"
+msgid "Volume up"
+msgstr "Aumentar volume"
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Mudo"
+msgid "Volume down"
+msgstr "Diminuir volume"
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Aumentar Volume"
+msgid "Jump to file"
+msgstr "Ir para o arquivo"
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Diminuir Volume"
+msgid "Toggle player window(s)"
+msgstr "Habilitar/Desabilitar janela(s) do player"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Ir para o Arquivo"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Mostrar OSD"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Habilitar/Desabilitar janela(s) do Player"
+msgid "Toggle repeat"
+msgstr "Habilitar/Desabilitar repetir"
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Mostrar OSD"
+msgid "Toggle shuffle"
+msgstr "Habilitar/Desabilitar embaralhar"
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Habilitar/Desabilitar repetição"
+msgid "Toggle stop after current"
+msgstr "Habilitar/Desabilitar parar depois da atual"
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Habilitar/Desabilitar Aleatório"
+msgid "Raise player window(s)"
+msgstr "Aumentar janela(s) do player"
 
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr "Aumentar janela(s) do Player"
-
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(nada)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Não é recomendável associar os botoes principais do mouse sem modificadores.\n\nContinuar?"
+msgstr ""
+"Não é recomendável associar os botoes principais do mouse sem "
+"modificadores.\n"
+"\n"
+"Continuar?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Associação do botão do mouse"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Configurações Plugin Global Hotkey"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Pressionar uma combinação de teclas no campo de texto.\nVocê também pode associar os botoes do mouse."
+msgstr ""
+"Pressionar uma combinação de teclas no campo de texto.\n"
+"Você também pode associar os botoes do mouse."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Hotkeys:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Ação:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Combinação de Teclas:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1990,104 +2225,138 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "Plugin Global Hotkey\nControla o player com teclas globais ou com combinações de teclas multimídia.\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nOutros colaboradores:\nCopyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n Bryn Davies <curious@ihug.com.au>,\n Jonathan A. Davis <davis@jdhouse.org>,\n Jeremy Tan <nsx@nsx.homeip.net>."
+msgstr ""
+"Plugin Global Hotkey\n"
+"Controla o player com teclas globais ou com combinações de teclas "
+"multimídia.\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Outros colaboradores:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>."
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Global Hotkeys"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Baseado no xmms-jack, por Chris Morgan:\nhttp://xmms-jack.sourceforge.net/\n\nPortado para Audacious por Giacomo Lozito."
+msgstr ""
+"Baseado no xmms-jack, por Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Portado para Audacious por Giacomo Lozito."
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "Saída JACK"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Configurações de %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Configurações LADSPA Host"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Diretório do Modulo:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Separe os caminhos com vírgulas\nEstes caminhos serão adicionados ao LADSPA_PATH.\nApós a adição dos caminhos, pressione Enter para procurar os novos plugins."
+msgstr ""
+"Separe os caminhos com vírgulas\n"
+"Estes caminhos serão adicionados ao LADSPA_PATH.\n"
+"Após a adição dos caminhos, pressione Enter para procurar os novos plugins.</"
+"small>"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Plugins disponíveis:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Habilitar"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Plugins ativos:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Configurações"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "LADSPA Host para Audacious\nCopyright 2011 John Lindgren."
+msgstr ""
+"LADSPA Host para Audacious\n"
+"Copyright 2011 John Lindgren."
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "LADSPA Host"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
-msgstr "%s: suporte LIRC não iniciado\n\n"
+msgstr ""
+"%s: suporte LIRC não iniciado\n"
+"\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: não foi possível ler o arquivo de configuração LIRC\n%s: consulte a documentação do LIRC\n%s: como criar um arquivo de configuração válido\n"
+msgstr ""
+"%s: não foi possível ler o arquivo de configuração LIRC\n"
+"%s: consulte a documentação do LIRC\n"
+"%s: como criar um arquivo de configuração válido\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
-msgstr "%s: tentando nova reconexão...\n\n"
+msgstr ""
+"%s: tentando nova reconexão...\n"
+"\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: comando desconhecido %s\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
-msgstr "%s: LIRC desconectado\n\n"
+msgstr ""
+"%s: LIRC desconectado\n"
+"\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
-msgstr "%s: tentara reconectar %d segundos...\n\n"
+msgstr ""
+"%s: tentara reconectar %d segundos...\n"
+"\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2101,155 +2370,325 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "Um simples plugin para controlar Audacious usando o daemon de controle remoto LIRC\n\n\nAdaptado para Audacious por:\nTony Vroon <chainsaw@gentoo.org>\nJoonas Harjumäki <jharjuma@gmail.com>\n\nBaseado no plugin XMMS LIRC por:\nCarl van Schaik <carl@leg.uct.ac.za>\nChristoph Bartelmus <xmms@bartelmus.de>\nAndrew O. Shadoura <bugzilla@tut.by>\n\nPara mais informações sobre LIRC, veja http://lirc.org."
+msgstr ""
+"Um simples plugin para controlar Audacious usando o daemon de controle "
+"remoto LIRC\n"
+"\n"
+"\n"
+"Adaptado para Audacious por:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Baseado no plugin XMMS LIRC por:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Para mais informações sobre LIRC, veja http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Conexão"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Reconectar ao servidor LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Espere antes de reconectar:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "Plugin LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "A letra da faixa não está disponível"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Não foi possível obter %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Não foi possível analisar %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Procurando a letra da faixa ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Metadados da música faltando"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Conectando no lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "Plugin RyricWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "Listas de Reproduções M3U"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Gerador Tacto: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Gerador Tacto: %d bpm %d%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "Um Gerador Tacto, por Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nPara usa-lo, adicionar uma URL: tact://batidas*numerador/denominador\nExemplo: tact://77 para reproduzir 77 bpm (batidas por minuto)\nou tact://60*3/4 para reproduzir 60 bpm em 3/4 tactos."
+msgstr ""
+"Um Gerador Tacto, por Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Para usa-lo, adicionar uma URL: tact://batidas*numerador/denominador\n"
+"Exemplo: tact://77 para reproduzir 77 bpm (batidas por minuto)\n"
+"ou tact://60*3/4 para reproduzir 60 bpm em 3/4 tactos."
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Gerador Tacto"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Plugin Canal Mixer para Audacious\nCopyright 2011-2012 John Lindgren e Michał Lipski."
+msgstr ""
+"Plugin Canal Mixer para Audacious\n"
+"Copyright 2011-2012 John Lindgren e Michał Lipski."
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Canal Mixer"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Canais de saída:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Canal Mixer"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Plugin MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Resolução"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bit"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bit"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Canais"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Reamostragem"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "O mais próximo (mais rápido)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Linear (rápido)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Spline (bom)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Polifásico (melhor)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Taxa de amostragem"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Nível:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Atalho:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Reverberação"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Bass Boost"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Cercar"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Pré-amplificador"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Diversos"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Sobreamostra"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Redução de ruído"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Reproduzir Amiga MODs"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Contagem de repetição:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Para repetir para sempre, definir a contagem de repetição para -1."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Modulo Player)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "Plugin MPG 123"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "Servidor MPRIS 2"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Plugin Neon HTTP/HTTPS"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious não está tocando."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
+"Desktop Notifications Plugin for Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Notificações de Desktop, Plugin para Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren e Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"Este plugin é um software livre, você pode redistribuir e/ou modifica-lo "
+"dentro dos termos da GNU General Public License, tal como publicado pela "
+"Free Software Foundation, tanto a versão 3 da licença, ou (a sua opção) "
+"qualquer versão posterior.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Esse plugin é distribuído na esperança que seja útil, MAS SEM QUALQUER "
+"GARANTIA, mesmo sem garantia implicada de COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA "
+"UM DETERMINADO FIM. Veja a GNU General Public License para mais detalhes.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Baseado no libnotify-aosd por Maximilian Bogner:\nhttp://www.mbogner.de/projects/libnotify-aosd/\n\nCopyright (C) 2010 Maximilian Bogner\nCopyright (C) 2011 John Lindgren\n\nEste plugin é um software livre, você pode redistribuir e/ou modifica-lo\ndentro dos termos da GNU General Public License, tal como publicado pela\nFree Software Foundation, tanto a versão 3 da licença, ou\n(a sua opção) qualquer versão posterior.\n\nEsse plugin é distribuído na esperança que seja útil, MAS SEM QUALQUER GARANTIA, mesmo sem garantia implicada de\nCOMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM DETERMINADO FIM. Veja a\nGNU General Public License para mais detalhes.\n\nVocê poderá receber uma copia de GNU General Public License\njunto a esse programa. Se não, veja <http://www.gnu.org/licenses/>."
+"Você poderá receber uma copia de GNU General Public License junto a esse "
+"programa, se não, veja <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Mostrar controles de reprodução"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Sempre exibir notificação"
+
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Notificações do Desktop"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Exibir"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Próxima"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Dispositivo padrão"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Dispositivo de áudio:"
 
@@ -2274,22 +2713,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "Plugin de saída OSS4 para Audacious\nCopyright 2010-2012 Michał Lipski\n\nGostaria de agradecer as pessoas em #audacious, especialmente Tony Vroon e John Lindgren e a todos os autores anteriores do plugin OSS."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"Plugin de saída OSS4 para Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"Gostaria de agradecer as pessoas em #audacious, especialmente Tony Vroon e "
+"John Lindgren e a todos os autores anteriores do plugin OSS."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "Saída OSS4"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "Listas de Reproduções PLS"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Decodificador OpenPSF PDF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2307,162 +2752,245 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Plugin de saída Audacious Pulse Audio\n\nEste programa é um software livre, você pode redistribuir e/ou modifica-lo\ndentro dos termos da GNU General Public License, tal como publicado pela\nFree Software Foundation, tanto a versão 2 da licença, ou\n(a sua opção) qualquer versão posterior.\n\nEsse programa é distribuído na esperança que seja útil, MAS SEM QUALQUER GARANTIA, mesmo sem garantia implicada de\nCOMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM DETERMINADO FIM. Veja a\nGNU General Public License para mais detalhes.\n\nVocê poderá receber uma copia de GNU General Public License\njunto a esse programa; se não, escreva para Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"Plugin de saída Audacious Pulse Audio\n"
+"\n"
+"Este programa é um software livre, você pode redistribuir e/ou modifica-lo\n"
+"dentro dos termos da GNU General Public License, tal como publicado pela\n"
+"Free Software Foundation, tanto a versão 2 da licença, ou\n"
+"(a sua opção) qualquer versão posterior.\n"
+"\n"
+"Esse programa é distribuído na esperança que seja útil, MAS SEM QUALQUER "
+"GARANTIA, mesmo sem garantia implicada de\n"
+"COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM DETERMINADO FIM. Veja a\n"
+"GNU General Public License para mais detalhes.\n"
+"\n"
+"Você poderá receber uma copia de GNU General Public License\n"
+"junto a esse programa; se não, escreva para Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "Saída PulseAudio"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Conversor de Taxa de Amostragem, Plugin para Audacious\nCopyright 2010-2012 John Lindgren."
+msgstr ""
+"Plugin Conversor de Taxa de Amostragem para Audacious\n"
+"Copyright 2010-2012 John Lindgren."
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Pular/Repetir amostras"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Interpolação linear"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Interpolação sinc rápida"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Interpolação sinc normal"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Interpolação sinc máxima"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Conversão"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Taxa:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Mapeamento de Taxa"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Usar mapeamento de taxas"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Conversor de Taxa de Amostragem"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Alterar Senha"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "OK. Scrobbling para o usuário: %s"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Permissão Negada"
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Acesse o link a seguir para permitir Audacious no scrobble em suas "
+"reproduções:"
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Mantenha esta janela aberta e clique em \"Verificar permissão' novamente.\n"
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"Não se preocupe. Seus scrobbles são salvos no seu computador.\n"
+"Eles serão apresentados logo que Audacious é permitido fazê-lo."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Problema de Rede."
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Serviços"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+"Houve um problema ao contactar Last.fm. Por favor, tente novamente mais "
+"tarde."
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Verificando..."
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Nome de Usuário:"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "V_erificar Permissão"
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Senha:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_Revogar Permissão"
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "URL do Scrobbler:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Você precisa permitir Audacious para a reprodução de faixas scrobble na sua "
+"conta Last.fm.\n"
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:233
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"O plugin Scrobbler não pôde ser iniciado.\n"
+"Pode haver um problema com a sua instalação."
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Plugin Audacious AudioScrobbler\n\nCriado originalmente por Audun Hove <audun@nlc.no> e Pipian <pipian@pipian.com>."
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Plugin Audacious Scrobbler 2.0 por Pitxyoki.\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Obrigado ao John Lindgren, por me dar uma mão no início deste projeto.\n"
+"\n"
+"\n"
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious agora está usando uma versão melhorada do Last.fm Scrobbler.\n"
+"Por favor, verifique as Preferências do plugin Scrobbler."
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "Plugin SDL Output para Audacious\nCopyright 2010 John Lindgren."
+msgstr ""
+"Plugin SDL Output para Audacious\n"
+"Copyright 2010 John Lindgren."
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "Saída SDL"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Artista Desconhecido"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Album Desconhecido"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\nem\n%s de %s"
+msgstr ""
+"%s\n"
+"em\n"
+"%s de %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d álbum"
 msgstr[1] " %d álbuns"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2470,10 +2998,14 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n%s, %d faixa"
-msgstr[1] "%s\n%s, %d faixas"
+msgstr[0] ""
+"%s\n"
+"%s, %d faixa"
+msgstr[1] ""
+"%s\n"
+"%s, %d faixas"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2481,76 +3013,82 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n%d faixa de %s"
-msgstr[1] "%s\n%d faixas de %s"
+msgstr[0] ""
+"%s\n"
+"%d faixa de %s"
+msgstr[1] ""
+"%s\n"
+"%d faixas de %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Criar Lista de Reprodução"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Adicionar à Lista de Reprodução"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Procurar biblioteca"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Para importar sua biblioteca de música no Audacious, escolha uma pasta e em seguida no ícone \"atualizar\"."
+msgstr ""
+"Para importar sua biblioteca de música no Audacious, escolha uma pasta e em "
+"seguida no ícone \"atualizar\"."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Por favor aguarde ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Escolha pasta"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Ferramenta de Busca"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Interface Clássica Winamp"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Player:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Selecionar o tipo de letra do player:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Lista de Reprodução:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Selecionar o tipo de letra da lista de reprodução:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Tipo de letra"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Usar letras bitmap (suporta ASCII somente)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Título da musica rola em ambas as direções"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Tema"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Preferências da Interface"
 
@@ -2606,7 +3144,7 @@
 msgid "Presets"
 msgstr "Pré-ajuste"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Carregar pré-ajuste"
 
@@ -2619,7 +3157,7 @@
 msgid "Load equalizer preset"
 msgstr "Carregar pré-ajuste de equalizador"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Salvar pré-ajuste"
 
@@ -2631,7 +3169,7 @@
 msgid "Save equalizer preset"
 msgstr "Salvar pré-ajuste de equalizador"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Deletar pré-ajuste"
 
@@ -2639,739 +3177,757 @@
 msgid "Delete auto-preset"
 msgstr "Deletar pré-ajuste automático"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Ir para %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Equilíbrio: %d%% esquerda"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Equilíbrio centro"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Equilíbrio: %d%% direita"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Menu de Opções"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Desativar 'Sempre No Topo'"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Ativar 'Sempre No Topo'"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Caixa de Informações do Arquivo"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Menu de Visualizações"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Modo simples."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Modo Lista de Reprodução."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Parar após faixa"
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Não parar após a faixa"
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Repetir ponto de definição A."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Repetir ponto de definição B."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Repetir pontos apagados."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Deslocar nome automaticamente"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Parar após a música atual"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Picos"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Embaralhar"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Não Avançar a Lista de Reprodução"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Mostrar Player"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Mostrar editor do Player"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Mostrar Equalizador"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Sempre no Topo"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Em Todas as Áreas de Trabalho"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Enrolar Player"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Enrolar Editor de Listas de Reprodução"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Enrolar Equalizador"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analisador"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Escopo"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Gravador de Voz"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Desligado"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Fogo"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Linhas Verticais"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Linhas"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Barras"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Ponto de Escopo"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Linha de Escopo"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Escopo Solido"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Gelo"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Suave"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Mais Lento"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Médio"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Muito Rápido"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Tempo Decorrido"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Tempo Restante"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Próxima"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Visualização"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Modo de Visualização"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Modo Analisador"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Barra de Escopo"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Modo Gravador de Voz"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Modo WindowShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Analizador de Queda"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Picos de Queda"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Lista de Reprodução"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Tocar Lista de Reprodução"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Nova Lista de Reprodução"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Selecionar Próxima Lista de Reprodução"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Selecionar Lista de Reprodução Anterior"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Deletar Lista de Reprodução"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Importar Lista de Reprodução"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Carregar um arquivo de lista de reprodução dentro uma selecionada."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Exportar Lista de Reprodução"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Salvar a lista de reprodução selecionada."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Atualizar Lista"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Atualiza os metadados associados a uma entrada de lista de reprodução."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Gerenciador de Lista de Reprodução"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Gerenciador de fila de reprodução"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Interface"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Preferencias de Interface ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Adicionar Endereço Web..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Adicionar uma faixa remota à lista de reprodução"
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Adicionar Arquivo(s)..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Adicionar arquivo(s) para à Lista de Reprodução"
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Pesquisar e Selecionar"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Procura a lista de reprodução e seleciona as faixas com base num critério"
+msgstr ""
+"Procura a lista de reprodução e seleciona as faixas com base num critério"
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Inverter Seleção"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Inverte os itens selecionados e não selecionados."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Seleciona todas as faixas da lista de reprodução"
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Não Selecionar"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Desmarca todas as faixas da lista de reprodução"
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Remover Todos"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Remover todas as faixas da lista de reprodução."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Apagar Fila de Reprodução"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Apaga a fila associada à lista de reprodução."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Remover Arquivos Indisponíveis"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Remove da lista de reprodução os ficheiros indisponíveis."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Remover Duplicatas"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Por Título"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Remover da lista de reprodução as entradas duplicadas por título."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Por Nome do Arquivo"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Remover entradas duplicadas da lista de reprodução pelo nome do Arquivo"
+msgstr ""
+"Remover entradas duplicadas da lista de reprodução pelo nome do Arquivo"
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Por Diretório e Nome do Arquivo"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Remover da lista de reprodução as entradas duplicadas pelo seu caminho de diretório completo."
+msgstr ""
+"Remover da lista de reprodução as entradas duplicadas pelo seu caminho de "
+"diretório completo."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Remover Desmarcada"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Remover as entradas desmarcadas da lista de reprodução."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Remover Selecionados"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Remover entradas selecionadas da lista de reprodução."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Randomizar Lista"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Randomizar a lista de reprodução"
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Reverter Lista"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Inverte a Lista de Reprodução"
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Organizar Lista"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Organiza a lista titulo."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Por Album"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Organiza a lista por álbum."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Por Artista"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Organiza a lista por artista."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Organiza a lista por nome do arquivo."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Organiza a lista por caminho completo do diretório."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Por Data"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Organiza a lista por tempo de modificação."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Por Número da Faixa"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Organizar a lista por número de faixa."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Organizar Selecionado"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Arquivo"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Serviços de Plugin"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Ver Detalhes da Faixa"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Ver detalhes da faixa"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Sobre o Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Reproduzir Arquivo"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Carregar e reproduzir arquivo"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Reproduzir Localização"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Reproduzir mídia no local selecionado"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Serviços de plugin"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Preferências"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Abrir janela de preferências"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Sair do Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Definir A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Limpar A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Ir para o Arquivo"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Ir para posição temporal"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Habilitar/Desabilitar Fila"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Ativar/desativar as entradas de filas de lista de reprodução"
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Colar"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Carregar"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importar"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Salvar"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Pré-ajuste"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Carregar pré-ajuste automático"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Carregar pré-ajuste automático"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Carregar pré-ajuste padrão para equalizador"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Zero"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Definir pré-ajuste para o nível zero"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Do arquivo"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Carregar pre-ajuste de um arquivo"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "De arquivo EQF do Winamp"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Carregar pré-ajuste de arquivo EQF do WinAMP"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Pré-ajuste WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importar pré-ajuste WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Salva pré-ajuste de auto-carregar"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Salvar pré-ajuste padrão"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Para arquivo"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Salvar pré-ajuste para um arquivo"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Para arquivo EQF do WinAMP"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Salvar pré-ajuste para EQF do WinAMP"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Deletar pré-ajuste auto-carregar"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Procurar entradas na lista de reprodução ativa"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Seleciona as entradas da lista de reprodução, preenchendo um ou mais campos. Os campos utilizam expressões regulares, sem distinção entre maiúsculas e minúsculas. Se não sabe o que são expressões regulares, basta inserir uma parte do que pretende procurar."
+msgstr ""
+"Seleciona as entradas da lista de reprodução, preenchendo um ou mais campos. "
+"Os campos utilizam expressões regulares, sem distinção entre maiúsculas e "
+"minúsculas. Se não sabe o que são expressões regulares, basta inserir uma "
+"parte do que pretende procurar."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Titulo:"
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Álbum:"
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Artista:"
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Nome do Arquivo:"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Apagar seleção anterior antes de pesquisar"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
-msgstr "Automaticamente habilitar/desabilitar fila para as entradas coincidentes"
+msgstr ""
+"Automaticamente habilitar/desabilitar fila para as entradas coincidentes"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Criar uma nova lista de reprodução com as entradas correspondentes"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Editor de lista de reprodução do Audacious"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
@@ -3389,81 +3945,125 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Não foi possível criar o diretório (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Baseado no xmms_sndfile plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Adaptado para Audacious por Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Este programa é um software livre, você pode redistribuir e/ou modifica-lo\n"
+"dentro dos termos da GNU General Public License, tal como publicado pela\n"
+"Free Software Foundation, tanto a versão 2 da licença, ou\n"
+"(a sua opção) qualquer versão posterior.\n"
+"\n"
+"Esse programa é distribuído na esperança que seja útil, MAS SEM QUALQUER "
+"GARANTIA, mesmo sem garantia implicada de\n"
+"COMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM DETERMINADO FIM. Veja a\n"
+"GNU General Public License para mais detalhes.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Baseado no xmms_sndfile plugin:\nCopyright (C) 2000, 2002 Erik de Castro Lopo\n\nAdaptado para Audacious por Tony Vroon <chainsaw@gentoo.org>\n\nEste programa é um software livre, você pode redistribuir e/ou modifica-lo\ndentro dos termos da GNU General Public License, tal como publicado pela\nFree Software Foundation, tanto a versão 2 da licença, ou\n(a sua opção) qualquer versão posterior.\n\nEsse programa é distribuído na esperança que seja útil, MAS SEM QUALQUER GARANTIA, mesmo sem garantia implicada de\nCOMERCIALIZAÇÃO ou ADEQUAÇÃO PARA UM DETERMINADO FIM. Veja a\nGNU General Public License para mais detalhes.\n\nVocê poderá receber uma copia de GNU General Public License\njunto a esse programa; se não, escreva para Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+"Você poderá receber uma copia de GNU General Public License\n"
+"junto a esse programa; se não, escreva para Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Plugin Sndfile"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Sobre Sndio Plugin de saída"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Plugin de Saída Sndio\n\nEscrito por Thomas Plaff <tpfaff@tp76.info>.\n"
+msgstr ""
+"Plugin de Saída Sndio\n"
+"\n"
+"Escrito por Thomas Plaff <tpfaff@tp76.info>.\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Formato não suportado"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Um formato não suportado pelo dispositivo foi solicitado.\n\nPor favor tente novamente com o servidor sndiod(1) em execução."
+msgstr ""
+"Um formato não suportado pelo dispositivo foi solicitado.\n"
+"\n"
+"Por favor tente novamente com o servidor sndiod(1) em execução."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "dispositivo sndio"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(vazio significa os padrões)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Mudar Faixa"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Comando a executar quando Audacious iniciar uma nova faixa."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Comando a executar ao terminar uma faixa."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Comando a executar quando Audacious atinge o fim de uma lista de reprodução."
+msgstr ""
+"Comando a executar quando Audacious atinge o fim de uma lista de reprodução."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Comando a executar quando o titulo da música for modificado (Exemplo: títulos de redes stream)."
+msgstr ""
+"Comando a executar quando o titulo da música for modificado (Exemplo: "
+"títulos de redes stream)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3480,35 +4080,90 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Você pode utilizar os formatos descritos em baixo, que\nserão substituído antes de chamar o comando\n(nem todos podem ser utilizados para o comando fim da lista de reprodução):\n\n%F: Frequência (em hertz)\n%c: Números de canais\n%f Nome do arquivo (diretório completo)\n%l: Duração (em milissegundos)\n%n ou %s Nome da faixa\n%r: Taxa (em bits por segundo)\n%t Posição da lista de reprodução (%02d)\n%p A reproduzir atualmente (1 ou 0)\n%a: Artista\n%b Álbum\n%T: Faixa de titulo"
+msgstr ""
+"Você pode utilizar os formatos descritos em baixo, que\n"
+"serão substituído antes de chamar o comando\n"
+"(nem todos podem ser utilizados para o comando fim da lista de reprodução):\n"
+"\n"
+"%F: Frequência (em hertz)\n"
+"%c: Números de canais\n"
+"%f Nome do arquivo (diretório completo)\n"
+"%l: Duração (em milissegundos)\n"
+"%n ou %s Nome da faixa\n"
+"%r: Taxa (em bits por segundo)\n"
+"%t Posição da lista de reprodução (%02d)\n"
+"%p A reproduzir atualmente (1 ou 0)\n"
+"%a: Artista\n"
+"%b Álbum\n"
+"%T: Faixa de titulo"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Parâmetros enviados para o console devem ser colocados em aspas. Caso contrário corre risco de segurança."
+msgstr ""
+"Parâmetros enviados para o console devem ser colocados em "
+"aspas. Caso contrário corre risco de segurança."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Plugin Reamostrador SoX para Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Baseado no Plugin Conversor de Taxa de Amostragem:\n"
+"Copyright 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Rápido"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Baixo"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Alto"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Muito Alto"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Qualidade:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "Reamostrador SoX"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Velocidade e Tom"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Tom:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Velocidade e Tom"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3517,94 +4172,114 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "Plugin Ícone de Status\n\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nEsse plugin fornece um ícone de status, colocado na\nárea de notificação do sistema no gerenciador de janelas."
+msgstr ""
+"Plugin Ícone de Status\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Esse plugin fornece um ícone de status, colocado na\n"
+"área de notificação do sistema no gerenciador de janelas."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Ação do Mouse no botão do meio"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Alterar volume"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Mudar de faixa"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Outras Configuraçoes"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Desativar janelas pop-up"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Fechar para a bandeja do sistema"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avançar lista de reprodução ao rolar para cima"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Ícone de Status"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Plugin Stereo Extra\n\nPor Johan Levin, 1999."
+msgstr ""
+"Plugin Stereo Extra\n"
+"\n"
+"Por Johan Levin, 1999."
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Stereo Extra"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Stereo Extra"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Gerador de Tons:"
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "Gerador de tons sinusoidal, por Håvard Kvålen <havardk@xmms.org>\nModificado por Daniel J. Peng <danielpeng@bigfoot.com>\n\nPara utilizar, adicione uma URL: tone://frequência1;frequência2;frequência3;...\nExemplo: tone://2000;2005 para reproduzir um tom 2000 Hz e outro de 2005 Hz."
+msgstr ""
+"Gerador de tons sinusoidal, por Håvard Kvålen <havardk@xmms.org>\n"
+"Modificado por Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Para utilizar, adicione uma URL: tone://frequência1;frequência2;"
+"frequência3;...\n"
+"Exemplo: tone://2000;2005 para reproduzir um tom 2000 Hz e outro de 2005 Hz."
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Gerador de Tons"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "Plugin Arquivo I/O para Audacious\nCopyright 2009-2012 John Lindgren\n\nESTE PLUGIN É NECESSÁRIO. NÃO DESATIVA-LO."
+msgstr ""
+"Plugin Arquivo I/O para Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"ESTE PLUGIN É NECESSÁRIO. NÃO DESATIVA-LO."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Plugin Arquivo I/O"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Remoção de voz"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3623,46 +4298,76 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Decodificador Audacious Ogg Vorbis\n\nBaseado no Plugin OGG Vorbis da Xiph.org Foundation's:\nhttp://www.xiph.org/\n\nCódigo original por:\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nContribuições de:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>."
+msgstr ""
+"Decodificador Audacious Ogg Vorbis\n"
+"\n"
+"Baseado no Plugin OGG Vorbis da Xiph.org Foundation's:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Código original por:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contribuições de:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>."
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Decodificador Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr "Reprodutor de arquivos no formato Vortex, por Sashnov Alexander <sashnov@ngs.ru>\nBaseado em in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\nPlugin Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>."
+msgstr ""
+"Reprodutor de arquivos no formato Vortex, por Sashnov Alexander <sashnov@ngs."
+"ru>\n"
+"Baseado em in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Plugin Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>."
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Decodificador VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "com perdas (híbrido)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "com perdas"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n\nParte do código do plugin foi por Miles Egan."
+msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Parte do código do plugin foi por Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Decodificador WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Decodificador 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Lista de Reprodução Compartilhável XML (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - selecione o arquivo"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Organizar S_eleção"

audacious-plugins-3.3.4.tar.bz2/po/pt_PT.po -> audacious-plugins-3.4.2.tar.bz2/po/pt_PT.po Changed

@@ -1,593 +1,666 @@
 # Portuguese translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Bruno Martins <bmomartins@gmail.com>, 2011.
-# Sérgio Marques <smarquespt@gmail.com>, 2012.
-# <shorterfire@gmail.com>, 2012.
+# Bruno Martins <bmomartins@gmail.com>, 2011
+# Pitxyoki <Pitxyoki@gmail.com>, 2013
+# Sérgio Marques <smarquespt@gmail.com>, 2012-2013
+# salmora8 <shorterfire@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-28 12:50+0000\n"
-"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
-"Language-Team: Portuguese\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-04 23:00+0000\n"
+"Last-Translator: Pitxyoki <Pitxyoki@gmail.com>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/"
+"audacious/language/pt_PT/)\n"
+"Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "surround"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Descodificador AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "sequencial"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Reprodutor AdLib)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "Um suplemento para agendar a reprodução a uma determinada hora.\n\nVersão original desenvolvida por Adam Feakin e Daniel Stodden."
+msgstr ""
+"Um suplemento para agendar a reprodução a uma determinada hora.\n"
+"\n"
+"Versão original desenvolvida por Adam Feakin e Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarme"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Este é o seu alerta."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "Aceitar"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Definições do alarme"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Horário"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Hora\n"
+" Alarme às:\n"
+" A hora em que alarme surge.\n"
+"\n"
+" Silenciar após:\n"
+" Para o alarme após este período.\n"
+" (se o alarme não for desligado)\n"
+"\n"
+"\n"
+"Dias\n"
+" Dia:\n"
+" Escolha os dias de ativação do alarme.\n"
+"\n"
+" Hora:\n"
+" Escolha a hora do alarme para cada dia,\n"
+" ou escolha o botão alternar para utilizar\n"
+" a hora pré-definida.\n"
+"\n"
+"\n"
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minutos"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Volume\n"
+" Desvanecimento:\n"
+" Suavizar o volume até ao valor escolhido\n"
+" durante este intervalo.\n"
+"\n"
+" Ao iniciar:\n"
+" Iniciar desvanecimento neste valor.\n"
+"\n"
+" Ao terminar:\n"
+" O volume em que acaba o desvanecimento.\n"
+" Se definido para 0, definir este volume e\n"
+" iniciar a reprodução.\n"
+"\n"
+"\n"
+"Opções:\n"
+" Comandos adicionais:\n"
+" Executar este comando ao tocar o alarme.\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Silenciar após:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+" Lista de reprodução:\n"
+" Carregar esta lista de reprodução.\n"
+" Se não indicar uma lista de reprodução, a\n"
+" lista atual será utilizada. Também pode\n"
+" indicar o URL de uma emissão mp3/ogg.\n"
+"\n"
+" Lembrete:\n"
+" Mostrar um lembrete ao desligar o alarme.\n"
+" Escreva o lembrete na caixa e ative o botão\n"
+" para alternar se o quiser mostrar."
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Alarme às (pré-definido):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Este é o seu alerta."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Escolha os dias para o alarme"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "O seu lembrete de hoje é:"
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Pré-definido"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Lembrete"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Dia"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "segunda"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "terça"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "quarta"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "quinta"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "sexta"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "sábado"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "domingo"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "segunda"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Definições do alarme"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Horário"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Alarme às (pré-definido):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Silenciar após:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "horas"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minutos"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Escolha os dias para o alarme"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Dia"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Pré-definido"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Dias"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Desvanecimento"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "segundos"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Volume"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Atual"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Ao iniciar"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Ao terminar"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Atual"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Comando adicional"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "ativar"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Lista de reprodução (opcional)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Escolha uma lista de reprodução"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Lembrete"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Utilizar lembrete"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Opções"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "O que significam estas opções?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nHorário\n Alarme às:\n A hora em que o alarme inicia.\n\n Silenciar após:\n A duração do alarme.\n (se a caixa de diálogo não for fechada)\n\n\nDias\n Dia:\n Selecione os dias do alarme.\n\n Hora:\n Escolha a hora do alarme em cada dia,\n ou o botão alternar para utilizar\n a hora pré-definida.\n\n\nVolume\n Desvanecimento:\n Aumentar som até ao volume escolhido\n durante este intervalo.\n\n Iniciar em: \n Iniciar o desvanecimento neste valor.\n\n Finalizar: \n O volume em que o desvanecimento para.\n Se o valor for 0, definir este valor como\n volume e iniciar reprodução.\n\n\nOpções:\n Comando adicional:\n Executar este comando com o alarme.\n\n Lista de reprodução:\n Carregar esta lista de reprodução e reproduzir.\n Se não indicar a lista de reprodução,\n as faixas que existirem na lista serão as utilizadas.\n Também pode indicar um URL de uma emissão mp3/ogg.\n\n Lembrete:\n Mostra um lembrete se o alarme for desligado.\n Escreva-o na caixa e ative o botão alternar\n se quiser mostrar o lembrete.\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Ajuda"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "O seu lembrete de hoje é..."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Obrigado"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Imagem de álbum"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Dispositivo PCM pré-definido"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Dispositivo misturador pré-definido"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Preferências do suplemento Alsa"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Dispositivo PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Dispositivo misturador:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Elemento misturador:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Solução para impedir a suspensão"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "Suplemento ALSA\nDireitos de autor 2009-2012 John Lindgren\n\nOs meus agradecimentos a William Pitcock, autor do suplemento ALSA Output NG, cujo código serviu de base nas situações em que a documentação ALSA não cumpria os requisitos."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"Suplemento ALSA\n"
+"Direitos de autor 2009-2012 John Lindgren\n"
+"\n"
+"Os meus agradecimentos a William Pitcock, autor do suplemento ALSA Output "
+"NG, cujo código serviu de base nas situações em que a documentação ALSA não "
+"cumpria os requisitos."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "Sistema ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (Reprodutor MIDI)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Ainda não escolheu as portas de reprodução Midi. Pode escolher as opções nas preferências do suplemento."
+msgstr ""
+"Ainda não escolheu as portas de reprodução Midi. Pode escolher as opções nas "
+"preferências do suplemento."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (Reprodutor MIDI)"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Infraestrutura Alsa"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Esta infraestrutura envia os eventos Midi para as portas do grupo de utilizadores Alsa. A interface Alsa é versátil e providencia as portas para os sintetizadores das placas de som internas (ex.: emu10k1) e para os dispositivos externos e aplicações de sintetização.\nEsta infraestrutura não produz som, uma vez que os eventos Midi são geridos pelos programas ou dispositivos das portas Alsa. Por exemplo, os eventos Midi enviados para os dispositivos sintetizadores serão reproduzidos diretamente.\nInfraestrutura desenvolvida por Giacomo Lozito."
+msgstr ""
+"Esta infraestrutura envia os eventos Midi para as portas do grupo de "
+"utilizadores Alsa. A interface Alsa é versátil e providencia as portas para "
+"os sintetizadores das placas de som internas (ex.: emu10k1) e para os "
+"dispositivos externos e aplicações de sintetização.\n"
+"Esta infraestrutura não produz som, uma vez que os eventos Midi são geridos "
+"pelos programas ou dispositivos das portas Alsa. Por exemplo, os eventos "
+"Midi enviados para os dispositivos sintetizadores serão reproduzidos "
+"diretamente.\n"
+"Infraestrutura desenvolvida por Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Infraestrutura FluidSynth"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Esta infraestrutura produz os sons, enviando os eventos Midi para o FluidSynth, um sintetizador baseado nas especificações SoundFont2 (www.fluidsynth.org).\nOs sons produzidos podem ser manipulados através dos suplementos e são processados pelo sistema de som escolhido pelo utilizador.\nInfraestrutura desenvolvida por Giacomo Lozito."
+msgstr ""
+"Esta infraestrutura produz os sons, enviando os eventos Midi para o "
+"FluidSynth, um sintetizador baseado nas especificações SoundFont2 (www."
+"fluidsynth.org).\n"
+"Os sons produzidos podem ser manipulados através dos suplementos e são "
+"processados pelo sistema de som escolhido pelo utilizador.\n"
+"Infraestrutura desenvolvida por Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Porta"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Nome do cliente"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Nome da porta"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Portas Alsa"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Placa de som: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Controlo do misturador: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Definições do misturador"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "Infraestrutura\nAlsa"
+msgstr ""
+"Infraestrutura\n"
+"Alsa"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "Informações da infraestrutura Amidi"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Seleção de infraestrutura"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Definições de reprodução"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transposição: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Drum shift: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Definições avançadas"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "calcular duração dos ficheiros midi na lista de reprodução"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "extrair comentários dos ficheiros midi (se existentes)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "extrair letra das músicas dos ficheiros midi (se existente)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "Suplemento\nAmidi"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "Amidi - selecione o ficheiro"
+msgstr ""
+"Suplemento\n"
+"Amidi"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Definições Amidi"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "Amidi - selecione o ficheiro SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Definições SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Tamanho (bytes)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Carregar SF ao iniciar o reprodutor"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Carregar SF ao reproduzir o ficheiro midi"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Definições do sintetizador"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "ganho"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "utilizar predefinições"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "valor:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "polifonia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "reverb"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "sim"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "não"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "coro"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "frequência"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "personalizada"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Infraestrutura\nFluidSynth"
+msgstr ""
+"Infraestrutura\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr "Informações Midi"
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Duração (mseg):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "N.º de faixas:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "variável"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Div. de tempo:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr "Comentários e letras das faixas midi"
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* sem comentários para este ficheiro midi *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* sem letra da música para este ficheiro midi *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 inválido)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Sobre o AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -608,7 +681,26 @@
 "\n"
 "Tony Vroon\n"
 "for the good help with alpha testing"
-msgstr "\nReprodutor de faixas MIDI\nhttp://www.develia.org/projects.php?p=amidiplug\n\nDesenvolvido por Giacomo Lozito\n<james@develia.org>\n\nUm especial obrigado a...\n\nClemens Ladisch e Jaroslav Kysela\npelas aplicações aplaymidi e amixer e\nà documentação alsa-lib que me ajudou a\ndescobrir as especificações da API ALSA.\n\nAlfredo Spadafina\npelo logótipo do teclado midi.\n\nTony Vroon\npor me ajudar nos testes."
+msgstr ""
+"\n"
+"Reprodutor de faixas MIDI\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"Desenvolvido por Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"Um especial obrigado a...\n"
+"\n"
+"Clemens Ladisch e Jaroslav Kysela\n"
+"pelas aplicações aplaymidi e amixer e\n"
+"à documentação alsa-lib que me ajudou a\n"
+"descobrir as especificações da API ALSA.\n"
+"\n"
+"Alfredo Spadafina\n"
+"pelo logótipo do teclado midi.\n"
+"\n"
+"Tony Vroon\n"
+"por me ajudar nos testes."
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
@@ -651,7 +743,9 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Ativar OSD se, durante a reprodução, o título da faixa for alterado mas o nome do ficheiro permanecer igual. Útil nas reproduções de emissões web."
+msgstr ""
+"Ativar OSD se, durante a reprodução, o título da faixa for alterado mas o "
+"nome do ficheiro permanecer igual. Útil nas reproduções de emissões web."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -783,8 +877,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "O gestor de composição não foi detetado.\nA menos que tenha a certeza que o gestor está ativo, tem que ativar um gestor de composição para mostrar o OSD."
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"O gestor de composição não foi detetado.\n"
+"A menos que tenha a certeza que o gestor está ativo, tem que ativar um "
+"gestor de composição para mostrar o OSD."
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -847,47 +945,47 @@
 msgid "Misc"
 msgstr "Diversos"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "Listas de reprodução ASXv1/ASXv2"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de reprodução Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Cor"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Definições Bauer Stereophonic-to-Binaural"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Nível:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Frequência de corte:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Pré-ajuste:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Analisador de espetro"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -897,233 +995,247 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "Direitos de autor (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> e outros.\n\nOs meus agradecimentos aos programadores da libcdio <http://www.gnu.org/software/libcdio/>\ne da libcddb <http://libcddb.sourceforge.net/>.\n\nAgradeço também a Tony Vroon pelo apoio concedido.\n\nEste foi um projeto do Google Summer of Code 2007."
+msgstr ""
+"Direitos de autor (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> e outros.\n"
+"\n"
+"Os meus agradecimentos aos programadores da libcdio <http://www.gnu.org/"
+"software/libcdio/>\n"
+"e da libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Agradeço também a Tony Vroon pelo apoio concedido.\n"
+"\n"
+"Este foi um projeto do Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Velocidade de leitura:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Sobrepor dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Detalhes"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Utilizar CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Utilizar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Utilizar HTTP em vez de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Caminho:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Suplemento Áudio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Ocorreu um erro ao iniciar o sistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s inválido."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Faixa %d não encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr "A faixa %d é uma faixa de dados."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Ocorreu um erro ao abrir o sistema de som."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Ocorreu um erro ao ler o CD."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "CD áudio"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Ocorreu um erro ao abrir o dispositivo %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "Não foi encontrada uma unidade de CD."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Ocorreu um erro ao iniciar a unidade de CD."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Ocorreu um erro ao obter o número da primeira/última faixa."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Não foi possível ler inicio/fim LSN da faixa %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Ocorreu um erro ao criar a ligação à cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Ocorreu um erro ao consultar o servidor cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Ocorreu um erro ao consultar o servidor cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Ocorreu um erro ao ler as informações cddb: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Unidade vazia."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Tipo de disco não suportado."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Reproduzir CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Adicionar CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Itens de menu do Áudio CD"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Compressão"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Centrar volume:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Intervalo dinâmico:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Suplemento Dynamic Range Compression\nDIreitos de autor 2010-2012 John Lindgren."
+msgstr ""
+"Suplemento Dynamic Range Compression\n"
+"DIreitos de autor 2010-2012 John Lindgren."
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Compressor de intervalo dinâmico"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Descodificador Game Console Music"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Geral"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Reprodução"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Graves:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "segundos"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Agudos:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Duração pré-definida da faixa:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Remistura"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Ativar remistura áudio"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Frequência:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignorar duração das \"tags\" SPC"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Aumentar \"reverb\""
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "A duração pré-definida da faixa, expressa em segundos, é utilizada pelas faixas que não possuem as informações de duração (exemplo: faixas cíclicas)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"A duração pré-definida da faixa, expressa em segundos, é utilizada pelas "
+"faixas que não possuem as informações de duração (exemplo: faixas cíclicas)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1131,88 +1243,107 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "Suplemento Console music decoder baseado no Game_Music_Emu 0.5.2\nFormatos suportados: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n\nAdaptação para o Audacious por:\nWilliam Pitcock <nenolod@dereferenced.org>\nShay Green <gblargg@gmail.com>"
+msgstr ""
+"Suplemento Console music decoder baseado no Game_Music_Emu 0.5.2\n"
+"Formatos suportados: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Adaptação para o Audacious por:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "A sobreposição falhou porque existem faixas com um número de canais diferente. Pode utilizar o gestor de canais para converter o número de canais das faixas."
+msgstr ""
+"A sobreposição falhou porque existem faixas com um número de canais "
+"diferente. Pode utilizar o gestor de canais para converter o número de "
+"canais das faixas."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "A sobreposição falhou porque existem faixas com frequências diferentes. Pode utilizar o Conversor de frequências para converter a frequência das faixas."
+msgstr ""
+"A sobreposição falhou porque existem faixas com frequências diferentes. Pode "
+"utilizar o Conversor de frequências para converter a frequência das faixas."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Suplemento Crossfade\nDireitos de autor 2010-2012 John Lindgren"
+msgstr ""
+"Suplemento Crossfade\n"
+"Direitos de autor 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Sobreposição"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Sobreposição:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Sobreposição"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intensidade:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Suplemento Cue"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Retorno:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Volume:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Suplemento Echo\nPo Johan Levin, 1999\n\nSurround echo por Carl van Schaik, 1999"
+msgstr ""
+"Suplemento Echo\n"
+"Po Johan Levin, 1999\n"
+"\n"
+"Surround echo por Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1220,9 +1351,15 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Suplemento de descodificação através da infraestrutura\nFFmpeg (http://www.ffmpeg.org/)\n\nAdaptação ao Audacious por:\nWilliam Pitcock <nenolod@nenolod.net>\nMatti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Suplemento de descodificação através da infraestrutura\n"
+"FFmpeg (http://www.ffmpeg.org/)\n"
+"\n"
+"Adaptação ao Audacious por:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Suplemento FFmpeg"
 
@@ -1290,7 +1427,21 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Este suplemento é um programa livre. Pode redistribui-lo e/ou modificá-lo nos termos da GNU General Public License, tal como publicada pela Free Software Foundation, tanto na versão 3 ou (por opção) qualquer versão mais recente.\n\nEste programa é disponibilizado com o intuito de ser útil mas NÃO POSSUI QUALQUER GARANTIA. Nem mesmo a garantia implícita de comercialização ou adequação a um propósito concreto. Consulte a GNU General Public License para mais detalhes.\n\nDeve ter recebido uma cópia da GNU General Public License junto com o programa. Se tal não aconteceu, escreva uma carta para Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"Este suplemento é um programa livre. Pode redistribui-lo e/ou modificá-lo "
+"nos termos da GNU General Public License, tal como publicada pela Free "
+"Software Foundation, tanto na versão 3 ou (por opção) qualquer versão mais "
+"recente.\n"
+"\n"
+"Este programa é disponibilizado com o intuito de ser útil mas NÃO POSSUI "
+"QUALQUER GARANTIA. Nem mesmo a garantia implícita de comercialização ou "
+"adequação a um propósito concreto. Consulte a GNU General Public License "
+"para mais detalhes.\n"
+"\n"
+"Deve ter recebido uma cópia da GNU General Public License junto com o "
+"programa. Se tal não aconteceu, escreva uma carta para Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1304,11 +1455,13 @@
 msgid "Joint Stereo"
 msgstr "Joint estéreo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1356,7 +1509,7 @@
 msgid "Error protection"
 msgstr "Proteção de erros"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Qualidade"
 
@@ -1436,542 +1589,624 @@
 msgid "Tags"
 msgstr "\"Tags\""
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Definições do codificador Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Qualidade (0 - 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "sem perda"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Código original de:\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Código original de:\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Descodificador FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "Suplemento GIO\nDireitos de autor 2009-2012 John Lindgren"
+msgstr ""
+"Suplemento GIO\n"
+"Direitos de autor 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Suplemento GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"Analisador de espetro OpenGL para o Audacious\n"
+"Direitos de autor 2013 Christophe Budé e John Lindgren\n"
+"\n"
+"Baseado no suplemento XMMS:\n"
+"Direitos de autor 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson e 4Front Technologies\n"
+"\n"
+"Licença: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Analisador de espetro OpenGL"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Suplemento Gnome Shortcut\nPermite-lhe controlar o Audacious com as teclas de atalho Gnome.\n\nDireitos de autor (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"Suplemento Gnome Shortcut\n"
+"Permite-lhe controlar o Audacious com as teclas de atalho Gnome.\n"
+"\n"
+"Direitos de autor (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Atalhos Gnome"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Número da entrada"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Ano"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Álbum"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Faixa"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Género"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Posição na fila"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Duração"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Caminho do ficheiro"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Nome do ficheiro"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Título personalizado"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Taxa de dados"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Escolha as colunas"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Disponíveis:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Escolhidas:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Doca à esquerda"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Doca à direita"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Doca em cima"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Doca em baixo"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Desacoplar"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Desativar"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "Abrir ficheir_os..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Abrir _URL..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Adicionar ficheiros..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Adicionar U_RL..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "Proc_urar na coleção"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "So_bre..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Preferências..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Sair"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "Re_produzir"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Paus_a"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "Pa_rar"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "Segui_nte"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "_Repetir"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "Baral_har"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "Sem avanç_o na lista de reprodução"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Parar _após esta faixa"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Parar após esta fai_xa"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "_Informações da faixa..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Ir para posição _temporal..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "I_r para a faixa..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Por _número de faixa"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Definir ponto de repetição _A"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Definir ponto de repetição _B"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "Remover pontos de rep_etição"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Por _título"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "Por nome de _ficheiro"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "Por caminho do fic_heiro"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Por _número de faixa"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Por _artista"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Por á_lbum"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "Por ál_bum"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Por _data de disponibilização"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "Por _duração"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Por caminho do _ficheiro"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Por tít_ulo personalizado"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "Inv_erter ordem"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "Aleató_rio"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "Re_produzir esta lista de reprodução"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Atualizar"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Remover ficheiros indisponívei_s"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Organização"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Ordenar seleção"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Remover _duplicados"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Remover ficheiros indisponívei_s"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Nova"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Mud_ar nome..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "Fe_char"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importar..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Exportar..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "_Gestão da lista de reprodução..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "_Gestão da fila de reprodução"
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "A_umentar volume"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "_Diminuir volume"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Equalizador"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_feitos"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Interface"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Visualizações"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "_Mostrar barra de menu"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Mostrar barra de i_nformações"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar visualização da barra de informações"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Mo_strar barra de estado"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Mostrar tempo _restante"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Mostrar _botão para fechar"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Mostrar título _das colunas"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Escolher _colunas..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Des_locar ao alterar faixa"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "Re_produção"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Lista de reprodução"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Serviços"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "S_aída"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Colocar/retirar da fila"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "Co_lar"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Selecion_ar tudo"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "Muda_r nome..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "A processar..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Erro"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d canal"
 msgstr[1] "%d canais"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr "Faixa anterior"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Reproduzir"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pausa/Retomar"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Parar"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "Faixa seguinte"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
 msgstr "Avançar 5 segundos"
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
 msgstr "Recuar 5 segundos"
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
 msgstr "Silenciar"
 
-#: src/hotkey/gui.c:80
-msgid "Volume Up"
+#: src/hotkey/gui.c:78
+msgid "Volume up"
 msgstr "Aumentar volume"
 
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr "Diminuir volume"
+
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
+msgstr "Ir para ficheiro"
+
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Reduzir volume"
+msgid "Toggle player window(s)"
+msgstr "Ativar/desativar janela(s) do reprodutor"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Ir para o ficheiro"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Mostrar OSD"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Alternar janela(s) do reprodutor"
+msgid "Toggle repeat"
+msgstr "Ativar/desativar repetição"
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Mostrar OSD"
+msgid "Toggle shuffle"
+msgstr "Ativar/desativar desorganização"
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Alternar repetição"
+msgid "Toggle stop after current"
+msgstr "Ativar/desativar paragem após a faixa atual"
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Alternar baralhação"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+msgid "Raise player window(s)"
 msgstr "Mostrar janela(s) do reprodutor"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(nada)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Não deve associar os botões principais do rato sem utilizar modificadores.\n\nContinuar?"
+msgstr ""
+"Não deve associar os botões principais do rato sem utilizar modificadores.\n"
+"\n"
+"Continuar?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Associação dos botões do rato"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Definições das Teclas globais"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Prima a combinação de teclas no campo de texto.\nTambém pode associar os botões do rato."
+msgstr ""
+"Prima a combinação de teclas no campo de texto.\n"
+"Também pode associar os botões do rato."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Teclas de atalho:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Ação:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Associação de teclas:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1984,104 +2219,131 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "Suplemento Global Hotkey\nPermite-lhe controlar o Audacious com as teclas globais ou com as teclas multimédia.\n\nDireitos de autor (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nOutros colaboradores:\nDireitos de autor (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nDireitos de autor (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n Bryn Davies <curious@ihug.com.au>,\n Jonathan A. Davis <davis@jdhouse.org>,\n Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"Suplemento Global Hotkey\n"
+"Permite-lhe controlar o Audacious com as teclas globais ou com as teclas "
+"multimédia.\n"
+"\n"
+"Direitos de autor (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Outros colaboradores:\n"
+"Direitos de autor (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Direitos de autor (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Atalhos globais"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Baseado no suplemento xmms-jack, de Chris Morgan:\nhttp://xmms-jack.sourceforge.net/\n\nAdaptação ao Audacious por Giacomo Lozito"
+msgstr ""
+"Baseado no suplemento xmms-jack, de Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Adaptação ao Audacious por Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "Sistema Jack"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Definições de %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Definições LADSPA "
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Caminhos do módulo:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Separe os caminhos com vírgulas.\nEstes caminhos serão adicionados ao LADSPA_PATH.\nApós a adição dos caminhos, prima Enter para procurar os novos suplementos."
+msgstr ""
+"Separe os caminhos com vírgulas.\n"
+"Estes caminhos serão adicionados ao LADSPA_PATH.\n"
+"Após a adição dos caminhos, prima Enter para procurar os novos suplementos.</"
+"small>"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Suplemento disponíveis:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Ativar"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Suplementos ativos:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Definições"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "Suplemento LADSPA Host\nDireitos de autor 2011 John Lindgren"
+msgstr ""
+"Suplemento LADSPA Host\n"
+"Direitos de autor 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "LADSPA"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: suporte LIRC não iniciado.\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: não foi possível ler o ficheiro de configuração LIRC.\n%s: consulte a documentação do LIRC.\n%s: como criar um ficheiro de configuração válido.\n"
+msgstr ""
+"%s: não foi possível ler o ficheiro de configuração LIRC.\n"
+"%s: consulte a documentação do LIRC.\n"
+"%s: como criar um ficheiro de configuração válido.\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: a tentar nova ligação...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: comando desconhecido \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: desligado do servidor LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: nova tentativa de ligação a cada %d segundos...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2095,155 +2357,326 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "Um suplemento para controlar o Audacious através do serviço de controlo remoto LIRC.\n\nAdaptação ao Audacious por:\nTony Vroon <chainsaw@gentoo.org>\nJoonas Harjumäki <jharjuma@gmail.com>\n\nBaseado no suplemento XMMS LIRC de:\nCarl van Schaik <carl@leg.uct.ac.za>\nChristoph Bartelmus <xmms@bartelmus.de>\nAndrew O. Shadoura <bugzilla@tut.by>\n\nPara mais informações, consulte http://lirc.org."
+msgstr ""
+"Um suplemento para controlar o Audacious através do serviço de controlo "
+"remoto LIRC.\n"
+"\n"
+"Adaptação ao Audacious por:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Baseado no suplemento XMMS LIRC de:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Para mais informações, consulte http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Ligação"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Nova ligação ao servidor LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Intervalo entre ligações:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "Suplemento LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "A letra da faixa não está disponível."
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Não foi possível obter %s."
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Não foi possível processar %s."
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "A procurar letra da faixa..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Detalhes em falta"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Ligação a lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "Suplemento LyricWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "Listas de reprodução M3U"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Gerador Tact: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Gerador Tact: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "Um gerador Tact criado por Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nPara o utilizar, adicione um URL no tipo: tact://beats*num/den\nexemplo: tact://77 para reproduzir 77 batidas por minuto\nou tact://60*3/4 para reproduzir 60 batidas por minuto em 3/4 tacts"
+msgstr ""
+"Um gerador Tact criado por Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Para o utilizar, adicione um URL no tipo: tact://beats*num/den\n"
+"exemplo: tact://77 para reproduzir 77 batidas por minuto\n"
+"ou tact://60*3/4 para reproduzir 60 batidas por minuto em 3/4 tacts"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Gerador Tact"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Suplemento Channel Mixer\nDireitos de autor 2011-2012 John Lindgren e Michał Lipski"
+msgstr ""
+"Suplemento Channel Mixer\n"
+"Direitos de autor 2011-2012 John Lindgren e Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Gestor de canais"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Canais de saída:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Gestor de canais"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Suplemento MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Resolução"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bit"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bit"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Canais"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Resampling"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Nearest (mais rápido)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Linear (rápido)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Spline (bom)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Polyphase (melhor)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Frequência"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Nível:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Corte:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Reverb"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Amplificação de graves"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Surround"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Amplificador"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Diversos"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Oversample"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Redução de ruído"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Reproduzir Amiga MODs"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Repetição"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "N.º de repetições:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Para repetir eternamente, defina o valor para -1."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Reprodutor Module)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "Suplemento MPG123"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "Servidor MPRIS 2"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Suplemento Neon HTTP/HTTPS"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "O Audacious não está a reproduzir."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Baseado na libnotify-aosd de Maximilian Bogner:\nhttp://www.mbogner.de/projects/libnotify-aosd/\n\nDireitos de autor (C) 2010 Maximilian Bogner\nDireitos de autor (C) 2011 John Lindgren\n\nEste suplemento é um programa livre. Pode redistribui-lo e/ou modificá-lo nos termos da GNU General Public License, tal como publicada pela Free Software Foundation, tanto na versão 3 ou (por opção) qualquer versão mais recente.\n\nEste programa é disponibilizado com o intuito de ser útil mas NÃO POSSUI QUALQUER GARANTIA. Nem mesmo a garantia implícita de comercialização ou adequação a um propósito concreto. Consulte a GNU General Public License para mais detalhes.\n\nDeve ter recebido uma cópia da GNU General Public License junto com o programa. Se tal não aconteceu, consulte <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Suplemento Desktop Notifications\n"
+"Direitos de autor (C) 2010 Maximilian Bogner\n"
+"Direitos de autor (C) 2011-2013 John Lindgren e Jean-Alexandre Anglès "
+"d'Auriac\n"
+"\n"
+"Este suplemento é uma aplicação livre. Você pode distribuir e/ou modificar o "
+"código nos termos da GNU General Public License, tal como publicada pela "
+"Free Software Foundation, tanto na versão 3 da licença ou (por opção) "
+"qualquer versão posterior.\n"
+"\n"
+"Este suplemento é disponibilizado com o intuito de ser útil mas não possui "
+"qualquer garantia, nem mesmo a garantia implícita de comercialização ou "
+"adequação a um objetivo especifico. Consulte a GNU General Public License "
+"para mais detalhes.\n"
+"\n"
+"Deve ter recebido uma cópia da GNU General Public License com esta "
+"aplicação. Se tal não ocorreu consulte <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Mostrar controlos de reprodução"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Mostrar sempre notificação"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Notificações do ambiente de trabalho"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Mostrar"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Seguinte"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Dispositivo pré-definido"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Dispositivo áudio:"
 
@@ -2268,22 +2701,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "Suplemento OSS4\nDireitos de autor 2010-2012 Michał Lipski\n\nGostaria de agradecer às pessoas em #audacious, especialmente a Tony Vroon, a John Lindgren e a todos os anteriores autores do suplemento OSS."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"Suplemento OSS4\n"
+"Direitos de autor 2010-2012 Michał Lipski\n"
+"\n"
+"Gostaria de agradecer às pessoas em #audacious, especialmente a Tony Vroon, "
+"a John Lindgren e a todos os anteriores autores do suplemento OSS."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "Sistema OSS4"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "Listas de reprodução PLS"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Descodificador OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2301,162 +2740,242 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Suplemento PulseAudio\n\nEste suplemento é um programa livre. Pode redistribui-lo e/ou modificá-lo nos termos da GNU General Public License, tal como publicada pela Free Software Foundation, tanto na versão 3 ou (por opção) qualquer versão mais recente.\n\nEste programa é disponibilizado com o intuito de ser útil mas NÃO POSSUI QUALQUER GARANTIA. Nem mesmo a garantia implícita de comercialização ou adequação a um propósito concreto. Consulte a GNU General Public License para mais detalhes.\n\nDeve ter recebido uma cópia da GNU General Public License junto com o programa. Se tal não aconteceu, escreva uma carta para Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"Suplemento PulseAudio\n"
+"\n"
+"Este suplemento é um programa livre. Pode redistribui-lo e/ou modificá-lo "
+"nos termos da GNU General Public License, tal como publicada pela Free "
+"Software Foundation, tanto na versão 3 ou (por opção) qualquer versão mais "
+"recente.\n"
+"\n"
+"Este programa é disponibilizado com o intuito de ser útil mas NÃO POSSUI "
+"QUALQUER GARANTIA. Nem mesmo a garantia implícita de comercialização ou "
+"adequação a um propósito concreto. Consulte a GNU General Public License "
+"para mais detalhes.\n"
+"\n"
+"Deve ter recebido uma cópia da GNU General Public License junto com o "
+"programa. Se tal não aconteceu, escreva uma carta para Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "Sistema PulseAudio"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Suplemento Sample Rate Converter\nDireitos de autor 2010-2012 John Lindgren"
+msgstr ""
+"Suplemento Sample Rate Converter\n"
+"Direitos de autor 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Ignorar/repetir frequências"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Interpolação linear"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Interpolação rápida"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Interpolação normal"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Interpolação máxima"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Conversão"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Taxa:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Mapeamentos de taxa"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Utilizar mapeamento de taxa"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Conversor de frequências"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Alterar senha"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "OK. A fazer scrobble para o utilizador: %s"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Sem Permissão"
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Aceda a esta ligação para permitir que o Audacious faça scrobble das "
+"reproduções:"
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Mantenha esta janela aberta e clique novamente em \"Verificar permissões\".\n"
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"Não se preocupe. Os seus scrobbles estão gravados no computador.\n"
+"Serão enviados assim que o Audacious tiver permissão."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Erro na Rede."
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Serviços"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "Ocorreu um erro ao contactar com a Last.fm. Por favor tente novamente."
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "A Verificar..."
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Utilizador:"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "Verific_ar Permissão"
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Senha:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_Revogar Permissão"
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "URL do \"scrobbler\":"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Tem de dar permissão ao Audacious para poder fazer scrobble das faixas para "
+"a sua conta Last.fm.\n"
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:233
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"O suplemento Scrobbler não foi iniciado.\n"
+"Pode haver um problema com a sua instalação."
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Suplemento AudioScrobbler\n\nVersão original por Audun Hove <audun@nlc.no> e Pipian <pipian@pipian.com>"
+msgstr ""
+"Audacious Scrobbler 2.0 por Pitxyoki,\n"
+"\n"
+"Direitos de Autor © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail."
+"com>\n"
+"\n"
+"Obrigado ao John Lindgren por me ter ajudado no início deste projecto.\n"
+"\n"
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"O Audacious passou a usar uma nova versão do Scrobbler para a Last.fm.\n"
+"Por favor verifique as Preferências do suplemento Scrobbler."
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "Suplemento SDL\nDireitos de autor 2010 John Lindgren"
+msgstr ""
+"Suplemento SDL\n"
+"Direitos de autor 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "Sistema SDL"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Coleção"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Artista desconhecido"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Álbum desconhecido"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\nem %s de %s"
+msgstr ""
+"%s\n"
+"em %s de %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] "%d álbum"
 msgstr[1] "%d álbuns"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2464,10 +2983,14 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d faixa"
-msgstr[1] "%s\n %s, %d faixas"
+msgstr[0] ""
+"%s\n"
+" %s, %d faixa"
+msgstr[1] ""
+"%s\n"
+" %s, %d faixas"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2475,76 +2998,82 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d faixa de %s"
-msgstr[1] "%s\n %d faixas de %s"
+msgstr[0] ""
+"%s\n"
+" %d faixa de %s"
+msgstr[1] ""
+"%s\n"
+" %d faixas de %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Criar lista de reprodução"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Adicionar à lista de reprodução"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Procurar coleção"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Para importar a coleção de músicas para o Audacious, escolha a pasta e clique no ícone \"Atualizar\"."
+msgstr ""
+"Para importar a coleção de músicas para o Audacious, escolha a pasta e "
+"clique no ícone \"Atualizar\"."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Aguarde..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Escolha a pasta"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Ferramenta de procura"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Interface clássica Winamp"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "Re_produtor:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Selecione o tipo de letra do reprodutor:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Lista de reprodução:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Escolha o tipo de letra da lista de reprodução:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Tipo de letra"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Utilizar letras bitmap (só para ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Deslocar título em ambas as direções"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Tema"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Preferências de interface"
 
@@ -2600,7 +3129,7 @@
 msgid "Presets"
 msgstr "Pré-ajuste"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Carregar pré-ajuste"
 
@@ -2613,7 +3142,7 @@
 msgid "Load equalizer preset"
 msgstr "Carregar pré-ajuste de equalizador"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Gravar pré-ajuste"
 
@@ -2625,7 +3154,7 @@
 msgid "Save equalizer preset"
 msgstr "Gravar pré-ajuste de equalizador"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Eliminar pré-ajuste"
 
@@ -2633,739 +3162,754 @@
 msgid "Delete auto-preset"
 msgstr "Eliminar pré-ajuste automático"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Ir para %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Volume: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Equilíbrio: %d%% à esquerda"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Equilíbrio: centro"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Equilíbrio: %d%% à direita"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Menu de opções"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Desativar \"Sempre visível\""
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Ativar \"Sempre visível\""
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Caixa de informações de ficheiro"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Menu de visualizações"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Modo simples"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Modo lista de reprodução"
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Para após a faixa"
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Não para após a faixa"
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Ponto de repetição A definido"
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Ponto de repetição B definido"
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Pontos de repetição eliminados"
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Deslocar nome automaticamente"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Parar após a faixa atual"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Picos"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Baralhar"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Sem avanço na lista de reprodução"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Mostrar reprodutor"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Mostrar editor de listas de reprodução"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Mostrar equalizador"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Sempre visível"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Em todas as áreas de trabalho"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Enrolar reprodutor"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Enrolar editor de listas de reprodução"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Enrolar equalizador"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analisador"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Scope"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Voiceprint"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Desligado"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Fogo"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Linhas verticais"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Linhas"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Barras"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Dot Scope"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Line Scope"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Solid Scope"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Gelo"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Suave"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Mais lento"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Normal"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Mais rápido"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Tempo decorrido"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Tempo restante"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Anterior"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Seguinte"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Visualização"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Modo de visualização"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Modo Analyzer"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Modo Scope"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Modo Voiceprint"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Modo WindowShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Velocidade do analisador"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Velocidade dos picos"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Lista de reprodução"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Reproduzir lista de reprodução"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Nova lista de reprodução"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Selecionar lista de reprodução seguinte"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Selecionar lista de reprodução anterior"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Eliminar lista de reprodução"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Importar lista de reprodução"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Carrega uma lista de reprodução para a lista selecionada."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Exportar lista de reprodução"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Grava a lista de reprodução selecionada."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Atualizar lista"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Atualiza os detalhes associados às faixas da lista de reprodução."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Gestão da lista de reprdução"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Gestão da fila de reprodução"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Interface"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Preferências da interface..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Adicionar endereço web..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Adiciona uma faixa remota à lista de reprodução."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Adicionar ficheiros..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Adicionar ficheiros à lista de reprodução."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Procurar e selecionar"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Procura a lista de reprodução e seleciona as faixas com base num critério."
+msgstr ""
+"Procura a lista de reprodução e seleciona as faixas com base num critério."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Inverter seleção"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Inverte a relação entre selecionadas e não."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Selecionar tudo"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Seleciona todas as faixas da lista de reprodução."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Não selecionar"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Desmarca todas as faixas da lista de reprodução."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Remover tudo"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Remove todas as faixas da lista de reprodução."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Limpar fila de reprodução"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Apaga a fila associada à lista de reprodução."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Remover ficheiros indisponíveis"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Remove da lista de reprodução os ficheiros indisponíveis."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Remover duplicados"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Por título"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Remover da lista de reprodução as entradas duplicadas (por título)."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Por nome de ficheiro"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Remover da lista de reprodução as entradas duplicadas (por nome de ficheiro)."
+msgstr ""
+"Remover da lista de reprodução as entradas duplicadas (por nome de ficheiro)."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Por caminho e nome de ficheiro"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Remover da lista de reprodução as entradas duplicadas (por caminho)."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Remover desmarcadas"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Remove da lista de reprodução as entradas desmarcadas."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Remover seleção"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Remove da lista de reprodução as entradas selecionadas."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Lista aleatória"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Cria uma lista de reprodução aleatória."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Inverter lista"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Inverte a lista de reprodução."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Ordenação"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Ordena por título."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Por álbum"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Ordena por álbum."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Por artista"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Ordena por artista."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Ordena por nome de ficheiro."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Ordena por caminho."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Por data"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Ordena por data de modificação."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Por número de faixa"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Ordena por número de faixa,"
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Ordenar seleção"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Ficheiro"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Serviços"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Ver detalhes da faixa"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Ver detalhes da faixa"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Sobre o Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Reproduzir ficheiro"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Carregar e reproduzir ficheiro."
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Reproduzir localização"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Reproduzir ficheiros da localização escolhida."
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Serviços"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Preferências"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Abrir janela de preferências"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Sair do Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Definir A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Apagar A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Ir para o ficheiro"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Ir para posição temporal"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Alternador de fila"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Ativa/inativa a entrada na fila da lista de reprodução."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Colar"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Carregar"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importar"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Gravar"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Pré-ajuste"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Carregar pré-ajuste automático"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Carregar pré-ajuste automático"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Carregar pré-ajuste pré-definido para o equalizador"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Nulo"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Definir pré-ajuste nulo"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Do ficheiro"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Carregar pré-ajuste do ficheiro"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Do ficheiro EQF do Winamp"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Carregar pré-ajuste EQF Winamp"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Pré-ajuste Winamp"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importar pré-ajuste Winamp"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Gravar pré-ajuste automático"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Gravar pré-ajuste pré-definido"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Para ficheiro"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Gravar pré-ajuste no ficheiro"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Para ficheiro EQF"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Gravar pré-ajuste para EQF Winamp"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Eliminar pré-ajuste automático"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Procurar entradas na lista de reprodução ativa"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Seleciona as entradas da lista de reprodução, preenchendo um ou mais campos. Os campos utilizam expressões regulares, sem distinção entre maiúsculas e minúsculas. Se não sabe o que são expressões regulares, basta inserir uma parte do que pretende procurar."
+msgstr ""
+"Seleciona as entradas da lista de reprodução, preenchendo um ou mais campos. "
+"Os campos utilizam expressões regulares, sem distinção entre maiúsculas e "
+"minúsculas. Se não sabe o que são expressões regulares, basta inserir uma "
+"parte do que pretende procurar."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Título:"
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Álbum: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Artista: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Nome do ficheiro:"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Limpar seleção anterior antes de procurar"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Alternar fila automaticamente para as entradas coincidentes"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Criar lista de reprodução com as entradas coincidentes"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Editor de listas de reprodução"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d de %d)"
@@ -3383,81 +3927,123 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Não foi possível criar o diretório (%s): %s.\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Baseado no suplemento xmms_sndfile:\n"
+"Direitos de autor (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Adaptação ao Audacious por Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Este suplemento é um programa livre. Pode redistribui-lo e/ou modificá-lo "
+"nos termos da GNU General Public License, tal como publicada pela Free "
+"Software Foundation, tanto na versão 3 ou (por opção) qualquer versão mais "
+"recente.\n"
+"\n"
+"Este programa é disponibilizado com o intuito de ser útil mas NÃO POSSUI "
+"QUALQUER GARANTIA. Nem mesmo a garantia implícita de comercialização ou "
+"adequação a um propósito concreto. Consulte a GNU General Public License "
+"para mais detalhes.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Baseado no suplemento xmms_sndfile:\nDireitos de autor (C) 2000, 2002 Erik de Castro Lopo\n\nAdaptação ao Audacious por Tony Vroon <chainsaw@gentoo.org>\n\nEste suplemento é um programa livre. Pode redistribui-lo e/ou modificá-lo nos termos da GNU General Public License, tal como publicada pela Free Software Foundation, tanto na versão 3 ou (por opção) qualquer versão mais recente.\n\nEste programa é disponibilizado com o intuito de ser útil mas NÃO POSSUI QUALQUER GARANTIA. Nem mesmo a garantia implícita de comercialização ou adequação a um propósito concreto. Consulte a GNU General Public License para mais detalhes.\n\nDeve ter recebido uma cópia da GNU General Public License junto com o programa. Se tal não aconteceu, escreva uma carta para Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+"Deve ter recebido uma cópia da GNU General Public License junto com o "
+"programa. Se tal não aconteceu, escreva uma carta para Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Suplemento Sndfile"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Sobre o Sndio"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Suplemento Sndio\n\nDesenvolvido por Thomas Pfaff <tpfaff@tp76.info>.\n"
+msgstr ""
+"Suplemento Sndio\n"
+"\n"
+"Desenvolvido por Thomas Pfaff <tpfaff@tp76.info>.\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Formato não suportado"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Foi solicitado um formato não suportado pelo dispositivo.\n\nTente novamente com o servidor sndiod(1) em execução."
+msgstr ""
+"Foi solicitado um formato não suportado pelo dispositivo.\n"
+"\n"
+"Tente novamente com o servidor sndiod(1) em execução."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "Dispositivo sndio"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(vazio significa as predefinições)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Aceitar"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Alteração de faixa"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Comando a executar ao iniciar uma nova faixa."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Comando:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Comando a executar ao terminar uma faixa."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Comando a executar ao atingir o fim de uma lista de reprodução."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Comando a executar se o título da faixa for alterado (para emissões web)."
+msgstr ""
+"Comando a executar se o título da faixa for alterado (para emissões web)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3474,35 +4060,90 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Pode utilizar os formatos descritos em baixo, que\nserão substituídos antes da invocação do comando\n(nem todos podem ser utilizados como comando end-of-playlist).\n\n%F: frequência (em hertz)\n%c: número de canais\n%f: nome do ficheiro (caminho integral)\n%l: duração (em ms)\n%n ou %s: nome da faixa\n%r: taxa (em bits por segundo)\n%t: posição na lista de reprodução (%02d)\n%p: a reproduzir atualmente (1 ou 0)\n%a: artista\n%b: álbum\n%T: título da faixa"
+msgstr ""
+"Pode utilizar os formatos descritos em baixo, que\n"
+"serão substituídos antes da invocação do comando\n"
+"(nem todos podem ser utilizados como comando end-of-playlist).\n"
+"\n"
+"%F: frequência (em hertz)\n"
+"%c: número de canais\n"
+"%f: nome do ficheiro (caminho integral)\n"
+"%l: duração (em ms)\n"
+"%n ou %s: nome da faixa\n"
+"%r: taxa (em bits por segundo)\n"
+"%t: posição na lista de reprodução (%02d)\n"
+"%p: a reproduzir atualmente (1 ou 0)\n"
+"%a: artista\n"
+"%b: álbum\n"
+"%T: título da faixa"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Os parâmetros enviados à consola devem ser envolvidos em aspas. Se não o fizer corre riscos de segurança."
+msgstr ""
+"Os parâmetros enviados à consola devem ser envolvidos em "
+"aspas. Se não o fizer corre riscos de segurança."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"SoX Resampler para o Audacious\n"
+"Direitos de autor 2013 Michał Lipski\n"
+"\n"
+"Baseado no suplemento Sample Rate Converter\n"
+"Direitos de autor 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Rápida"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Baixa"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Alta"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Muito alta"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Qualidade:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "SoX Resampler"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Velocidade e pitch"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Pitch:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Velocidade e pitch"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3511,94 +4152,115 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "Suplemento Status Icon\n\nDireitos de autor 2005-2007 Giacomo Lozito <james@develia.org>\nDireitos de autor 2010 Michał Lipski <tallica@o2.pl>\n\nEste suplemento disponibiliza um ícone de estado na área de notificação do seu gestor de janelas."
+msgstr ""
+"Suplemento Status Icon\n"
+"\n"
+"Direitos de autor 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Direitos de autor 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Este suplemento disponibiliza um ícone de estado na área de notificação do "
+"seu gestor de janelas."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Ação da roda do rato"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Alterar volume"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Alterar faixa reproduzida"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Outras definições"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Desativar janela emergente"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Fechar para a área de notificação"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avançar na lista de reprodução ao rolar para cima"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Ícone de estado"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Suplemento Extra Stereo\n\nPor Johan Levin, 1999"
+msgstr ""
+"Suplemento Extra Stereo\n"
+"\n"
+"Por Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Extra estéreo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Extra estéreo"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Gerador de tons:"
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "Um gerador de tons criado por Håvard Kvålen <havardk@xmms.org>\nModificado Daniel J. Peng <danielpeng@bigfoot.com>\n\nPara o utilizar, adicione um URL no tipo: tone://frequência1;frequência2;frequência3;...\nexemplo: tone://2000;2005 para reproduzir um tom de 2000 Hz e outro de 2005 Hz"
+msgstr ""
+"Um gerador de tons criado por Håvard Kvålen <havardk@xmms.org>\n"
+"Modificado Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Para o utilizar, adicione um URL no tipo: tone://frequência1;frequência2;"
+"frequência3;...\n"
+"exemplo: tone://2000;2005 para reproduzir um tom de 2000 Hz e outro de 2005 "
+"Hz"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Gerador de tons"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "Suplemento File I/O\nDireitos de autor 2009-2012 John Lindgren\n\nEste suplemento é obrigatório e não pode ser desativado."
+msgstr ""
+"Suplemento File I/O\n"
+"Direitos de autor 2009-2012 John Lindgren\n"
+"\n"
+"Este suplemento é obrigatório e não pode ser desativado."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Suplemento File I/O"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Remoção de voz"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3617,46 +4279,76 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Suplemento Ogg Vorbis Decoder\n\nBaseado no suplemento Ogg Vorbis da Xiph.org Foundation:\n\nhttp://www.xiph.org/\n\nCódigo original de:\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nOutros colaboradores:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Suplemento Ogg Vorbis Decoder\n"
+"\n"
+"Baseado no suplemento Ogg Vorbis da Xiph.org Foundation:\n"
+"\n"
+"http://www.xiph.org/\n"
+"\n"
+"Código original de:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Outros colaboradores:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Descodificador Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr "Suplemento Vortex player por Sashnov Alexander <sashnov@ngs.ru>\nBaseado em in_vtx.dll de Roman Sherbakov <v_soft@microfor.ru>\nAdaptação ao Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Suplemento Vortex player por Sashnov Alexander <sashnov@ngs.ru>\n"
+"Baseado em in_vtx.dll de Roman Sherbakov <v_soft@microfor.ru>\n"
+"Adaptação ao Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Descodificador VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "com perda (híbrido)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "com perda"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Direitos de autor 2006 William Pitcock <nenolod@nenolod.net>\n\nParte do código foi desenvolvido por Miles Egan."
+msgstr ""
+"Direitos de autor 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Parte do código foi desenvolvido por Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Descodificador WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Descodificador 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listas de reprodução XML Shareable (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "Amidi - selecione o ficheiro"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Ordenar s_eleção"

audacious-plugins-3.3.4.tar.bz2/po/ru.po -> audacious-plugins-3.4.2.tar.bz2/po/ru.po Changed

@@ -1,601 +1,682 @@
 # Russian translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Alexander Orlov <alxorlov@pochta.ru>, 2007.
-# <joshuazzz@yandex.ru>, 2012.
-# <kvantarium@gmail.com>, 2012.
-# Musatov M. <m1kc@yandex.ru>, 2012.
-# NaiLi (aka jamesjames) Rootaerc <theism@mail.ru>, 2012-2013.
-# NaiLi Rootaerc <theism@mail.ru>, 2012.
-# Rax Garfield <admin@dvizho.ks.ua>, 2012.
-# <sejava@mail.ru>, 2012.
-# <senyalutyi@ya.ru>, 2013.
-# Sergey V. Mironov <serg0@ulx.ru>, 2009.
-# Sergey V. Mironov <sergo@bk.ru>, 2010.
+# Alexander Orlov <alxorlov@pochta.ru>, 2007
+# Someonefree <drag-sasha@mail.ru>, 2013
+# iavojd <iavojd@gmail.com>, 2013
+# iavojd <iavojd@gmail.com>, 2013
+# joshuazzz <joshuazzz@yandex.ru>, 2012
+# joshuazzz <joshuazzz@yandex.ru>, 2012
+# StreamThreaedr <kvantarium@gmail.com>, 2012
+# Maxim Musatov <m1kc@yandex.ru>, 2012
+# Maxim Musatov <m1kc@yandex.ru>, 2012
+# NaiLi (aka jamesjames) Rootaerc <theism@mail.ru>, 2012-2013
+# NaiLi (aka jamesjames) Rootaerc <theism@mail.ru>, 2012
+# NEKURIM <kvadrocu7@gmail.com>, 2013
+# Rax Garfield <admin@dvizho.ks.ua>, 2012
+# <sejava@mail.ru>, 2012
+# senyalutyi <senyalutyi@ya.ru>, 2013
+# senyalutyi <senyalutyi@ya.ru>, 2013
+# serg0 <sergo@bk.ru>, 2010
+# Sergey V. Mironov <serg0@ulx.ru>, 2009
+# serg0 <sergo@bk.ru>, 2010
+# Someonefree <drag-sasha@mail.ru>, 2013
+# StreamThreaedr <kvantarium@gmail.com>, 2012
+# Victor Ponomarev <victor.a.ponomarev@gmail.com>, 2013
+# NEKURIM <kvadrocu7@gmail.com>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2013-01-30 18:08+0000\n"
-"Last-Translator: NaiLi (aka jamesjames) Rootaerc <theism@mail.ru>\n"
-"Language-Team: Russian\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-09-26 18:30+0000\n"
+"Last-Translator: victorponomarev <lidlencom@gmail.com>\n"
+"Language-Team: Russian (http://www.transifex.com/projects/p/audacious/"
+"language/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"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"
+"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"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "моно"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "стерео"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "объёмное звучание"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Декодер AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
-msgstr ""
+msgstr "последовательный"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (проигрыватель AdLib)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
+"Плагин, который используется для проигрывания и завершения проигрывания в "
+"определенное время.\n"
+"Изначально написан Adam Feakin и Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Будильник"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Это ваш звонок будильника."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "ОК"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Настройки будильника"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Время"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "часы"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "ч"
-
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "минуты"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Время\n"
+"Сигнал после:\n"
+"Время сигнала после.\n"
+"\n"
+"Тихий режим после:\n"
+"Сигнал стоп посе истечения этого промежутка времени.\n"
+"(если диалог пробуждения не закрыт)\n"
+"\n"
+"\n"
+"Дни\n"
+"День:\n"
+"Выберите дни для активации сигнала.\n"
+"\n"
+"Время:\n"
+"Выберите время сигнала на каждый день\n"
+"или выберите переключатель для времени по умолчанию.\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Перестать звонить после:"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Громкость\n"
+"Затухание:\n"
+"Уменьшить громкость до нужного уровня\n"
+"за этот промежуток времени.\n"
+"\n"
+"Начало в:\n"
+"Начало затухания с этой громкости.\n"
+"\n"
+"Завершение:\n"
+"Остановить угасание громкости. Если время\n"
+"угасания 0, то установить эту громкость и начать\n"
+"воспроизведение.\n"
+"\n"
+"\n"
+"Параметры:\n"
+"Дополнительные команды:\n"
+"Выполнить эту команду при срабатывании сигнала.\n"
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+"Список:\n"
+"Загрузить этот список. Если нет списка\n"
+"учитываю, что он будет использоваться.\n"
+"Адрес mp3/ogg потока может также быть введен здесь.\n"
+"\n"
+"Напоминание:\n"
+"Отображать напоминание, когда звучит сигнал.\n"
+"Введите в поле напоминание и включите\n"
+"- переключатель, если вы хотите, чтобы это было показано."
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Будильник в (по умолчанию):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Это ваш звонок будильника"
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Выберите дни, в которые будет срабатывать будильник"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Напоминание на сегодняшний день..."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "По умолчанию"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Напоминание"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "День"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Понедельник"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Среда"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Четверг"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Пятница"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Суббота"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Понедельник"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Настройки будильника"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Время"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Будильник в (по умолчанию):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "ч"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Перестать звонить после:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "часы"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "минуты"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Выберите дни, в которые будет срабатывать будильник"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "День"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "По умолчанию"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Дни"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Плавное нарастание громкости"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "секунд"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Громкость"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Текущее"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Начать c"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "В конце"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Текущее"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Дополнительная команда"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "включить"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Список воспроизведения (необязательно)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Выберите список воспроизведения"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Напоминание"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Использовать напоминание"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Параметры"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Что означают эти опции?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nВремя\n Будильник в: \n Время срабатывания будильника.\n\n Перестать звонить после: \n Перестать звонить через указанный промежуток времени.\n (если окно звонка не было закрыто)\n\n\nДни\n День:\n Выберите дни, в которые будет срабатывать будильник.\n\n Время:\n Выберите время срабатывания в каждый из дней\n или установите срабатывание во время по умолчанию.\n\n\nГромкость\n Плавное нарастание громкости: \n Плавно поднимать громкость до заданной \n за данное время.\n\n Начать с: \n Начать плавное нарастание с этой громкости.\n\n В конце: \n Громкость, на которой следует прекратить плавное\n нарастание. Если время установлено в 0, то эта громкость\n задаётся сразу.\n\n\nОпции:\n Дополнительная команда:\n Выполнить эту команду в момент срабатывания будильника.\n\n Список воспроизведения: \n Воспроизвести этот список воспроизведения.\n Если не задано, будет использоваться текущий.\n Здесь также может быть указан URL потока mp3/ogg.\n\n Напоминание:\n Отобразить напоминание, когда будильник затихнет.\n Введите текст в поле и поставьте рядом галочку\n для активации.\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Справка"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Отмена"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Ваше напоминание на сегодня..."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Спасибо"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Обложка альбома"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Устройство PCM по умолчанию"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Микшер по умолчанию"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Параметры модуля вывода ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "Устройство PCM:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Микшер:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Компонент микшера:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Обходить ошибку зависания \"drain\" в ALSA"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
+"ALSA Плагин вывода для Audacious\n"
+"Авторство 2009-2012 John Lindgren\n"
+"\n"
+"Моя благодарность Уильяму Pitcock, автор Вывода ALSA NG, чей код служил "
+"ориентиром, когда руководства по ALSA было недостаточно."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "Вывод ALSA"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "Плагин AMIDI (проигрыватель MIDI)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Порт секвенсера для воспроизведения MIDI не выбран. Это можно сделать в параметрах модуля MIDI."
+msgstr ""
+"Порт секвенсера для воспроизведения MIDI не выбран. Это можно сделать в "
+"параметрах модуля MIDI."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "Плагин AMIDI (проигрыватель MIDI)"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Модуль ALSA "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Этот модуль отправляет события MIDI на группу выбранных пользователем портов синтезатора ALSA. Интерфейс синтезатора ALSA очень разносторонний, он может предоставлять порты для аппаратных синтезаторов (например, emu10k1), для программных синтезаторов, для внешних устройств, и др.\nЭтот модуль не производит звук, события MIDI от устройств/программ обрабатываются напрямую после портов ALSA; например, отправленные на аппаратный синтезатор события MIDI будут сразу воспроизведены.\nЭтот внутренний модуль написан Giacomo Lozito."
+msgstr ""
+"Этот модуль отправляет события MIDI на группу выбранных пользователем портов "
+"синтезатора ALSA. Интерфейс синтезатора ALSA очень разносторонний, он может "
+"предоставлять порты для аппаратных синтезаторов (например, emu10k1), для "
+"программных синтезаторов, для внешних устройств, и др.\n"
+"Этот модуль не производит звук, события MIDI от устройств/программ "
+"обрабатываются напрямую после портов ALSA; например, отправленные на "
+"аппаратный синтезатор события MIDI будут сразу воспроизведены.\n"
+"Этот внутренний модуль написан Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Модуль FluidSynth "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Этот модуль производит аудио отправляя MIDI события к FluidSynth, программному синтезатору реального времени который основан на спецификации SoundFont2 (www.fluidsynth.org).\n\nПолученные аудио-данные можно корректировать при помощи плагинов-эффектов проигрывателя и обработать выбранным плагином вывода.\n\nМодуль написан Джакомо Лозито (Giacomo Lozito)."
+msgstr ""
+"Этот модуль производит аудио отправляя MIDI события к FluidSynth, "
+"программному синтезатору реального времени который основан на спецификации "
+"SoundFont2 (www.fluidsynth.org).\n"
+"\n"
+"Полученные аудио-данные можно корректировать при помощи плагинов-эффектов "
+"проигрывателя и обработать выбранным плагином вывода.\n"
+"\n"
+"Модуль написан Джакомо Лозито (Giacomo Lozito)."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Порт"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Название клиента"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Название порта"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Порты вывода ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Звуковая карта: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Выбор микшера: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Параметры микшера"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "Модуль\nALSA"
+msgstr ""
+"Модуль\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - информация о внутреннем модуле"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Выбор внутреннего модуля"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Параметры воспроизведения"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Транспонирование: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Смещение ударных: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Дополнительные параметры"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "Вычислять длительность MIDI-файлов в списке"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "Считывать комментарии из MIDI-файлов (если доступны)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "Считывать тексты из MIDI-файлов (если доступны)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - выбор файла"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Настройки AMIDI-Plugin"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - выбор SoundFont файла"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Параметры SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Имя файла"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Размер (байт)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Загружать SF при запуске проигрывателя"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Загружать SF при воспроизведении первого MIDI-файла"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Параметры синтезатора"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "усиление"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "по умолчанию"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "значение:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "Полифония"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "реверберация"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "да"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "нет"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "хор"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "частота"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "другая "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Гц "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Модуль\nFluidSynth"
+msgstr ""
+"Модуль\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr "Информация MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Длительность (мс):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Количество дорожек:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "переменный"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Time Div:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr "Комментарии и тексты MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* в этом MIDI-файле нет комментариев *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* в этом MIDI-файле нет текстов *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (неверный UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Об AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr ""
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "Модуль AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -617,10 +698,30 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"\n"
+"модульный проигрыватель MIDI\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"написан Giacomo Lozito\n"
+"< james@develia.org >\n"
+"\n"
+"\n"
+"отдельные благодарности...\n"
+"\n"
+"Clemens Ladisch и Jaroslav Kysela\n"
+"за их отличные программы aplaymidi и amixer; они\n"
+"действительно полезные, как и документация alsa-lib для того,\n"
+"чтобы узнать больше об интерфейсе библиотеки ALSA\n"
+"\n"
+"Alfredo Spadafina\n"
+"за прекрасный логотип миди-клавиатуры\n"
+"\n"
+"Tony Vroon\n"
+"за большую помощь в альфа-тестировании"
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
-msgstr ""
+msgstr "Audacious OSD"
 
 #: src/aosd/aosd.c:37
 msgid "AOSD (On-Screen Display)"
@@ -659,7 +760,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Показать OSD, если в процессе воспроизведения меняется название, но имя файла остаётся прежним. Полезно для отображения названий при воспроизведении из сети."
+msgstr ""
+"Показать OSD, если в процессе воспроизведения меняется название, но имя "
+"файла остаётся прежним. Полезно для отображения названий при воспроизведении "
+"из сети."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -791,12 +895,17 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Композитный менеджер не найден;\nПожалуйста, запустите композитный менеджер; в противном случае\nOSD не будет работать корректно."
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Композитный менеджер не найден;\n"
+"Пожалуйста, запустите композитный менеджер; в противном случае\n"
+"OSD не будет работать корректно."
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
-msgstr "Для режима \"Имитированная прозрачность\" композитный менеджер не требуется."
+msgstr ""
+"Для режима \"Имитированная прозрачность\" композитный менеджер не требуется."
 
 #: src/aosd/aosd_ui.c:837
 msgid "Transparency"
@@ -855,47 +964,47 @@
 msgid "Misc"
 msgstr "Прочее"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "Списки воспроизведения ASXv1/ASXv2"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Списки воспроизведения Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Цвет"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Размывающийся уровень"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Настройка преобразования стереозвука в бинауральный по Бауэру"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Уровень смешивания каналов:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Частота среза:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Заготовки:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Стереофонический в бинауральный по Бауэру (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Анализатор спектра"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -906,232 +1015,250 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Copyright (c) 2007 Calin Crisan <ccrisan@gmail.com> и команда разработчиков "
+"Audacious.\n"
+"\n"
+"Автор выражает благодарность разработчикам библиотеки libcdio <http://www."
+"gnu.org/software/libcdio/>\n"
+"\tи разработчикам библиотеки libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Также спасибо тебе, Tony Vroon, за наставления.\n"
+"\n"
+"Этот модуль разработан в рамках проекта Google Summer of Code 2007.\n"
+"\n"
+"Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Устройство"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Скорость чтения:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Переопределить устройство:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Метаданные"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Использовать CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Использовать CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Использовать HTTP вместо CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Пусть:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Плагин Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
-msgstr ""
+msgstr "Ошибка при инициализации CD."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Некорректный URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Трек %d не найден."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "Дорожка %d это данные дорожки."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Не удалось задействовать аудио-вывод."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Ошибка чтения Аудио CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Не удалось открыть устройство CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "Не найдено совместимого CD-устройства."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "Ошибка при инициализации CD."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "Failed to retrieve first/last track number."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "Невозможно считать начало/конец LSN для трека %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
-msgstr ""
+msgstr "Не удалось создать cddb соеденения."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "Не удалось выполнить запрос к базе CDDB сервера"
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "Не удалось выполнить запрос к базе CDDB сервера: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
-msgstr ""
+msgstr "Не удалось прочитать cddb информацию: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Привод пуст."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Неподдерживаемый тип диска."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Воспроизвести CD-диск"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Добавить CD-диск"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Пункты меню Audio CD"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Сжатие"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Центр громкости:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Динамический диапазон:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Сжатие динамического Диапазона Плагин для Audacious\n"
+"Авторство 2010-2012 Джон Линдгрен"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Компрессор широкого диапозона"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Декодер звука игровой консоли"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Основной"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Воспроизведение"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Бас:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "секунд"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Высокие:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Длительность композиции по умолчанию:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Преобразование частоты"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Включить преобразование"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Преобразование частоты:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Гц"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Игнорировать длительность из тегов SPC"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Увеличить реверберацию"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "Длительность дорожки по умолчанию, заданная в секундах, используется для записей, у которых отсутствуют данные о длительности (например, бесконечные дорожки)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Длительность дорожки по умолчанию, заданная в секундах, используется для "
+"записей, у которых отсутствуют данные о длительности (например, бесконечные "
+"дорожки)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1140,87 +1267,108 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Модуль поддержки звука игровых консолей основан на движке Game_Music_Emu "
+"0.5.2\n"
+"Поддерживаемые форматы: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, "
+"VGZ\n"
+"Audacious plugin by:⏎\n"
+"William Pitcock <nenolod@dereferenced.org>⏎\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "Кроссфэйдер столкнулся с ошибкой, потому что песня имеет другое количество каналов. Вы можете использовать микшер каналов, чтобы конвертировать песню в то же количество каналов."
+msgstr ""
+"Кроссфэйдер столкнулся с ошибкой, потому что песня имеет другое количество "
+"каналов. Вы можете использовать микшер каналов, чтобы конвертировать песню "
+"в то же количество каналов."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Кроссфэйдер столкнулся с ошибкой, потому что песня имеет другую частоту дискретизации. Вы можете использовать конвертер частоты дискретизации для конвертирования песни в ту же частоту."
+msgstr ""
+"Кроссфэйдер столкнулся с ошибкой, потому что песня имеет другую частоту "
+"дискретизации. Вы можете использовать конвертер частоты дискретизации для "
+"конвертирования песни в ту же частоту."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Плагин перекрестного затухания для Audacious⏎\n"
+"Авторство 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Плавный переход"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Перекрытие:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Плавный переход"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Интенсивность:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Плагин Cue листов"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Эхо"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Задержка:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "мс"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Обратная связь:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Громкость:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
+"Модуль Эхо\n"
+"Автор Johan Levin, 1999.\n"
+"\n"
+"Объёмное эхо добавил Carl van Schaik 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Эхо"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1229,8 +1377,14 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
+"Мульти-формат плагина аудио-декодера для Audacious\n"
+" основан на FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Авторы плагина для Audacious:\n"
+" William Pitcock <nenolod@nenolod.net>,\n"
+" Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Плагин FFmpeg"
 
@@ -1299,6 +1453,21 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 msgstr ""
+"Это свободная программа; вы можете повторно распространять ее и/или "
+"модифицировать\n"
+"его в соответствии с условиями GNU General Public License, опубликованной\n"
+"Free Software Foundation; либо версии 2 Лицензии, либо\n"
+"(по вашему выбору) любой более поздней версии.\n"
+"\n"
+"Эта программа распространяется в надежде, что она будет полезной,\n"
+"но БЕЗ всякой ГАРАНТИИ; даже без подразумеваемых гарантий\n"
+"Коммерческой ценности или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. См.\n"
+"GNU General Public License for more details.\n"
+"\n"
+"Вы должны были получить копию лицензии GNU General Public License\n"
+"вместе с этой программой; если нет, напишите в Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"США."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1312,11 +1481,13 @@
 msgid "Joint Stereo"
 msgstr "Объединённое стерео"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Моно"
 
@@ -1364,7 +1535,7 @@
 msgid "Error protection"
 msgstr "Защита от ошибок"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Качество"
 
@@ -1444,429 +1615,501 @@
 msgid "Tags"
 msgstr "Теги"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Настройка кодека Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Уровень качества (0 – 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "lossless"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
+"Оригинальный код написал\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Декодер FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
+"GIO Плагин для Audacious⏎\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Плагин GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL Спектральный Анализатор для Audacious⏎\n"
+"Copyright 2013 Christophe Budé and John Lindgren⏎\n"
+"⏎\n"
+"Основан на XMMS плагине:⏎\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies⏎\n"
+"⏎\n"
+"License: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL Спектральный Анализатор"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
+"Модуль \"Горячие клавиши\" для Gnome\n"
+"Управление проигрывателем при помощи \"горячих\n"
+"клавиш\", указанных в настройках Gnome.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Горячие клавиши Gnome"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Номер записи"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Название"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Год"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Альбом"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Дорожка"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Положение в очереди"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Длительность"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Путь к файлу"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Задать название"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Битрейт"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Выбор столбцов"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Доступно:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Выбрано:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Прикрепить слева"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Прикрепить справа"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Прикрепить наверху"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Прикрепить внизу"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Открепить"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Отключить"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Открыть файлы ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Открыть _URL ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Добавить файлы ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Добавить U_RL ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Поисковая библиотека"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "О_ программе ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Настройка ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Выход"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Воспроизведение"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Пауз_а"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Стоп"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "Пре_дыдущий"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Следующий"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "_Повтор"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "В_разброс"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "Н_е передвигаться по списку"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Остановить _после этой песни"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Остановка после етой песни"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "Информация о _песне"
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Перейти ко _времени ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "_Перейти к песне ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "По _номеру трека"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Повтор установки _A"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Повтор установки _B"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "_Повтор чистых пунктов"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "По _названию"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "По _Имени"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "Путь к файлу"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "По _номеру трека"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "По _исполнителю"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "По а_льбому"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "По Альбому"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "По _дате выпуска"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "По _Длинне"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "По расположению _файла"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "По _заданному названию файла"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "В _обратном порядке"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "В _случайном порядке"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Воспроизвести этот список"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "Обновить"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Убрать _недоступные файлы"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Сортировать"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Сортировать выбранные"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Удалить _Дубликаты"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Убрать _недоступные файлы"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Новый"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Пере_именовать"
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "Закрыть"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Импортировать ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Экспортировать ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "_Управление списками..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "_Управление очередью ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "Увеличить громкость"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "Уменьшить громкость"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Эквалайзер"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "Э_ффекты"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Интерфейс"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Визуализация"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Показывать _панель меню"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Показывать п_анель информации"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Показывать Info Bar Vis_ualization"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Показывать _строку состояния"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Показать _Оставшееся время"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Показывать _кнопки закрытия"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Показывать заголовки _столбцов"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Показывать _столбцы"
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Прокручивать при смене песни"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Воспроизведение"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "С_писок"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Службы"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Вывод"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Вид"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Элемент очереди"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "_Вырезать"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Копировать"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "_Вставить"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Выбрать _всё"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "Пере_именовать..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Интерфейс GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Буферизация ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1874,113 +2117,125 @@
 msgstr[1] "%d канала"
 msgstr[2] "%d каналов"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d кбит/с"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr "Предыдущая дорожка"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Воспроизвести"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Пауза/Продолжить"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Остановить"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "Следующая дорожка"
 
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "Перемотать вперёд на 5 сек"
+
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
+msgstr "Перемотать назад на 5 сек"
+
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Перемотать вперёд на 5 сек."
+msgid "Mute"
+msgstr "Приглушить"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Перемотать назад на 5 сек."
+msgid "Volume up"
+msgstr "Увеличить громкость"
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Приглушить"
+msgid "Volume down"
+msgstr "Уменьшить громкость"
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Громче"
+msgid "Jump to file"
+msgstr "Перейти к файлу"
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Тише"
+msgid "Toggle player window(s)"
+msgstr "Переключить состояние окон проигрывателя"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Перейти к файлу"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Отобразить экранное сообщение (OSD)"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Переключить состояние окон проигрывателя"
+msgid "Toggle repeat"
+msgstr "Повтор"
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Отобразить экранное сообщение (OSD)"
+msgid "Toggle shuffle"
+msgstr "Перетасовка"
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Переключить на повтор"
+msgid "Toggle stop after current"
+msgstr "Остановить после текущего"
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Переключить на расброс"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr "Поднять окна проигрывателя"
+msgid "Raise player window(s)"
+msgstr "Поднять окно(а) плеера"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(нет)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Не рекомендуется делать привязки к основным кнопкам мыши без клавиш-модификаторов.\n\nПродолжить?"
+msgstr ""
+"Не рекомендуется делать привязки к основным кнопкам мыши без клавиш-"
+"модификаторов.\n"
+"\n"
+"Продолжить?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Привязки к кнопкам мыши"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Параметры модуля Глобальные \"горячие клавиши\""
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Нажмите комбинацию клавиш в текстовом поле.\nМожно также сделать привязки к кнопкам мыши."
+msgstr ""
+"Нажмите комбинацию клавиш в текстовом поле.\n"
+"Можно также сделать привязки к кнопкам мыши."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Горячие клавиши:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Действие:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Привязка клавиш:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1994,103 +2249,129 @@
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
+"Модуль Глобальные \"горячие клавиши\"\n"
+"Управление проигрывателем при помощи сочетаний клавиш\n"
+"или специальных клавиш мультимедийных клавиатур.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"В разработке принимали участие:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>\n"
+"\t\t\tBryn Davies <curious@ihug.com.au>\n"
+"\t\t\tJonathan A. Davis <davis@jdhouse.org>\n"
+"\t\t\tJeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Глобальные горячие клавиши"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
+"Основан на xmms-jack, by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Портирован в Audacious Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "Вывод JACK"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s Настройки"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Настройки хоста LADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Путь к модулям:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Если путей несколько, разделяйте их двоеточием.\nПоиск осуществляется по указанным путям и переменной LADSPA_PATH.\nУказав пути, нажмите Enter для поиска новых плагинов."
+msgstr ""
+"Если путей несколько, разделяйте их двоеточием.\n"
+"Поиск осуществляется по указанным путям и переменной LADSPA_PATH.\n"
+"Указав пути, нажмите Enter для поиска новых плагинов."
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Доступные плагины:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Включить"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Включенные плагины"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Настройки"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
+"LADSPA Хост для Audacious\n"
+"Авторство 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "Сервер LADSPA"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: не могу инициализировать поддержу LIRC\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: не могу прочесть конфигурационный файл LIRC\n%s: пожалуйста прочтите документацию к LIRC\n%s: как создать правильный конфигурационный файл\n"
+msgstr ""
+"%s: не могу прочесть конфигурационный файл LIRC\n"
+"%s: пожалуйста прочтите документацию к LIRC\n"
+"%s: как создать правильный конфигурационный файл\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: пытаюсь переподключиться...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: неизвестная команда \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: отключен от LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: переподключаться каждые %d секунд...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2105,68 +2386,81 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
+"Простой плагин для управления Дерзкий, используя LIRC демон дистанционного "
+"управления\n"
+"\n"
+"Адаптирован для Audacious:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Основан на XMMS LIRC плагине:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Больше инфромации про LIRC, смотрите http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Подключение"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Переподключиться к LIRC серверу"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Ждать перед переподключением:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "Плагин LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Текст песни недоступен"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Не удалось получить %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Не удалось проанализировать %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Поиск текста песни ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Метаданные песни отсутствуют"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Устанавливаю соединение с lyrics.wikia.com ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "Плагин LyricWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "Списки воспроизведения M3U"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Тактовый генератор: %d тактов/с"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Тактовый генератор: %d уд/мин %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2174,85 +2468,237 @@
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
+"Тактовый генератор Martin Strauss <mys@faveve.uni-stuttgart.de>⏎\n"
+"\n"
+"Чтобы использовать его, добавить URL: tact://beats*num/den\n"
+"например tact://77 to play 77 beats per minute\n"
+"или tact://60*3/4 to play 60 bpm in 3/4 tacts"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Генератор тактов"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"Плагин смешивания каналов Audacious\n"
+"Авторство 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Микшер каналов"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Каналов на выходе:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Микшер каналов"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Плагин MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Разрешение"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-бит"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-бит"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Каналы"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Передискретизация"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Ближайший (самый быстрый)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Линейный (быстрый)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Сплайн (хороший)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Многофазный (лучший)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Частота дискретизации"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 кГц:"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 кГц:"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 кГц:"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 кГц:"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Уровень:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Отключение:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Реверберация"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Усиление басов"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Окружение"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Предусилитель"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Разное"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Перекрытие"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Шумоподавление"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Воспроизвести модификацию Amiga"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Повторить"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Счетчик повторений:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Повторять всегда, задать число повторов до -1."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (модульный плеер)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Объёмное звучание"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "Плагин MPG123"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "Сервер MPRIS 2"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Плагин Neon HTTP/HTTPS"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Остановлен"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious ничего не воспроизводит."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
-"\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr ""
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Плагин уведомлений рабочего стола для Audacious\n"
+"Авторство (C) 2010 Maximilian Bogner⏎\n"
+"Авторство (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Этот плагин является свободным программным обеспечением, вы можете "
+"распространять его или модифицировать его в соответствии с Общественной "
+"Лицензии GNU , опубликованной Free Software Foundation; либо 3 версию "
+"Лицензии, либо (по вашему выбору) любой более поздней версии.\n"
+"\n"
+"Вы должны были получить копию стандартной Общественной Лицензии GNU вместе с "
+"этой программой. Если нет,смотрите <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Показать кнопки управления воспроизведением"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Всегда показывать уведомления"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Всплывающие сообщения"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Показать"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Пауза"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Следующая дорожка"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Устройство по умолчанию"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Звуковое устройство:"
 
@@ -2277,22 +2723,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
+"OSS4 Плагин вывода для Audacious\n"
+"Авторство 2010-2012 Michał Lipski\n"
+"\n"
+"Я хочу поблагодарить тех людей #audacious, особенно Тони Vroon и Джон "
+"Линдгрен и, конечно же авторов предыдущих OSS плагин."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "Вывод OSS4"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "Списки воспроизведения PLS"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Декодер OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2311,154 +2763,236 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 msgstr ""
+"Audacious PulseAudio Плагин вывода\n"
+"\n"
+" \n"
+"Это свободная программа; вы можете повторно распространять ее и/или "
+"модифицировать\n"
+"его в соответствии с условиями GNU General Public License, опубликованной\n"
+"Free Software Foundation; либо версии 2 Лицензии, либо\n"
+"(по вашему выбору) любой более поздней версии\n"
+"\n"
+"Эта программа распространяется в надежде, что она будет полезной,\n"
+"но БЕЗ всякой ГАРАНТИИ; даже без подразумеваемых гарантий\n"
+"Коммерческой ценности или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. См.\n"
+"GNU General Public License.\n"
+"\n"
+"Вы должны были получить копию лицензии GNU General Public License\n"
+"вместе с этой программой; если нет, напишите в Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"США."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "Вывод PulseAudio"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Конвертер частоты дискретизации Плагин для Audacious\n"
+"Авторство 2010-2012 Джон Линдгрен"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Пропустить/повторить сэмплы"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Линейная интерполяция"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Быстрая sinc интерполяция"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Средняя sinc интерполяция"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Лучшая sinc интерполяция"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Преобразование"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Частота:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Карта частот"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Использвать карту частот"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 кГц:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 кГц:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 кГц:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 кГц:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 кГц:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 кГц:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 кГц:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Конвертер частоты"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Сменить пароль"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "OK. Прослушивание для пользователя: %s"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Отказано в доступе"
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Воспользуйтесь следующей ссылкой чтобы разрешить Audacious отправлять "
+"прослушанные композиции на Last.fm:"
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Оставте это окно открытым и нажмите кнопку \" Запросить разрешение' снова.\n"
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"Не беспокойтесь, список ваших прослушиваний сохраняется на компьютере.\n"
+"Он будет доставлен на Last.fm, как только Audacious получит разрешение это "
+"сделать."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Проблемы с сетью"
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Службы"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "Невозможно подключится к Last.fm. Попробуйте повторить позже"
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Проверка..."
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Имя пользователя:"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "З_апросить разрешение"
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Пароль:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_Отменить разрешение"
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "URL скробблера:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Вы должны разрешить Audacious отправлять прослушанные дорожки в ваш аккаунт "
+"Last.fm\n"
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Плагин scrobbler не может быть запущен.\n"
+"Могут быть проблемы с установкой"
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Авторство © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Спасибо Джону Линдгрен что подал мне руку в начале этого проекта.\n"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Скробблер"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Скробблер 2.0"
 
-#: src/sdlout/plugin.c:27
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious теперь использует усовершенствованную версию модуля Last.fm "
+"Scrobbler"
+
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+" \n"
+"SDL модуль Вывода для Audacious\n"
+"Авторство 2010 Джон Линдгрен"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "Вывод SDL"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Библиотека"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
-msgstr "Неизвастный исполнитель"
+msgstr "Неизвестный исполнитель"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Неизвестный альбом"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\nот %s до %s"
+msgstr ""
+"%s\n"
+"от %s до %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
@@ -2466,7 +3000,7 @@
 msgstr[1] "%d альбомы"
 msgstr[2] "%d альбомы"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2474,11 +3008,17 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d песня"
-msgstr[1] "%s\n %s, %d песни"
-msgstr[2] "%s\n %s, %d песни"
+msgstr[0] ""
+"%s\n"
+" %s, %d песня"
+msgstr[1] ""
+"%s\n"
+" %s, %d песни"
+msgstr[2] ""
+"%s\n"
+" %s, %d песни"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2486,77 +3026,85 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d песня до %s"
-msgstr[1] "%s\n %d песни до %s"
-msgstr[2] "%s\n %d песни до %s"
+msgstr[0] ""
+"%s\n"
+" %d песня до %s"
+msgstr[1] ""
+"%s\n"
+" %d песни до %s"
+msgstr[2] ""
+"%s\n"
+" %d песни до %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Создать список воспроизведения"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Добавить в список воспроизведения"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Поиск в библиотеке"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Для импорта музыки в библиотеку Audacious, выберите каталог, затем нажмите иконку \"обновить\"."
+msgstr ""
+"Для импорта музыки в библиотеку Audacious выберите каталог, затем нажмите "
+"иконку \"обновить\"."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Пожалуйста, подождите ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Выберите каталог"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Поиск"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Интерфейс классического Winamp"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "Проигрыватель:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Выберите шрифт основного окна проигрывателя:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "Список воспроизведения:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Выберите шрифт списка воспроизведения:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "Шрифты"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Использовать растровые шрифты (поддерживает только ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Прокручивать название песни в обоих направлениях"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "Стиль"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Настройки интерфейса"
 
@@ -2612,7 +3160,7 @@
 msgid "Presets"
 msgstr "Предустановки"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Загрузить предустановку"
 
@@ -2625,759 +3173,779 @@
 msgid "Load equalizer preset"
 msgstr "Загрузить предустановки эквалайзера"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Сохранить предустановки"
 
 #: src/skins/ui_equalizer.c:1087
 msgid "Save auto-preset"
-msgstr "Сохранить авто-установки"
+msgstr "Сохранить автоустановки"
 
 #: src/skins/ui_equalizer.c:1118 src/skins/ui_equalizer.c:1154
 msgid "Save equalizer preset"
 msgstr "Сохранить установки эквалайзера"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Удалить предустановку"
 
 #: src/skins/ui_equalizer.c:1190
 msgid "Delete auto-preset"
-msgstr "Удалить авто-установки"
+msgstr "Удалить автоустановки"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "кбит/с"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "кГц"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Переход к %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Громкость: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Баланс: %d%% влево"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Баланс: по центру"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Баланс: %d%% вправо"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Меню параметров"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Отключить \"Поверх всех окон\""
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Включить \"Поверх всех окон\""
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Информация о файле"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Меню визуализации"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
-msgstr "Одиночный режим."
+msgstr "Одиночный режим"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
-msgstr "Режим списка воспроизведения."
+msgstr "Режим списка воспроизведения"
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
-msgstr "Остановить после дорожки."
+msgstr "Остановить после дорожки"
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
-msgstr "Не останавливать после дорожки."
+msgstr "Не останавливать после дорожки"
+
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Повторить установки A"
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Повторить установки B"
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Повторить очищенные пункты"
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Автопрокрутка названия дорожки"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Остановить после текущей дорожки"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Пики"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Повтор"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Случайно"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Без движения по списку воспроизведения"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Отобразить проигрыватель"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Отобразить редактор списка воспроизведения"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Отобразить эквалайзер"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Поверх всех окон"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Разместить на всех рабочих столах"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Свернуть проигрыватель"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Свернуть список воспроизведения"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Свернуть эквалайзер"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Анализатор"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Осциллограмма"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Отпечаток голоса"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Выкл."
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Обычный"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Огонь"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Вертикальные линии"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Линии"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Полоски"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Точечная осциллограмма"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Линейная осциллограмма"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Непрерывная осциллограмма"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Лёд"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Сглаженный"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Очень медленно"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Медленно"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Средне"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Быстро"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Очень быстро"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Прошедшее время"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Оставшееся время"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Пауза"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Предыдущая дорожка"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Следующая дорожка"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Визуализация"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Режим визуализации"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Анализатор"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Осциллограмма"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Отпечаток голоса"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Режим WindowShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Падение анализатора"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Падение пиков"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Список воспроизведения"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Воспроизвести список"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Новый список воспроизведения"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Выбрать следующий список"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Выбрать предыдущий список"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Удалить список воспроизведения"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Импортировать список воспроизведения"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
-msgstr "Загрузить список воспроизведения из файла в выбранный список."
+msgstr "Загрузить список воспроизведения из файла в выбранный список"
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Экспортировать список воспроизведения"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
-msgstr "Сохранить выбранный список воспроизведения."
+msgstr "Сохранить выбранный список воспроизведения"
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Обновить список"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
-msgstr "Обновить метаданные и соотнести их с записями списка воспроизведения."
+msgstr "Обновить метаданные и соотнести их с записями списка воспроизведения"
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Управление списком"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Управление очередью"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Вид"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Настройка интерфейса ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Добавить адрес..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
-msgstr "Добавить звуковой поток из сети в список воспроизведения."
+msgstr "Добавить звуковой поток из сети в список воспроизведения"
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Добавить файлы..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
-msgstr "Добавить файлы в список воспроизведения."
+msgstr "Добавить файлы в список воспроизведения"
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Найти и выбрать"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Найти в списке воспроизведения и отметить записи, соответствующие заданному критерию."
+msgstr ""
+"Найти в списке воспроизведения и отметить записи, соответствующие заданному "
+"критерию"
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Инвертировать выбор"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
-msgstr "Снять выделение с отмеченных пунктов и пометить не отмеченные."
+msgstr "Снять выделение с отмеченных пунктов и пометить не отмеченные"
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Выбрать все"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
-msgstr "Выбрать все записи списка воспроизведения."
+msgstr "Выбрать все записи списка воспроизведения"
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Снять выделение"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
-msgstr "Снять выделение с ранее выделенных записей."
+msgstr "Снять выделение с ранее выделенных записей"
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Удалить все"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
-msgstr "Удалить все записи из списка воспроизведения."
+msgstr "Удалить все записи из списка воспроизведения"
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Очистить очередь"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
-msgstr "Очистить очередь, связанную с этим списком воспроизведения."
+msgstr "Очистить очередь, связанную с этим списком воспроизведения"
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Удалить недоступные файлы"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
-msgstr "Удалить недоступные файлы из списка воспроизведения."
+msgstr "Удалить недоступные файлы из списка воспроизведения"
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Удалить дубликаты"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "По названию"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
-msgstr "Удалить из списка воспроизведения дублирующиеся записи с одинаковым названием."
+msgstr ""
+"Удалить из списка воспроизведения дублирующиеся записи с одинаковым названием"
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "По имени файла"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr "Удалить из списка воспроизведения дублирующиеся записи с одинаковыми именами файлов."
+msgstr ""
+"Удалить из списка воспроизведения дублирующиеся записи с одинаковыми именами "
+"файлов"
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "По пути и имени файла"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Удалить из списка воспроизведения дублирующиеся записи, имеющие одинаковый абсолютный путь."
+msgstr ""
+"Удалить из списка воспроизведения дублирующиеся записи, имеющие одинаковый "
+"абсолютный путь"
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Удалить не отмеченные"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
-msgstr "Удалить из списка воспроизведения не выделенные записи."
+msgstr "Удалить из списка воспроизведения не выделенные записи"
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Удалить выбранные"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
-msgstr "Удалить из списка воспроизведения выделенные записи."
+msgstr "Удалить из списка воспроизведения выделенные записи"
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Сортировать в случайном порядке"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
-msgstr "Сортировать записи в списке воспроизведения в случайном порядке."
+msgstr "Сортировать записи в списке воспроизведения в случайном порядке"
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "В обратном порядке"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
-msgstr "Обратить порядок записей в списке воспроизведения на противоположный."
+msgstr "Обратить порядок записей в списке воспроизведения на противоположный"
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Сортировать список"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
-msgstr "Сортировать список воспроизведения по названию."
+msgstr "Сортировать список воспроизведения по названию"
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "По альбому"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
-msgstr "Сортировать список воспроизведения по альбому."
+msgstr "Сортировать список воспроизведения по альбому"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "По исполнителю"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
-msgstr "Сортировать список воспроизведения по исполнителю."
+msgstr "Сортировать список воспроизведения по исполнителю"
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
-msgstr "Сортировать список воспроизведения по имени файла."
+msgstr "Сортировать список воспроизведения по имени файла"
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
-msgstr "Сортировать список воспроизведения по абсолютному пути к файлу."
+msgstr "Сортировать список воспроизведения по абсолютному пути к файлу"
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "По дате"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
-msgstr "Сортировать список воспроизведения по дате изменения."
+msgstr "Сортировать список воспроизведения по дате изменения"
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "По номеру дорожки"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
-msgstr "Сортировать список воспроизведения по номеру дорожки."
+msgstr "Сортировать список воспроизведения по номеру дорожки"
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Сортировать выбранные"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Файл"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Службы модулей"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Информация о дорожке"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
-msgstr "Просмотреть информацию о дорожке."
+msgstr "Просмотреть информацию о дорожке"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Об Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Воспроизвести файл"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Загрузить и воспроизвести файл"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Воспроизвести из адреса"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
-msgstr "Воспроизвести аудиоданные из выбранного места."
+msgstr "Воспроизвести аудиоданные из выбранного места"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Службы модулей"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Параметры"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Открыть окно параметров"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Закрыть Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Установить A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Очистить A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Перейти к файлу"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Перейти к указанному времени"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Показать/скрыть очередь"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
-msgstr "Включить или отключить очерёдность записей в списке воспроизведения."
+msgstr "Включить или отключить очерёдность записей в списке воспроизведения"
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Вставить"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Загрузить"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Импорт"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Сохранить"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Предустановка"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Автоматически загружаемая предустановка"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Загрузить автоматически загружаемую предустановку"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Загрузить в эквалайзер предустановку по умолчанию"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Нулевой уровень"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Сбросить установки эквалайзера в нулевой уровень"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Из файла"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Загрузить предустановку из файла"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Из EQF файла WinAMP'a"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Загрузить предустановки из EQF файла WinAMP'a"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Предустановки WinAMP'a"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Импортировать предустановки WinAMP'a"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Сохранить автозагружаемые предустановки"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Сохранить предустановки по умолчанию"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "В файл"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Сохранить предустановки в файл"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "В файл EQF WinAMP'a"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Сохранить предустановки в файл EQF WinAMP'a"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Удалить автозагружаемую предустановку"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Поиск записей в активном списке воспроизведения"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Выберите записи в списке воспроизведения путём заполнения одного или нескольких полей. В полях используется написание регулярных выражений, не чувствительное к регистру. Если вы не знаете, как работают регулярные выражения, просто вставьте часть букв из слова, которые хотите найти."
+msgstr ""
+"Выберите записи в списке воспроизведения, заполнив соответствующие поля. В "
+"полях используется написание регулярных выражений, не чувствительное к "
+"регистру. Если вы не знаете, как работают регулярные выражения, просто "
+"вставьте часть букв из слова, которые хотите найти."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Название: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Альбом: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Исполнитель: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Имя файла: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Очистить предыдущий выбор до начала поиска"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Автоматически переключать поочерёдно на соответствующим записям"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Создать новый список воспроизведения с соответствующими записями"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Редактор списков воспроизведения Audacious"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d из %d)"
@@ -3395,81 +3963,124 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Невозможно создать каталог (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
-"\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Based on the xmms_sndfile plugin:⏎\n"
+"Авторство (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Адаптация для Audacious Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"Это свободная программа; вы можете повторно распространять или "
+"модифицировать её в соответствии с условиями GNU General Public License, "
+"опубликованной Free Software Foundation, либо версии 2 Лицензии, либо (по "
+"вашему выбору) любой более поздней версии.\n"
+"\n"
+"Эта программа распространяется в надежде, что она будет полезной, но БЕЗ "
+"КАКИХ-ЛИБО ГАРАНТИЙ, даже без подразумеваемых гарантий коммерческой ценности "
+"или ПРИГОДНОСТИ ДЛЯ КОНКРЕТНОЙ ЦЕЛИ. Узнайте подробности в GNU General "
+"Public License.\n"
+"\n"
+"Вы должны были получить копию GNU General Public License вместе с этой "
+"программой; если этого не произошло, напишите во Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Плагин Sndfile"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "О плагине вывода Sndio"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Плагин вывода Sndio\n\nАвтор — Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Плагин вывода Sndio\n"
+"\n"
+"Автор — Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Формат не поддерживается"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Формат не поддерживается запрошенным звуковым устройством.\n\nПопробуйте ещё раз, запустив сервер sndiod(1)."
+msgstr ""
+"Формат не поддерживается запрошенным звуковым устройством.\n"
+"\n"
+"Попробуйте ещё раз, запустив сервер sndiod(1)"
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "Устройство sndio"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(пусто означает «по умолчанию»)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "ОК"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Отмена"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Смена дорожки"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
-msgstr "Команда, запускаемая Audacious в начале воспроизведения новой дорожки."
+msgstr "Команда, запускаемая Audacious в начале воспроизведения новой дорожки"
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Команда:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
-msgstr "Команда, запускаемая после окончания дорожки."
+msgstr "Команда, запускаемая после окончания дорожки"
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Команда, запускаемая Audacious при достижении конца списка воспроизведения."
+msgstr ""
+"Команда, запускаемая Audacious при достижении конца списка воспроизведения"
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Команда, запускаемая при изменении названия дорожки (например, при воспроизведении из сети)."
+msgstr ""
+"Команда, запускаемая при изменении названия дорожки (например, при "
+"воспроизведении из сети)"
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3486,35 +4097,81 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Вы можете использовать следующие форматы строк, которые будут заменены перед вызовом команды (не все они полезны для команды окончания списка ). %F: Frequency (in hertz) %c: Number of channels %f: filename (full path) %l: length (in milliseconds) %n or %s: Song name %r: Rate (in bits per second) %t: Playlist position (%02d) %p: Currently playing (1 or 0) %a: Artist %b: Album %T: Track title"
+msgstr ""
+"Вы можете использовать следующие форматы строк, которые будут заменены перед "
+"вызовом команды (не все они полезны для команды окончания списка ). %F: "
+"Frequency (in hertz) %c: Number of channels %f: filename (full path) %l: "
+"length (in milliseconds) %n or %s: Song name %r: Rate (in bits per second) "
+"%t: Playlist position (%02d) %p: Currently playing (1 or 0) %a: Artist %b: "
+"Album %T: Track title"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Параметры, передаваемые оболочке, должны быть заключены в кавычки. В противном случае возможны проблемы с безопасностью."
+msgstr ""
+"Параметры, передаваемые оболочке, должны быть заключены в "
+"кавычки. В противном случае возможны проблемы с безопасностью"
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Команды"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"SoX Ресемплер Плагин для Audacious\n"
+"Авторство 2013 Michał Lipski\n"
+"\n"
+"Основан на плагине конвертора частоты дискретизации:\n"
+"Авторство 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Быстро"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Низкое"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Высокое"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Очень высокое"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Качество:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "SoX Ресемплер"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Скорость и высота"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Скорость:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Высота:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Скорость и высота"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3524,64 +4181,74 @@
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Модуль Статус\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Этот модуль отображает значок программы\n"
+"в системном лотке"
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Действие прокрутки мыши"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Изменить громкость"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Сменить текущую дорожку"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Другие настройки"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Отключить всплывающее окно"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Закрыть в системный трей"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Продвигаться по списку воспроизведения при прокрутке колёсика"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Иконка статуса"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
+"Модуль Дополнительное стерео\n"
+"\n"
+"Johan Levin 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Расширенное стерео"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Расширенное стерео"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Генератор сигналов: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3589,28 +4256,38 @@
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
+"Генератор синусоидальных сигналов, Haavard Kvaalen <havardk@xmms.org>\n"
+"Изменения, Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Чтобы использовать его, добавьте в проигрыватель следующий адрес: tone://"
+"частота1;частота2;частота3;...\n"
+"Например, tone://2000;2005 для воспроизведения сигналов 2000 Гц и 2005 Гц"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Генератор тона"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
+"Файл I/O плагин для Audacious\n"
+"Авторство 2009-2012 John Lindgren\n"
+"\n"
+"ЭТОТ ПЛАГИН ЯВЛЯЕТСЯ ОБЯЗАТЕЛЬНЫМ. НЕ ОТКЛЮЧАЙТЕ ЕГО."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Плагин файлового ввода-вывода"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Удаление вокала"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3630,45 +4307,72 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"Модуль Ogg Vorbis от Xiph.org Foundation\n"
+"\n"
+"Начальный код был написан\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"Вклад внесли\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Haavard Kvaalen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>\n"
+"\n"
+"Посетите сайт Xiph.org Foundation по адресу http://www.xiph.org/"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Декодер Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
+"Проигрыватель файлов Vortex от Sashnov Alexander <sashnov@ngs.ru>\n"
+"Основан на коде in_vtx.dll от Roman Sherbakov <v_soft@microfor.ru>\n"
+"Реализацию для Audacious выполнил Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Декодер VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "lossy (hybrid)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "lossy"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
+"Авторство 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Некоторый код плагина Miles Egan"
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Декодер WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Декодер 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XSPF"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - выбор файла"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Сортировать Выделенное"

audacious-plugins-3.4.2.tar.bz2/po/si.po Added

@@ -0,0 +1,4305 @@
+# Sinhala translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# ashintha89 <ashintha@gmail.com>, 2013
+# D.N.Perera <deen.niro@gmail.com>, 2013
+# P.I.Balasinghe <pushpika.indrachapa@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins Plugins Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-06-03 17:20+0000\n"
+"Last-Translator: ashintha89 <ashintha@gmail.com>\n"
+"Language-Team: Sinhala (http://www.transifex.com/projects/p/audacious/"
+"language/si/)\n"
+"Language: si\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
+msgid "mono"
+msgstr " තනි "
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
+msgid "stereo"
+msgstr "ත්‍රිමාන "
+
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
+msgid "surround"
+msgstr "සිසාළ "
+
+#: src/aac/libmp4.c:930
+msgid "AAC Decoder"
+msgstr "AAC විකේතකය"
+
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
+msgid "sequenced"
+msgstr "අනුපිළිවෙළ"
+
+#: src/adplug/plugin.c:14
+msgid "AdPlug (AdLib Player)"
+msgstr "Adකෙවෙනිය (AdLib ධාවකය)"
+
+#: src/alarm/alarm.c:809
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr ""
+"කිසියම් වෙලාවකදී ධාවනය කිරීමට යොදාගත හැකි පේනු මෘදුකාංගයක්.⏎\n"
+"⏎\n"
+"මුලින් ලියන ලද්දේ ඇඩම් ෆීකින් සහ ඩැනියෙල් ස්ටොඩ්ඩන් විසිනි."
+
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
+msgid "Alarm"
+msgstr "සිහි කැඳවීම"
+
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"කාලය\n"
+"සංඥාව කරන්න:\n"
+"සංඥා කල යුතු කාලය.\n"
+"\n"
+"ඉවත්වන්න පසුව:\n"
+"මෙම කාලයෙන් පසුව සංඥාව නවත්වන්න.\n"
+"(අවධි සංවාද කොටුව පෙන්වන්න)\n"
+"\n"
+"\n"
+"දින\n"
+"දිනය:\n"
+"සංඥා කිරීම සක්‍රිය කරන දින වරණය කරන්න.\n"
+"\n"
+"කාලය\n"
+"දිනපතා සංඥා කරන කාලය තෝරන්න,\n"
+"හෝ පුරුදු යොදාගැනීමට ටොගල බොත්තම වරණය කරන්න\n"
+"කාලය.\n"
+"\n"
+"\n"
+
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"ශබ්දය \n"
+"හායනය:\n"
+"ශබ්දය තොරණ ලද ශබ්දය තෙක් හායනය කරන්න \n"
+"මෙම කාල මට්ටමට.\n"
+"\n"
+"ආරම්භ කල:\n"
+"හායනය මෙම ශබ්ද මට්ටමේ සිට ආරම්භ කරන්න.\n"
+"\n"
+"අවසානය:\n"
+"හායනය අවසන් කල යුතු ශබ්දය. හායන වෙලාව 0 නම් ශබ්දය මෙම මට්ටමේ තබා ධාවනය ආරම්භ කරන්න.\n"
+"\n"
+"\n"
+"විකල්ප:\n"
+"වැඩිපුර විධාන:\n"
+"මෙම විධාන සිහිගන්වීමේ වෙලාවේදී ධාවනය කරන්න.\n"
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+"ධාවන ලැයිස්තුව\n"
+"මෙම ධාවන ලැයිස්තුව ප්‍රවේශනය කරන්න. ධාවන ලැයිස්තුවක් නොමැතිනම්\n"
+"ලබා දී ඇත, පවත්නා දෙය යොදා ගනු ලැබේ.\n"
+"mp3/ogg දහරක URL\n"
+"මෙහි ඇතුල් කල හැක.\n"
+"\n"
+"සිහි කැදවුම:\n"
+"සංඥා කිරීම අවසන් වූ පසු සිහි කැදවුමක් පෙන්වන්න\n"
+"කොටුව තුල සිහි කැදවුම ටයිප් කරන්න සහ ඔබට එය පෙන්වීමට\n"
+"අවශ්‍ය නම් ටොගල බොත්තම සක්‍රිය කරන්න "
+
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "මේ ඔබගේ සිහි කැඳවීමේ ඇමතුමයි."
+
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "ඔබගේ අද දවසේ මතක් කිරීම වන්නේ..."
+
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "මතක් කිරීම"
+
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "සඳුදා"
+
+#: src/alarm/interface.c:140
+msgid "Tuesday"
+msgstr "අඟහරුවාදා"
+
+#: src/alarm/interface.c:140
+msgid "Wednesday"
+msgstr "බදාදා"
+
+#: src/alarm/interface.c:141
+msgid "Thursday"
+msgstr "බ්‍රහස්පතින්දා"
+
+#: src/alarm/interface.c:141
+msgid "Friday"
+msgstr "සිකුරාදා"
+
+#: src/alarm/interface.c:141
+msgid "Saturday"
+msgstr "සෙනසුරාදා"
+
+#: src/alarm/interface.c:141
+msgid "Sunday"
+msgstr "ඉරිදා"
+
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "සිහි කැඳවීම් සකසනයන්"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "වෙලාව"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "සිහිකැඳවීම (පෙරනිමිය)"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "පැ"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "පසු නිහඬවන්න:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "පැය"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "මිනිත්තු"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "සිහි කැඳවීම් ලැබිය යුතු දිනයන් තෝරන්න"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "දවස"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "පෙරනිමිය"
+
+#: src/alarm/interface.c:310
+msgid "Days"
+msgstr "දවස්"
+
+#: src/alarm/interface.c:319
+msgid "Fading"
+msgstr "හායනය"
+
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
+msgid "seconds"
+msgstr "තප්පර"
+
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
+msgid "Volume"
+msgstr "ශබ්ද මට්ටම"
+
+#: src/alarm/interface.c:339
+msgid "Start at"
+msgstr "ආරම්භ කරන්න"
+
+#: src/alarm/interface.c:357
+msgid "Final"
+msgstr "අවසානය"
+
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "දැන්"
+
+#: src/alarm/interface.c:387
+msgid "Additional Command"
+msgstr "අමතර විධාන"
+
+#: src/alarm/interface.c:393
+msgid "enable"
+msgstr "සක්‍රීය"
+
+#: src/alarm/interface.c:400
+msgid "Playlist (optional)"
+msgstr "ධාවනය වන ගොනුව (අමතර)"
+
+#: src/alarm/interface.c:407
+msgid "Select a playlist"
+msgstr "ධාවන ලැයිස්තුවක් තෝරන්න"
+
+#: src/alarm/interface.c:419
+msgid "Use reminder"
+msgstr "මතක් කිරීම භාවිතා කරන්න"
+
+#: src/alarm/interface.c:428
+msgid "Options"
+msgstr "විකල්ප"
+
+#: src/alarm/interface.c:433
+msgid "What do these options mean?"
+msgstr "මොනවාද මේ විකල්පයන්ගෙන් අදහස් වන්නේ?"
+
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
+msgid "Help"
+msgstr "උදව්"
+
+#: src/albumart/albumart.c:143
+msgid "Album Art"
+msgstr "ඇල්බම් කලාව"
+
+#: src/alsa/config.c:212
+msgid "Default PCM device"
+msgstr "පෙරනිමි PCM ආම්පන්නය "
+
+#: src/alsa/config.c:241
+msgid "Default mixer device"
+msgstr "පෙරනිමි මිශ්‍ර කිරීමේ ආම්පන්නය "
+
+#: src/alsa/config.c:428
+msgid "ALSA Output Plugin Preferences"
+msgstr "ALSA ප්‍රතිදාන පේනු මෘදුකාංගයේ වරණයන්"
+
+#: src/alsa/config.c:434
+msgid "PCM device:"
+msgstr "PCM ආම්පන්නය:"
+
+#: src/alsa/config.c:436
+msgid "Mixer device:"
+msgstr "මිශ්‍ර කිරීමේ ආම්පන්නය:"
+
+#: src/alsa/config.c:438
+msgid "Mixer element:"
+msgstr "මිශ්‍ර කිරීමේ මූලද්‍රව්‍ය:"
+
+#: src/alsa/config.c:441
+msgid "Work around drain hangup"
+msgstr "ක්‍රමයෙන් අඩු වී නැවතීමක් පිළිබඳ ක්‍රියා කිරීම"
+
+#: src/alsa/plugin.c:25
+msgid ""
+"ALSA Output Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"ඔඩෙෂස් සඳහා ALSA ප්‍රතිදාන පේනු මෘදුකාංගය\n"
+"ප්‍රකාශන හිමිකම ජෝන් ලින්ඩ්ග්රෙන් 2009-2012\n"
+"මගේ ස්තුතිය ALSA ප්‍රතිදාන පේනු මෘදුකාංගයේ කර්තෘ විලියම් පිට්කොක් වෙත පුදන අතර ඔහුගේ කේතය "
+"ALSA අත්පොත ප්‍රමාණවත් නොවන විට ආදේශකයක් ලෙස භාවිතා කරන ලදී."
+
+#: src/alsa/plugin.c:32
+msgid "ALSA Output"
+msgstr "ALSA ප්‍රතිදානය "
+
+#: src/amidi-plug/amidi-plug.c:248
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr ""
+"MIDI ධාවනය කිරීම සඳහා sequencer ports තෝරා නොමැත. MIDI පේනු මෘදුකාංග වරණයන්හි ඔබට "
+"එය කළ හැක."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-කෙවෙනිය (MIDI ධාවකය)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
+msgid "ALSA Backend "
+msgstr "ALSA පසුපස නිමාව"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"මෙම පසුපස නිමාව MIDI සිදුවීම් පාරිශීලකයන් කණ්ඩායමක් විසින් තෝරාගත් ALSA sequencer ports වෙත "
+"යවනු ලබයි. ALSA sequencerහි අතුරු මුහුණත ඉතා බහු නිපුණයි, එයට ශ්‍රවණ කාඩ්පත් දෘඩාංග (i.e. "
+"emu10k1) මෙන්ම මෘදුකාංග, භාහිර ආම්පන්න සහ තවත් දෑ සංස්ලේෂණය කිරීම සැපයිය හැක.⏎\n"
+"මෙම පසුපස නිමාව ශ්‍රවණ නිපදවීම නොකරනු ලබයි. MIDI සිදුවීම් සෘජුවම පසුපස ඇති ආම්පන්න/මෘදුකාංග "
+"මගින් පාලනය කරනු ලබයි. උදාහරණයක් ලෙස, දෘඩාංග සංස්ලේෂණය සඳහා යවනු ලබන MIDI සිදුවීම් "
+"ධාවනය වේ.⏎\n"
+"පසුපස නිමාව ලියන ලද්දේ ජියාකොමෝ ලොසීටෝ විසිනි."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
+msgid "FluidSynth Backend "
+msgstr "FluidSynth පසුපස නිමාව"
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"මෙම පසු අග MIDI සිද්ධි FluidSynth වෙතට යැවීමෙන් ශ්‍රව්‍ය නිපදවයි, SoundFont2 විශේෂණය මත "
+"පදනම් වූ තථ්‍ය කාල මෘදුකාංග සංශ්ලේෂකය (www.fluidsynth.org).⏎\n"
+"නිපදවූ ශ්‍රව්‍ය ධාවකයේ පේනු මෘදුකාංගයේ බලපෑම මත මෙහයවන අතර එය ක්‍රියාත්මක වන්නේ තෝරාගත් "
+"ප්‍රතිදාන පේනු මෘදුකාංගයක් මගින්ය.⏎\n"
+"පසු අග ලියන ලද්දේ ගිඅකොමෝ ලොසිටෝ විසිනි."
+
+#: src/amidi-plug/i_configure-alsa.c:353
+msgid "Port"
+msgstr "තොට"
+
+#: src/amidi-plug/i_configure-alsa.c:355
+msgid "Client name"
+msgstr "සේවාදායකයේ නම"
+
+#: src/amidi-plug/i_configure-alsa.c:357
+msgid "Port name"
+msgstr "තොටමුණෙහි නම"
+
+#: src/amidi-plug/i_configure-alsa.c:371
+msgid "ALSA output ports"
+msgstr "ALSA ප්‍රතිදාන තොටමුණු"
+
+#: src/amidi-plug/i_configure-alsa.c:432
+msgid "Soundcard: "
+msgstr "ශබ්දපත:"
+
+#: src/amidi-plug/i_configure-alsa.c:434
+msgid "Mixer control: "
+msgstr "මිශ්‍ර කිරීම් පාලනය:"
+
+#: src/amidi-plug/i_configure-alsa.c:444
+msgid "Mixer settings"
+msgstr "මිශ්‍ර කිරීම් සිටුවම්"
+
+#: src/amidi-plug/i_configure-alsa.c:472
+msgid ""
+"ALSA\n"
+"backend"
+msgstr ""
+"ALSA⏎\n"
+"පසුපස නිමාව"
+
+#: src/amidi-plug/i_configure-ap.c:63
+msgid "AMIDI-Plug - backend information"
+msgstr "AMIDI-පේනු - පසුපස නිමාවෙහි තොරතුරු"
+
+#: src/amidi-plug/i_configure-ap.c:221
+msgid "Backend selection"
+msgstr "පසුපස නිමාව තෝරාගැනීම"
+
+#: src/amidi-plug/i_configure-ap.c:261
+msgid "Playback settings"
+msgstr "පිළිවැයීම් සිටුවම්"
+
+#: src/amidi-plug/i_configure-ap.c:266
+msgid "Transpose: "
+msgstr "තැන් මාරුව:"
+
+#: src/amidi-plug/i_configure-ap.c:275
+msgid "Drum shift: "
+msgstr "බෙර මාරුව:"
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "Advanced settings"
+msgstr "වැඩිදුර සිටුවම්"
+
+#: src/amidi-plug/i_configure-ap.c:297
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "ධාවන ලැයිස්තුවෙහි MIDI ගොනු වල කලින් ගණනය කළ දිග"
+
+#: src/amidi-plug/i_configure-ap.c:304
+msgid "extract comments from MIDI file (if available)"
+msgstr "MIDI ගොනු වලින් අදහස් දැක්වීම් උපුටා ගන්න (තිබෙනවා නම්)"
+
+#: src/amidi-plug/i_configure-ap.c:311
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "MIDI ගොනු වලින් පද රචනාවන් උපුටා ගන්න (තිබෙනවා නම්"
+
+#: src/amidi-plug/i_configure-ap.c:344
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr ""
+"AMIDI⏎\n"
+"පේනු"
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug Settings"
+msgstr "AMIDI-පේනු මෘදුකාංග සකසනයන්"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:63
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-පේනු - SoundFont ගොනුව තෝරන්න"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:321
+msgid "SoundFont settings"
+msgstr "SoundFont සිටුවම්"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:359
+msgid "Filename"
+msgstr "ගොනු නම"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:363
+msgid "Size (bytes)"
+msgstr "ප්‍රමාණය (බයිට්ස්)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:412
+msgid "Load SF on player start"
+msgstr "ධාවකය ආරම්භයේදී SF ප්‍රවේශනය කරන්න"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:416
+msgid "Load SF on first MIDI file play"
+msgstr " පළමු MIDI ගොනු ධාවනයට SF ප්‍රවේශනය කරන්න"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:431
+msgid "Synthesizer settings"
+msgstr "Synthesizer සිටුවම්"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:440
+msgid "gain"
+msgstr "ලබා ගන්න"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
+msgid "use default"
+msgstr "පෙරනිමිය භාවිතා කරන්න"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
+msgid "value:"
+msgstr "අගය:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:470
+msgid "polyphony"
+msgstr "බහුතාල නාදය"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:500
+msgid "reverb"
+msgstr "reverb"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
+msgid "yes"
+msgstr "ඔව්"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
+msgid "no"
+msgstr "නැත"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:534
+msgid "chorus"
+msgstr "සමූහ ගායනය"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "sample rate"
+msgstr "නියැදි අනුපාතය"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:574
+msgid "22050 Hz "
+msgstr "22050 හර්ට්ස්"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:577
+msgid "44100 Hz "
+msgstr "44100 හර්ට්ස්"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:580
+msgid "96000 Hz "
+msgstr "96000 හර්ට්ස්"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:583
+msgid "custom "
+msgstr "අභිරුචිය "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:592
+msgid "Hz "
+msgstr "හර්ට්ස්"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:662
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr ""
+"FluidSynth⏎\n"
+"පසුපස නිමාව"
+
+#: src/amidi-plug/i_fileinfo.c:175
+msgid "Name:"
+msgstr "නම:"
+
+#: src/amidi-plug/i_fileinfo.c:200
+msgid " MIDI Info "
+msgstr " MIDI තොරතුරු "
+
+#: src/amidi-plug/i_fileinfo.c:214
+msgid "Format:"
+msgstr "හැඩතලය:"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "Length (msec):"
+msgstr "දිග (මිලි තප්පර):"
+
+#: src/amidi-plug/i_fileinfo.c:220
+msgid "No. of Tracks:"
+msgstr "ඛණ්ඩ ගණන:"
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "variable"
+msgstr "විචල්‍යය"
+
+#: src/amidi-plug/i_fileinfo.c:228
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidi-plug/i_fileinfo.c:236
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidi-plug/i_fileinfo.c:239
+msgid "Time Div:"
+msgstr "කාලය බෙදීම:"
+
+#: src/amidi-plug/i_fileinfo.c:250
+msgid " MIDI Comments and Lyrics "
+msgstr " MIDI අදහස් දැක්වීම් සහ පද රචනයන් "
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no comments available in this MIDI file *"
+msgstr "* මෙම MIDI ගොනුවෙහි අදහස් දැක්වීම් නොමැත *"
+
+#: src/amidi-plug/i_fileinfo.c:314
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* මෙම MIDI ගොනුවෙහි පද රචනා නොමැත *"
+
+#: src/amidi-plug/i_fileinfo.c:367
+msgid " (invalid UTF-8)"
+msgstr "(අවලංගු UTF-8)"
+
+#: src/amidi-plug/i_utils.c:39
+msgid "About AMIDI-Plug"
+msgstr "AMIDI-කෙවෙනිය ගැන "
+
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI-පේනුව "
+
+#: src/amidi-plug/i_utils.c:54
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing"
+msgstr ""
+"\n"
+"මොඩියුල MIDI ගීත ධාවකය \n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"රචනා කරන ලද්දේ Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"විශේෂ ස්තුතිය...\n"
+"Clemens Ladisch සහ Jaroslav Kysela\n"
+"ඔවුන්ගේ වැඩසටහන් වන aplaymidi සහ amixer; ඒවා \n"
+"ඉතා ප්‍රයෝජනවත් විය. එමෙන්ම alsa-lib ලේඛන \n"
+"ALSA API වැඩිදුර ඉගෙන ගැනීමට \n"
+"\n"
+"Alfredo Spadafina\n"
+"හට අලංකාර midi යතුරු පුවරු ලාංඡනය සඳහා \n"
+"\n"
+"Tony Vroon\n"
+"හට ඇල්ෆා පරීක්ෂණ සඳහා සහය දැක්වීම වෙනුවෙන් "
+
+#: src/aosd/aosd.c:29
+msgid "Audacious OSD "
+msgstr "ඔඩෙෂස් OSD"
+
+#: src/aosd/aosd.c:37
+msgid "AOSD (On-Screen Display)"
+msgstr "AOSD (තිරය මත සංදර්ශනය)"
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "ඍජුකෝණාශ්‍රය"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "වටකුරු කොන් සහිත ඍජුකෝණාශ්‍රය"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "අවතල ඍජුකෝණාශ්‍රය"
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "කිසිවක් නැත"
+
+#: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "පිළිවැයීම ආරම්භ කිරීම"
+
+#: src/aosd/aosd_trigger.c:75
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "ධාවන ලැයිස්තු අයිතමයක් ක්‍රියාත්මක වනවිට OSD කියාත්මක කිරීම"
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Title Change"
+msgstr "මාතෘකාව වෙනස්කිරීම"
+
+#: src/aosd/aosd_trigger.c:80
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr ""
+"ධාවනය අතරතුර, ගීත මාතෘකාව වෙනස් වුවද ගොනු නම එයම නම් OSD ක්‍රියාත්මක කිරීම. අන්තර්ජාල "
+"ගලනයන්හි දී මාතෘකාව වෙනස් වීම් පෙන්වීමට මෙය ඉතා ප්‍රයෝජනවත් වේ."
+
+#: src/aosd/aosd_trigger.c:86
+msgid "Pause On"
+msgstr "විරාමය ක්‍රියාත්මකයි"
+
+#: src/aosd/aosd_trigger.c:87
+msgid "Triggers OSD when playback is paused."
+msgstr "පිළිවැයීම් විරාමයේදී OSD ක්‍රියාත්මක කිරීම"
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Pause Off"
+msgstr "විරාමය ක්‍රියාවිරහිතයි"
+
+#: src/aosd/aosd_trigger.c:92
+msgid "Triggers OSD when playback is unpaused."
+msgstr "පිළිවැයීම් විරාමය අවසානයේදී OSD ක්‍රියාත්මක කිරීම"
+
+#: src/aosd/aosd_ui.c:168
+msgid "Placement"
+msgstr "ස්ථාපනය"
+
+#: src/aosd/aosd_ui.c:200
+msgid "Relative X offset:"
+msgstr "සාපේක්ෂ X අනුලම්බය:"
+
+#: src/aosd/aosd_ui.c:207
+msgid "Relative Y offset:"
+msgstr "සාපේක්ෂ Y අනුලම්බය:"
+
+#: src/aosd/aosd_ui.c:214
+msgid "Max OSD width:"
+msgstr "උපරිම OSD පළල:"
+
+#: src/aosd/aosd_ui.c:225
+msgid "Multi-Monitor options"
+msgstr "බහු මොනිටර විකල්ප"
+
+#: src/aosd/aosd_ui.c:229
+msgid "Display OSD using:"
+msgstr "OSD දර්ශනයට භාවිතා කරන්න:"
+
+#: src/aosd/aosd_ui.c:231
+msgid "all monitors"
+msgstr "සියලුම මොනිටර"
+
+#: src/aosd/aosd_ui.c:234
+#, c-format
+msgid "monitor %i"
+msgstr "මොනිටරය %i"
+
+#: src/aosd/aosd_ui.c:287
+msgid "Timing (ms)"
+msgstr "කාල නියමය (මිලි තප්පර)"
+
+#: src/aosd/aosd_ui.c:292
+msgid "Display:"
+msgstr "දර්ශනය:"
+
+#: src/aosd/aosd_ui.c:297
+msgid "Fade in:"
+msgstr "ක්‍රමෝද්දීපනය:"
+
+#: src/aosd/aosd_ui.c:302
+msgid "Fade out:"
+msgstr "ක්‍රමාවදීපනය:"
+
+#: src/aosd/aosd_ui.c:383
+msgid "Fonts"
+msgstr "අකුරු වර්ගය"
+
+#: src/aosd/aosd_ui.c:391
+#, c-format
+msgid "Font %i:"
+msgstr "අකුරු වර්ගය %i:"
+
+#: src/aosd/aosd_ui.c:409
+msgid "Shadow"
+msgstr "සෙවනැල්ල"
+
+#: src/aosd/aosd_ui.c:439
+msgid "Internationalization"
+msgstr "ජාත්‍යන්තරකරණය"
+
+#: src/aosd/aosd_ui.c:445
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "අක්‍ෂර UTF-8 පරිවර්තනය කිරීම ක්‍රියාවිරහිත කිරීම (aosd තුල)"
+
+#: src/aosd/aosd_ui.c:462
+msgid "Select Skin File"
+msgstr "සිවි ගොනුව තෝරන්න"
+
+#: src/aosd/aosd_ui.c:573
+msgid "Render Style"
+msgstr "විදැහුම් අන්දම"
+
+#: src/aosd/aosd_ui.c:589
+msgid "Colors"
+msgstr "පාට"
+
+#: src/aosd/aosd_ui.c:602
+#, c-format
+msgid "Color %i:"
+msgstr "පාට %i:"
+
+#: src/aosd/aosd_ui.c:620
+msgid "Custom Skin"
+msgstr "අභිරුචි සිවිය"
+
+#: src/aosd/aosd_ui.c:626
+msgid "Skin file:"
+msgstr "සිවි ගොනුව:"
+
+#: src/aosd/aosd_ui.c:630
+msgid "Browse"
+msgstr "පිරික්සන්න"
+
+#: src/aosd/aosd_ui.c:729
+msgid "Enable trigger"
+msgstr "ක්‍රියාරම්භකය සක්‍රිය කිරිම"
+
+#: src/aosd/aosd_ui.c:756
+msgid "Event"
+msgstr "සිද්ධිය"
+
+#: src/aosd/aosd_ui.c:784
+msgid "Composite manager detected"
+msgstr "සංයුක්ත කළමනාකාරකය හඳුනා ගන්නා ලදී"
+
+#: src/aosd/aosd_ui.c:791
+msgid ""
+"Composite manager not detected;\n"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"සංයුක්ත කළමනාකාරකය හඳුනා ගෙන නොමැත;\n"
+"දැනටමත් එකක් ධාවනය වෙමින් නොපවතී නම් කරුණාකර සංයුක්ත කළමනාකාරකයක් සක්‍රීය කරන්න. එසේ නැතිනම් "
+"OSD නිසි ලෙස ක්‍රියා නොකරයි"
+
+#: src/aosd/aosd_ui.c:799
+msgid "Composite manager not required for fake transparency"
+msgstr "ව්‍යාජ විනිවිද පෙනීම සඳහා සංයුක්ත කළමනාකාරකය අවශ්‍ය නැත"
+
+#: src/aosd/aosd_ui.c:837
+msgid "Transparency"
+msgstr "විනිවිද පෙනීම"
+
+#: src/aosd/aosd_ui.c:843
+msgid "Fake transparency"
+msgstr "ව්‍යාජ විනිවිද පෙනීම"
+
+#: src/aosd/aosd_ui.c:845
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "සත්‍ය විනිවිද පෙනීම (X සංයුක්ත Ext. අවශ්‍යයයි)"
+
+#: src/aosd/aosd_ui.c:887
+msgid "Composite extension not loaded"
+msgstr "සංයුක්ත දිගුව ප්‍රවේශනය වී නොමැත"
+
+#: src/aosd/aosd_ui.c:895
+msgid "Composite extension not available"
+msgstr "සංයුක්ත දිගුව නොමැත"
+
+#: src/aosd/aosd_ui.c:914
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd_ui.c:995
+msgid "Audacious OSD - configuration"
+msgstr "Audacious OSD - වින්‍යාසය"
+
+#: src/aosd/aosd_ui.c:1016
+msgid "Test"
+msgstr "පරික්‍ෂා කිරීම"
+
+#: src/aosd/aosd_ui.c:1031
+msgid "Position"
+msgstr "පිහිටීම"
+
+#: src/aosd/aosd_ui.c:1036
+msgid "Animation"
+msgstr "සජීවනය"
+
+#: src/aosd/aosd_ui.c:1041
+msgid "Text"
+msgstr "පෙළ"
+
+#: src/aosd/aosd_ui.c:1046
+msgid "Decoration"
+msgstr "අලංකරණය"
+
+#: src/aosd/aosd_ui.c:1051
+msgid "Trigger"
+msgstr "ක්‍රියාරම්භකය"
+
+#: src/aosd/aosd_ui.c:1056
+msgid "Misc"
+msgstr "විවිධ"
+
+#: src/asx/asx.c:96
+msgid "ASXv1/ASXv2 Playlists"
+msgstr "ASXv1/ASXv2 ධාවන ලැයිස්තුව "
+
+#: src/audpl/audpl.c:222
+msgid "Audacious Playlists (audpl)"
+msgstr "ඔඩෙෂස් ධාවන ලැස්තු (audpl)"
+
+#: src/blur_scope/blur_scope.c:47
+msgid "Color"
+msgstr "වර්ණ"
+
+#: src/blur_scope/blur_scope.c:56
+msgid "Blur Scope"
+msgstr "නොපැහැදිලි විෂය පථය"
+
+#: src/bs2b/plugin.c:136
+msgid "Bauer Stereophonic-to-Binaural Preferences"
+msgstr "ත්‍රිමාන ධ්වානික සංචාලන වල සිට ද්විකර්ණික අභිරුචි වෙත "
+
+#: src/bs2b/plugin.c:147
+msgid "Feed level:"
+msgstr "සංග්‍රහ මට්ටම:"
+
+#: src/bs2b/plugin.c:161
+msgid "Cut frequency:"
+msgstr "සංඛ්‍යාතය කපන්න:"
+
+#: src/bs2b/plugin.c:175
+msgid "Presets:"
+msgstr "පෙර සකසන ලද:"
+
+#: src/bs2b/plugin.c:197
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr "ත්‍රිමාන ධ්වානික සංචාලන වල සිට ද්විකර්ණික වෙත (BS2B)"
+
+#: src/cairo-spectrum/cairo-spectrum.c:297
+msgid "Spectrum Analyzer"
+msgstr "වර්ණාවලි විශ්ලේශකය"
+
+#: src/cdaudio-ng/cdaudio-ng.c:103
+msgid ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"and to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you to Tony Vroon for mentoring and guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project."
+msgstr ""
+"ප්‍රකාශන හිමිකම් (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> සහ පිරිස.\n"
+"විශේෂ ස්තුතිය libcdio සංවර්ධකයන්ට <http://www.gnu.org/software/libcdio/>\n"
+"සහ libcddb සංවර්ධකයන්ට <http://libcddb.sourceforge.net/>.\n"
+"උපදෙස් දීම සහ මගපෙන්වීම වෙනුවෙන් මගේ ස්තුතිය Tony Vroon වෙත පුද කරමි.\n"
+"මෙය 2007 වසරේ Google Summer of Code ව්‍යාපෘතියකි."
+
+#: src/cdaudio-ng/cdaudio-ng.c:121
+msgid "Device"
+msgstr "ආම්පන්නය"
+
+#: src/cdaudio-ng/cdaudio-ng.c:122
+msgid "Read speed:"
+msgstr "වේගයෙන් කියවන්න:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:125
+msgid "Override device:"
+msgstr "ප්‍රතික්ෂේපිත ආම්පන්නය:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:127
+msgid "Metadata"
+msgstr "පාරදත්ත"
+
+#: src/cdaudio-ng/cdaudio-ng.c:128
+msgid "Use CD-Text"
+msgstr "භාවිතා කරන්න CD-පෙළ "
+
+#: src/cdaudio-ng/cdaudio-ng.c:130
+msgid "Use CDDB"
+msgstr "භාවිතා කරන්න CDDB"
+
+#: src/cdaudio-ng/cdaudio-ng.c:132
+msgid "Use HTTP instead of CDDBP"
+msgstr "CDDBP වෙනුවට HTTP භාවිතා කරන්න"
+
+#: src/cdaudio-ng/cdaudio-ng.c:134
+msgid "Server:"
+msgstr "සේවාදායකය:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:136
+msgid "Path:"
+msgstr "පථය:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:138
+msgid "Port:"
+msgstr "තොට:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:148
+msgid "Audio CD Plugin"
+msgstr "ශ්‍රව්‍ය CD පේනු මෘදුකාංගය "
+
+#: src/cdaudio-ng/cdaudio-ng.c:249
+msgid "Failed to initialize cdio subsystem."
+msgstr "cdio උප පද්ධතිය ඇරඹීම අසාර්ථකය."
+
+#: src/cdaudio-ng/cdaudio-ng.c:306
+#, c-format
+msgid "Invalid URI %s."
+msgstr "අවලංගු URI %s."
+
+#: src/cdaudio-ng/cdaudio-ng.c:308
+#, c-format
+msgid "Track %d not found."
+msgstr "ඛණ්ඩය %d සොයාගත නොහැක."
+
+#: src/cdaudio-ng/cdaudio-ng.c:310
+#, c-format
+msgid "Track %d is a data track."
+msgstr "ඛණ්ඩ %d දත්ත ඛණ්ඩයකි."
+
+#: src/cdaudio-ng/cdaudio-ng.c:312
+msgid "Failed to open audio output."
+msgstr "ශ්‍රව්‍ය ප්‍රතිදානය විවෘත කිරීම අසාර්ථක විය."
+
+#: src/cdaudio-ng/cdaudio-ng.c:395
+msgid "Error reading audio CD."
+msgstr "ශ්‍රව්‍ය CD කියවීමේ දෝෂය"
+
+#: src/cdaudio-ng/cdaudio-ng.c:505
+msgid "Audio CD"
+msgstr "ශ්‍රව්‍ය CD"
+
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr "CD අම්පන්නය %s විවෘත කිරීම අසාර්ථක විය."
+
+#: src/cdaudio-ng/cdaudio-ng.c:547
+msgid "No audio capable CD drive found."
+msgstr "ශ්‍රව්‍ය ක්‍රියා කල හැකි CD අම්පන්නය සොයාගත නොහැක."
+
+#: src/cdaudio-ng/cdaudio-ng.c:574
+msgid "Failed to finish initializing opened CD drive."
+msgstr "විවෘත කරන ලද CD අම්පන්නය අවසානය තෙක් ක්‍රියාත්මක කිරීම අසාර්ථක විය."
+
+#: src/cdaudio-ng/cdaudio-ng.c:587
+msgid "Failed to retrieve first/last track number."
+msgstr "පළමු/අවසාන ඛණ්ඩ අංකය සොයාගැනීම අසාර්ථක විය."
+
+#: src/cdaudio-ng/cdaudio-ng.c:612
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr "ඛණ්ඩ %d හි පළමු/අවසාන LSN කියවීමට නොහැක."
+
+#: src/cdaudio-ng/cdaudio-ng.c:702
+msgid "Failed to create the cddb connection."
+msgstr "cddb සම්බන්ධතාව තැනීම අසාර්ථක විය."
+
+#: src/cdaudio-ng/cdaudio-ng.c:777
+msgid "Failed to query the CDDB server"
+msgstr "CDDB සේවාදායකය විමසුමට අපොහොසත් විය."
+
+#: src/cdaudio-ng/cdaudio-ng.c:779
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr "CDDB සේවාදායකය : %s විමසුමට අපොහොසත් විය."
+
+#: src/cdaudio-ng/cdaudio-ng.c:803
+#, c-format
+msgid "Failed to read the cddb info: %s"
+msgstr "cddb තොරතුරු: %s කියවීමට අපොහොසත් විය."
+
+#: src/cdaudio-ng/cdaudio-ng.c:876
+msgid "Drive is empty."
+msgstr "ධාවකය හිස්."
+
+#: src/cdaudio-ng/cdaudio-ng.c:878
+msgid "Unsupported disk type."
+msgstr "සහාය නොමැති තැටි වර්ගයකි."
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Play CD"
+msgstr "සංයුක්ත තැටිය ධාවනය කරන්න "
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Add CD"
+msgstr "සංයුක්ත තැටිය එකතු කරන්න"
+
+#: src/cd-menu-items/cd-menu-items.c:57
+msgid "Audio CD Menu Items"
+msgstr "ශ්‍රව්‍ය CD මෙනු අයිතම "
+
+#: src/compressor/plugin.c:35
+msgid "Compression"
+msgstr "හැකිලීම"
+
+#: src/compressor/plugin.c:36
+msgid "Center volume:"
+msgstr "මධ්‍ය ශබ්ද මට්ටම :"
+
+#: src/compressor/plugin.c:39
+msgid "Dynamic range:"
+msgstr "ගතික පරාසය:"
+
+#: src/compressor/plugin.c:53
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"ඔඩෙෂස් පේනු මෘදුකාංගය සඳහා ගතික පරාස සම්පීඩනය\n"
+"ප්‍රකාශන හිමිකම් 2010-2012 ජෝන් ලින්ඩ්ග්රෙන්"
+
+#: src/compressor/plugin.c:58
+msgid "Dynamic Range Compressor"
+msgstr "ගතික පරාස සම්පීඩකය"
+
+#: src/console/configure.c:134 src/console/plugin.c:42
+msgid "Game Console Music Decoder"
+msgstr "ක්‍රීඩා පාලන පුවරු සංගීත විකේතකය"
+
+#: src/console/configure.c:151
+msgid "General"
+msgstr "සාමාන්‍ය"
+
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
+msgid "Playback"
+msgstr "පිළිවැයීම"
+
+#: src/console/configure.c:168
+msgid "Bass:"
+msgstr "මන්ද්‍රස්වර:"
+
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
+msgid "secs"
+msgstr "තප්පර"
+
+#: src/console/configure.c:179
+msgid "Treble:"
+msgstr "උච්චස්වනය:"
+
+#: src/console/configure.c:200
+msgid "Default song length:"
+msgstr "පෙරනිමි ගීත දිග:"
+
+#: src/console/configure.c:206
+msgid "Resampling"
+msgstr "නැවත නියැදීම"
+
+#: src/console/configure.c:212
+msgid "Enable audio resampling"
+msgstr "නැවත නියැදීම සක්‍රිය කරන්න"
+
+#: src/console/configure.c:227
+msgid "Resampling rate:"
+msgstr "නැවත නියැදීම් අනුපාතය:"
+
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
+msgid "Hz"
+msgstr "හර්ට්ස්"
+
+#: src/console/configure.c:242
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/configure.c:243
+msgid "Ignore length from SPC tags"
+msgstr "SPC \tසම්බන්ධකයෙන් දිග නොසලකා හරින්න"
+
+#: src/console/configure.c:244
+msgid "Increase reverb"
+msgstr "ප්‍රතිරාවය වැඩි කරන්න"
+
+#: src/console/configure.c:269
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"කාල ප්‍රමාණ තොරතුරු සපයා නොමැති ගීත සඳහා තප්පර වලින් පෙන්වා ඇති පෙරනිමි ගීත කාල ප්‍රමාණය "
+"භාවිතා කර ඇත (i.e. එකම කොටස නැවත නැවත ධාවනය වන පථ)."
+
+#: src/console/plugin.c:27
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+msgstr ""
+"ක්‍රීඩා_ගීත_Emu 0.5.2 මත වූ කොන්සෝල ගීත විකේතක එන්ජිම \n"
+"සහය වන ආකෘති: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"ඔඩෙෂස් පේනු මෘදුකාංගය:\n"
+" William Pitcock<nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+
+#: src/crossfade/crossfade.c:81
+msgid ""
+"Crossfading failed because the songs had a different number of channels. "
+"You can use the Channel Mixer to convert the songs to the same number of "
+"channels."
+msgstr ""
+"ගීත වලට වෙනස් නාලිකා කිහිපයක් තිබීම නිසා එක් ශබ්දයකින් තවත් ශබ්දයකට මාරු වීමට අසමත් වී ඇත. "
+"නාලිකා මිශ්‍රකය භාවිතයෙන් ඔබට ගීත සමාන නාලිකා ගණනකට වෙනස් කල හැක."
+
+#: src/crossfade/crossfade.c:88
+msgid ""
+"Crossfading failed because the songs had different sample rates. You can "
+"use the Sample Rate Converter to convert the songs to the same sample rate."
+msgstr ""
+"ගීත වලට වෙනස් නියැදි අනුපාත තිබීම නිසා එක් ශබ්දයකින් තවත් ශබ්දයකට මාරු වීමට අසමත් වී ඇත. "
+"නාලිකා මිශ්‍රකය භාවිතයෙන් ඔබට ගීත එක් නියැදි අනුපාතයකට වෙනස් කල හැක."
+
+#: src/crossfade/crossfade.c:254
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Audacious සඳහා වන හරහා පෑහීමේ පේනු මෘදුකාංගය⏎\n"
+"ප්‍රකාශන අයිතිය 2010-2012 ජෝන් ලින්ඩ්ග්‍රෙන්"
+
+#: src/crossfade/crossfade.c:258
+msgid "Crossfade"
+msgstr "එක් ශබ්දයකින් තවත් ශබ්දයකට මාරු වීම"
+
+#: src/crossfade/crossfade.c:259
+msgid "Overlap:"
+msgstr "අතිච්ඡාදන:"
+
+#: src/crossfade/crossfade.c:269
+msgid "Crossfade"
+msgstr "එක් ශබ්දයකින් තවත් ශබ්දයකට මාරු වීම"
+
+#: src/crystalizer/crystalizer.c:40
+msgid "Crystalizer"
+msgstr "පළිඟුව"
+
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
+msgid "Intensity:"
+msgstr "තීව්‍රතාව:"
+
+#: src/crystalizer/crystalizer.c:51
+msgid "Crystalizer"
+msgstr "පළිඟුව"
+
+#: src/cue/cue.c:158
+msgid "Cue Sheet Plugin"
+msgstr "සලකුණු පත් පේනු මෘදුකාංගය "
+
+#: src/echo_plugin/echo.c:24
+msgid "Echo"
+msgstr "ප්‍රතිරාව"
+
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
+msgid "Delay:"
+msgstr "ප්‍රමාදය:"
+
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
+msgid "ms"
+msgstr "මාත සංවේද්‍යතාව"
+
+#: src/echo_plugin/echo.c:28
+msgid "Feedback:"
+msgstr "ප්‍රතිපෝෂණය:"
+
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
+msgid "Volume:"
+msgstr "ශබ්ද මට්ටම :"
+
+#: src/echo_plugin/echo.c:114
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"\n"
+"Surround echo by Carl van Schaik, 1999"
+msgstr ""
+"ප්‍රතිධ්වනි පේනු මෘදුකාංගය⏎\n"
+"ජොහාන් ලෙවින් විසින්, 1999⏎\n"
+"⏎\n"
+"සිසාළ ප්‍රතිධ්වනි කාර්ල් වෑන් ස්චේයික් විසින්, 1999"
+
+#: src/echo_plugin/echo.c:120
+msgid "Echo"
+msgstr "ප්‍රතිරාව"
+
+#: src/ffaudio/ffaudio-core.c:648
+msgid ""
+"Multi-format audio decoding plugin for Audacious using\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Audacious සඳහා වන බහු ආකෘති ශ්‍රව්‍ය විකේතන පේනු මෘදුකාංගය සෑදීමට යොදාගත්තේ⏎\n"
+"FFmpeg බහුමාධ්‍ය සැකිල්ල (http://www.ffmpeg.org/)⏎\n"
+"⏎\n"
+"Audacious පේනු මෘදුකාංගය සාදනු ලැබුවේ:⏎\n"
+"විලියම් පිට්කොක් <nenolod@nenolod.net>⏎\n"
+"මැටී හැමලේයිනෙන් <ccr@tnsp.org>"
+
+#: src/ffaudio/ffaudio-core.c:695
+msgid "FFmpeg Plugin"
+msgstr "FFmpeg පේනු මෘදුකාංගය "
+
+#: src/filewriter/filewriter.c:409
+msgid "FileWriter Configuration"
+msgstr "ගොනු රචක වින්‍යාසය"
+
+#: src/filewriter/filewriter.c:421
+msgid "Output file format:"
+msgstr "ප්‍රතිදාන ගොනු ආකෘතිය:"
+
+#: src/filewriter/filewriter.c:439
+msgid "Configure"
+msgstr "වින්‍යාස කරන්න"
+
+#: src/filewriter/filewriter.c:449
+msgid "Save into original directory"
+msgstr "මූලික නාමාවලියට සුරකින්න"
+
+#: src/filewriter/filewriter.c:454
+msgid "Save into custom directory"
+msgstr "අභිරුචි නාමාවලියටකට සුරකින්න"
+
+#: src/filewriter/filewriter.c:464
+msgid "Output file folder:"
+msgstr "ප්‍රතිදාන ගොනු ෆෝල්ඩරය:"
+
+#: src/filewriter/filewriter.c:468
+msgid "Pick a folder"
+msgstr "ෆෝල්ඩරයක් තෝරන්න"
+
+#: src/filewriter/filewriter.c:481
+msgid "Get filename from:"
+msgstr "වෙතින් ගොනු නාමයක් ලබාගන්න:"
+
+#: src/filewriter/filewriter.c:484
+msgid "original file tags"
+msgstr "මූලික ගොනු සම්බන්ධකය"
+
+#: src/filewriter/filewriter.c:490
+msgid "original filename"
+msgstr "මූලික ගොනු නම"
+
+#: src/filewriter/filewriter.c:497
+msgid "Don't strip file name extension"
+msgstr "ගොනු නම් දිගුව ඉවත් නොකරන්න"
+
+#: src/filewriter/filewriter.c:506
+msgid "Prepend track number to filename"
+msgstr "පථ අංකය ගොනු නමට එකතු කරන්න"
+
+#: src/filewriter/filewriter.c:515
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+"මෙම මෘදුකාංගය නිදහස් කි; නිදහස් මෘදුකාංග පදනම විසින් ප්‍රකාශ කරන ලද GNU සාමාන්‍ය පොදු "
+"බලපත්‍රය යටතේ ඔබට මෙය නැවත බෙදා හැරීම හෝ වෙනස් කිරීම කළ හැක; බලපත්‍රයේ 2වන සංස්කරණය "
+"හෝ(ඔබගේ කැමත්ත අනුව) පසු සංස්කරණයක් යටතේ.\n"
+"\n"
+"මෙම මෘදුකාංගය බෙදාහැර ඇත්තේ ප්‍රයෝජනවත් වේ යන බලාපොරොත්තුවෙන් වුවත් වගකීමක් නොමැත; විකිණිය "
+"හැකි හෝ යම් නිශ්චිත අරමුණකට ලෙසවත් ගම්‍යමාන වන වගකීමකින් තොරයි. වැඩි විස්තර සඳහා GNU සාමාන්‍ය "
+"පොදු බලපත්‍රය බලන්න. මෙම සමග ඔබට හි පිටපතක් ලැබිය යුතුයි; නැතිනම් නිදහස් මෘදුකාංග පදනමට දන්වන්න"
+". Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+
+#: src/filewriter/filewriter.c:532
+msgid "FileWriter Plugin"
+msgstr "ගොනු රචක පේනු මෘදුකාංගය "
+
+#: src/filewriter/mp3.c:37 src/filewriter/mp3.c:748
+msgid "Auto"
+msgstr "ස්වයංක්‍රීය"
+
+#: src/filewriter/mp3.c:37
+msgid "Joint Stereo"
+msgstr "එකතු වූ ත්‍රිමාණ"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
+msgid "Stereo"
+msgstr "ත‍්‍ර‍්‍රිමාණ "
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
+msgid "Mono"
+msgstr "තනි "
+
+#: src/filewriter/mp3.c:688
+msgid "MP3 Configuration"
+msgstr "MP3 වින්‍යාසය"
+
+#: src/filewriter/mp3.c:712
+msgid "Algorithm Quality:"
+msgstr "ඇල්ගොරිතම තත්ත්වය:"
+
+#: src/filewriter/mp3.c:737
+msgid "Output Samplerate:"
+msgstr "ප්‍රතිදාන නියැදි අනුපාතය:"
+
+#: src/filewriter/mp3.c:765
+msgid "(Hz)"
+msgstr "(හර්ට්ස්)"
+
+#: src/filewriter/mp3.c:772
+msgid "Bitrate / Compression ratio:"
+msgstr "බිට් රේටය / සම්පීඩක අනුපාතය:"
+
+#: src/filewriter/mp3.c:796
+msgid "Bitrate (kbps):"
+msgstr "බිට් රේටය (තප්පරයට කි.බ.)"
+
+#: src/filewriter/mp3.c:829
+msgid "Compression ratio:"
+msgstr "සම්පීඩක අනුපාතය:"
+
+#: src/filewriter/mp3.c:853
+msgid "Audio Mode:"
+msgstr "ශ්‍රව්‍ය ප්‍රකාරය:"
+
+#: src/filewriter/mp3.c:878
+msgid "Misc:"
+msgstr "ප්‍රකීර්ණ:"
+
+#: src/filewriter/mp3.c:889
+msgid "Enforce strict ISO complience"
+msgstr "විධිමත් ISO අනුකූලවීමකට බල කරන්න"
+
+#: src/filewriter/mp3.c:900
+msgid "Error protection"
+msgstr "දෝෂ ආරක්‍ෂාව"
+
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
+msgid "Quality"
+msgstr "ප්‍රශස්තතාව"
+
+#: src/filewriter/mp3.c:921
+msgid "Enable VBR/ABR"
+msgstr "VBR/ABR සක්‍රිය කරන්න"
+
+#: src/filewriter/mp3.c:931
+msgid "Type:"
+msgstr "වර්ගය:"
+
+#: src/filewriter/mp3.c:964
+msgid "VBR Options:"
+msgstr "VBR විකල්ප:"
+
+#: src/filewriter/mp3.c:980
+msgid "Minimum bitrate (kbps):"
+msgstr "අවම බිට් රේටය (තප්පරයට කි.බ.)"
+
+#: src/filewriter/mp3.c:1007
+msgid "Maximum bitrate (kbps):"
+msgstr "උපරිම බිට් රේටය (තප්පරයට කි.බ.)"
+
+#: src/filewriter/mp3.c:1030
+msgid "Strictly enforce minimum bitrate"
+msgstr "අවම බිට් රේටය සඳහා තදින් බලකරන්න"
+
+#: src/filewriter/mp3.c:1042
+msgid "ABR Options:"
+msgstr "ABR විකල්ප:"
+
+#: src/filewriter/mp3.c:1052
+msgid "Average bitrate (kbps):"
+msgstr "සාමාන්‍ය බිට් රේටය (තත්පරයට කි.බ.)"
+
+#: src/filewriter/mp3.c:1080
+msgid "VBR quality level:"
+msgstr "VBR ප්‍රශස්තතා මට්ටම:"
+
+#: src/filewriter/mp3.c:1099
+msgid "Don't write Xing VBR header"
+msgstr "Xing VBR ශීර්‍ෂකය නොලියන්න"
+
+#: src/filewriter/mp3.c:1112
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1121
+msgid "Frame parameters:"
+msgstr "රාමු පරාමිතිය :"
+
+#: src/filewriter/mp3.c:1133
+msgid "Mark as copyright"
+msgstr "ප්‍රකාශන අයිතිය සහිත ලෙස සලකුණු කරන්න"
+
+#: src/filewriter/mp3.c:1144
+msgid "Mark as original"
+msgstr "මුල් පිටපතක් ලෙස සලකුණු කරන්න"
+
+#: src/filewriter/mp3.c:1156
+msgid "ID3 params:"
+msgstr "ID3 params:"
+
+#: src/filewriter/mp3.c:1167
+msgid "Force addition of version 2 tag"
+msgstr "2 වන සංස්කරණයේ සම්බන්ධකයට බලෙන් ඇතුලත් කිරීම"
+
+#: src/filewriter/mp3.c:1177
+msgid "Only add v1 tag"
+msgstr "1 වන සංස්කරණයේ සම්බන්ධකය පමණක් එකතු කරන්න"
+
+#: src/filewriter/mp3.c:1184
+msgid "Only add v2 tag"
+msgstr "2 වන සංස්කරණයේ සම්බන්ධකය පමණක් එකතු කරන්න"
+
+#: src/filewriter/mp3.c:1205
+msgid "Tags"
+msgstr "සම්බන්ධක"
+
+#: src/filewriter/vorbis.c:209
+msgid "Vorbis Encoder Configuration"
+msgstr "Vorbis විකේතකයේ වින්‍යාසය"
+
+#: src/filewriter/vorbis.c:232
+msgid "Quality level (0 - 10):"
+msgstr "ප්‍රශස්ථතා මට්ටම (0 - 10):"
+
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
+msgid "lossless"
+msgstr "හානි වී නොමැති "
+
+#: src/flacng/plugin.c:269
+msgid ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"මූලක කේතය සකසනු ලැබුවේ⏎\n"
+"රැල්ෆ් අර්ට්සින්ගර් <ralf@skytale.net>⏎\n"
+"⏎\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+
+#: src/flacng/plugin.c:277
+msgid "FLAC Decoder"
+msgstr "FLAC විකේතකය"
+
+#: src/gio/gio.c:300
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+"Audacious සඳහා වන GIO පේනු මෘදුකාංගය⏎\n"
+"ප්‍රකාශන අයිතිය 2009-2012 ජෝන් ලින්ඩ්ග්‍රෙන්"
+
+#: src/gio/gio.c:322
+msgid "GIO Plugin"
+msgstr "GIO පේනු මෘදුකාංගය "
+
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"ඔඩෙෂස් සඳහා OpenGL වර්ණාවලි විශ්ලේශකය\n"
+"ප්‍රකාශන හිමිකම Christophe Budé and John Lindgren 2013\n"
+"\n"
+"XMMS පේනු මෘදුකාංගය මත පදනම්ව:\n"
+"ප්‍රකාශන හිමිකම 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson,"
+"සහ 4Front තාක්ෂණ \n"
+"\n"
+"බලපත්‍රය: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL වර්ණාවලි විශ්ලේශකය"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Lets you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"ග්නෝම් කෙටි යෙදුම් පේනු මෘදුකාංගය⏎\n"
+"ග්නෝම් කෙටි යෙදුම් මගින් ඔබට ධාවකය පාලනයට ඉඩ සලසයි.⏎\n"
+"⏎\n"
+"ප්‍රකාශන අයිතිය (C) 2007-2008 සස්චා හ්ලුසියැක් <contact@saschahlusiak.de>"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
+msgid "Gnome Shortcuts"
+msgstr "Gnome කෙටිමග "
+
+#: src/gtkui/columns.c:32
+msgid "Entry number"
+msgstr "ඇතුලත් කිරීමේ අංකය"
+
+#: src/gtkui/columns.c:32
+msgid "Title"
+msgstr "මාතෘකාව"
+
+#: src/gtkui/columns.c:33
+msgid "Artist"
+msgstr "ශිල්පියා "
+
+#: src/gtkui/columns.c:33
+msgid "Year"
+msgstr "වර්ෂය "
+
+#: src/gtkui/columns.c:33
+msgid "Album"
+msgstr "ඇල්බමය "
+
+#: src/gtkui/columns.c:33
+msgid "Track"
+msgstr "ඛණ්ඩය "
+
+#: src/gtkui/columns.c:33
+msgid "Genre"
+msgstr "ප්‍රභේදය"
+
+#: src/gtkui/columns.c:34
+msgid "Queue position"
+msgstr "පේලියෙහි පිහිටන ස්ථානය"
+
+#: src/gtkui/columns.c:34
+msgid "Length"
+msgstr "දිග"
+
+#: src/gtkui/columns.c:34
+msgid "File path"
+msgstr "ගොනු පථය"
+
+#: src/gtkui/columns.c:34
+msgid "File name"
+msgstr "ගොනු නම"
+
+#: src/gtkui/columns.c:35
+msgid "Custom title"
+msgstr "අභිරුචි මාතෘකාව"
+
+#: src/gtkui/columns.c:35
+msgid "Bitrate"
+msgstr "බිට් රේටය"
+
+#: src/gtkui/columns.c:277
+msgid "Choose Columns"
+msgstr "තීරු තෝරන්න "
+
+#: src/gtkui/columns.c:293
+msgid "Available:"
+msgstr "ප්‍රයෝජනයට ගත හැක:"
+
+#: src/gtkui/columns.c:327
+msgid "Chosen:"
+msgstr "තෝරාගත්:"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Left"
+msgstr "වමට ඈඳන්න"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Right"
+msgstr "දකුණට ඈඳන්න"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Top"
+msgstr "ඉහළට ඈඳන්න"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Bottom"
+msgstr " පහළට ඈඳන්න"
+
+#: src/gtkui/layout.c:120
+msgid "Undock"
+msgstr "ඈඳීම අවලංගු කරන්න"
+
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
+msgid "Disable"
+msgstr "අක්‍රීය කරන්න"
+
+#: src/gtkui/menus.c:170
+msgid "_Open Files ..."
+msgstr "_ගොනු විවෘත කරන්න ..."
+
+#: src/gtkui/menus.c:171
+msgid "Open _URL ..."
+msgstr "_URL විවෘත කරන්න ..."
+
+#: src/gtkui/menus.c:172
+msgid "_Add Files ..."
+msgstr "_ගොනු එකතු කරන්න ..."
+
+#: src/gtkui/menus.c:173
+msgid "Add U_RL ..."
+msgstr "U_RL එකතු කරන්න ..."
+
+#: src/gtkui/menus.c:175
+msgid "_Search Library"
+msgstr "_පුස්තකාලය සොයන්න"
+
+#: src/gtkui/menus.c:177
+msgid "A_bout ..."
+msgstr "පි_ළිබඳ ..."
+
+#: src/gtkui/menus.c:178
+msgid "_Preferences ..."
+msgstr "_වරණ ..."
+
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
+msgid "_Quit"
+msgstr "_පිටවෙන්න"
+
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
+msgid "_Play"
+msgstr "_ධාවනය කරන්න"
+
+#: src/gtkui/menus.c:183
+msgid "Paus_e"
+msgstr "විරාම_ය"
+
+#: src/gtkui/menus.c:184
+msgid "_Stop"
+msgstr "_නවත්වන්න"
+
+#: src/gtkui/menus.c:185
+msgid "Pre_vious"
+msgstr "ක_ලින්"
+
+#: src/gtkui/menus.c:186
+msgid "_Next"
+msgstr "_ඊළඟ"
+
+#: src/gtkui/menus.c:188
+msgid "_Repeat"
+msgstr "_නැවත ධාවනය"
+
+#: src/gtkui/menus.c:189
+msgid "S_huffle"
+msgstr "ක_ළවම් කිරීම"
+
+#: src/gtkui/menus.c:190
+msgid "N_o Playlist Advance"
+msgstr "ධාවන ලැස්තු නැ_ත "
+
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "මෙම ගීතයෙන් පසු නවත්තන්න "
+
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
+msgid "Song _Info ..."
+msgstr "ගීත_තොරතුරු ..."
+
+#: src/gtkui/menus.c:194
+msgid "Jump to _Time ..."
+msgstr "මගහැර වේලාවට_පිවිසෙන්න ..."
+
+#: src/gtkui/menus.c:195
+msgid "_Jump to Song ..."
+msgstr "_මගහැර ගීතයට පිවිසෙන්න ..."
+
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "නැවත සිදුවන ස්ථාන_A පිහිටුවන්න "
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "නැවත සිදුවන ස්ථාන_B පිහිටුවන්න "
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "නැවත සිදුවන ස්ථාන හිස්කරන්න "
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
+msgid "By _Title"
+msgstr "මාතෘකා_වෙන්"
+
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "ගොනු නාමයෙන් "
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "ගොනු පථයෙන් "
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "ඛණ්ඩ_අංකයෙන් "
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
+msgid "By _Artist"
+msgstr "ශිල්පියා_ගෙන්"
+
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "ඇල්බමයෙන් "
+
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
+msgid "By Release _Date"
+msgstr "පිට කල _දිනයෙන්"
+
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "දුරෙන් "
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
+msgid "By _File Path"
+msgstr "ගොනු_පථයෙන්"
+
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
+msgid "By _Custom Title"
+msgstr "අභිරුචි_මාතෘකාවෙන් "
+
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
+msgid "R_everse Order"
+msgstr "අග_සිට මුලට"
+
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
+msgid "_Random Order"
+msgstr "_සසම්භාවී පිළිවෙල"
+
+#: src/gtkui/menus.c:233
+msgid "_Play This Playlist"
+msgstr "_ධාවන ලැයිස්තුව ධාවනය කරන්න"
+
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
+msgid "_Refresh"
+msgstr "_නැවුම් කරන්න"
+
+#: src/gtkui/menus.c:236
+msgid "_Sort"
+msgstr "_අනුපිළිවෙලට සකසන්න"
+
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "තෝරාගත් අනුපිළිවලට "
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "අනුපිටපත්_ඉවත් කිරීම "
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "අනුපයෝජ්‍ය_ගොනු ඉවත් කරන්න"
+
+#: src/gtkui/menus.c:241
+msgid "_New"
+msgstr "_නව"
+
+#: src/gtkui/menus.c:242
+msgid "Ren_ame ..."
+msgstr "Ren_ame ..."
+
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
+msgid "_Close"
+msgstr "_වසන්න"
+
+#: src/gtkui/menus.c:245
+msgid "_Import ..."
+msgstr "_ආයාත කරන්න ..."
+
+#: src/gtkui/menus.c:246
+msgid "_Export ..."
+msgstr "_නිර්යාත කරන්න ..."
+
+#: src/gtkui/menus.c:248
+msgid "Playlist _Manager ..."
+msgstr "ධාවන ලැයිස්තු_කළමනාකාරකය ..."
+
+#: src/gtkui/menus.c:249
+msgid "_Queue Manager ..."
+msgstr "_පෙළගැස්ම කළමනාකරණය ..."
+
+#: src/gtkui/menus.c:252
+msgid "Volume _Up"
+msgstr "ශබ්ද මට්ටම _වැඩි කරන්න"
+
+#: src/gtkui/menus.c:253
+msgid "Volume _Down"
+msgstr "ශබ්ද මට්ටම _අඩු කරන්න"
+
+#: src/gtkui/menus.c:255
+msgid "_Equalizer"
+msgstr "_ඊක්‍යුවලයිසරය"
+
+#: src/gtkui/menus.c:257
+msgid "E_ffects"
+msgstr "ප්‍ර_යෝග"
+
+#: src/gtkui/menus.c:260
+msgid "_Interface"
+msgstr "_අතුරු මුනුණත"
+
+#: src/gtkui/menus.c:261
+msgid "_Visualizations"
+msgstr "_දෘෂ්ටි කල්පනය "
+
+#: src/gtkui/menus.c:263
+msgid "Show _Menu Bar"
+msgstr "_මෙනු තීරුව පෙන්වන්න"
+
+#: src/gtkui/menus.c:264
+msgid "Show I_nfo Bar"
+msgstr "තොරතුරු තී_රුව පෙන්වන්න"
+
+#: src/gtkui/menus.c:265
+msgid "Show Info Bar Vis_ualization"
+msgstr "තොරතුරු තීරුවේ දෘෂ්ටි කල්පනය පෙන්වන්න "
+
+#: src/gtkui/menus.c:266
+msgid "Show _Status Bar"
+msgstr "තත්ව _තීරුව පෙන්වන්න"
+
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "ඉතුරුවී ඇති කාලය පෙන්වන්න."
+
+#: src/gtkui/menus.c:270
+msgid "Show Close _Buttons"
+msgstr "වසා දැමීමේ _බොත්තම් පෙන්වන්න"
+
+#: src/gtkui/menus.c:271
+msgid "Show Column _Headers"
+msgstr "තීරු _ශීර්ෂ පෙන්වන්න"
+
+#: src/gtkui/menus.c:272
+msgid "Choose _Columns ..."
+msgstr "තීරු _තෝරන්න ..."
+
+#: src/gtkui/menus.c:273
+msgid "Scrol_l on Song Change"
+msgstr "ගීත වෙනස්වීමේදී අනුචලන_ය කරන්න "
+
+#: src/gtkui/menus.c:276
+msgid "_File"
+msgstr "_ගොනුව"
+
+#: src/gtkui/menus.c:277
+msgid "_Playback"
+msgstr "_පිළිවැයුම"
+
+#: src/gtkui/menus.c:278
+msgid "P_laylist"
+msgstr "ධා_වන ලැයිස්තුව"
+
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
+msgid "_Services"
+msgstr "_සේවා"
+
+#: src/gtkui/menus.c:280
+msgid "_Output"
+msgstr "_ප්‍රතිදාන"
+
+#: src/gtkui/menus.c:281
+msgid "_View"
+msgstr "_දසුන"
+
+#: src/gtkui/menus.c:285
+msgid "_Queue/Unqueue"
+msgstr "_පෙළගස්වන්න/පෙළගැස්ම අවලංගු කරන්න"
+
+#: src/gtkui/menus.c:288
+msgid "Cu_t"
+msgstr "කපන්_න"
+
+#: src/gtkui/menus.c:289
+msgid "_Copy"
+msgstr "_පිටපත් කරන්න"
+
+#: src/gtkui/menus.c:290
+msgid "_Paste"
+msgstr "_අලවන්න"
+
+#: src/gtkui/menus.c:291
+msgid "Select _All"
+msgstr "සියල්ල_තෝරන්න"
+
+#: src/gtkui/menus.c:297
+msgid "_Rename ..."
+msgstr "_නැවත නම් කිරීම ..."
+
+#: src/gtkui/ui_gtk.c:96
+msgid "GTK Interface"
+msgstr "GTK අතුරු මුහුණත"
+
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.c:204
+msgid "Buffering ..."
+msgstr "අන්තරාචයනය..."
+
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
+msgid "Audacious"
+msgstr "ඔඩෙෂස් "
+
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
+msgid "Error"
+msgstr "දෝෂය "
+
+#: src/gtkui/ui_statusbar.c:108
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] "%d නාලිකාව "
+msgstr[1] "%d නාලිකා "
+
+#: src/gtkui/ui_statusbar.c:123
+#, c-format
+msgid "%d kbps"
+msgstr "%d තත්පරයට කිලෝ බයිට් "
+
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr "පෙර ඛණ්ඩය"
+
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
+msgid "Play"
+msgstr "ධාවනය කරන්න "
+
+#: src/hotkey/gui.c:72
+msgid "Pause/Resume"
+msgstr "නැවතීම/නැවත ඇරඹීම "
+
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
+msgid "Stop"
+msgstr "නැවතීම "
+
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr "පසු ඛණ්ඩය "
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "තත්.5 ධාවනය කරන්න"
+
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
+msgstr "තත්.5 පසු ධාවනය කරන්න"
+
+#: src/hotkey/gui.c:77
+msgid "Mute"
+msgstr "නිහඬ කරන්න "
+
+#: src/hotkey/gui.c:78
+msgid "Volume up"
+msgstr "ශබ්ද මට්ටම වැඩි කරන්න"
+
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr "ශබ්ද මට්ටම අඩු කරන්න"
+
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
+msgstr "මගහැර ගොනුවට පිවිසෙන්න "
+
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr "ධාවක කවුළු(ව) පුරුක් කරන්න"
+
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "තිරය මත සංදර්ශනය කර පෙන්වන්න "
+
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
+msgstr "නැවත කිරීම ටොගල් කරන්න"
+
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
+msgstr "කළවම් කිරිම ටොගල් කරන්න"
+
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr "පවතින ගීතයෙන් පසු නැවතීම ටොගල් කරන්න "
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
+msgstr "ධාවක කවුළු(ව) පෙන්වන්න"
+
+#: src/hotkey/gui.c:96
+msgid "(none)"
+msgstr "(කිසිවක් නැත)"
+
+#: src/hotkey/gui.c:233
+msgid ""
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"ප්‍රාථමික මූසික බොත්තම් නවීකරණයකින් තොරව බැඳීමට නිර්දේශ නොකෙරේ.\n"
+"ඔබට ඉදිරියටයාම‍ට අවශ්‍යද ?"
+
+#: src/hotkey/gui.c:235
+msgid "Binding mouse buttons"
+msgstr "බැඳෙන මූසික බොත්තම් "
+
+#: src/hotkey/gui.c:385
+msgid "Global Hotkey Plugin Configuration"
+msgstr "ගෝලීය විශේෂ බොත්තම් පේනු මෘදුකංග වින්‍යාසය "
+
+#: src/hotkey/gui.c:401
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+"පෙළ ක්ෂේත්‍රය ඇතුලත යතුරු එකතුව ඔබන්න.\n"
+"ඔබට මූසික බොත්තමද බැඳීය හැක."
+
+#: src/hotkey/gui.c:406
+msgid "Hotkeys:"
+msgstr "විශේෂ බොත්තම්:"
+
+#: src/hotkey/gui.c:423
+msgid "Action:"
+msgstr "ක්‍රියාව:"
+
+#: src/hotkey/gui.c:430
+msgid "Key Binding:"
+msgstr "යතුරු බැඳීම:"
+
+#: src/hotkey/plugin.c:66
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"Global Hotkey පේනු මෘදුකාංගය\n"
+"Global key සංකලන මගින් හෝ බහු මාධ්‍ය යතුරු මගින් ධාවකය පාලනය කරන්න.\n"
+"\n"
+"ප්‍රකාශන අයිතිය (C) 2007-2008 සස්චා හ්ලුසියැක් <contact@saschahlusiak.de>\n"
+"\n"
+"දායක වූවන්:\n"
+"ප්‍රකාශන අයිතිය (C) 2006-2007 ව්ලැඩිමිර් පැස්කෝව් <vlado.paskov@gmail.com>\n"
+"ප්‍රකාශන අයිතිය (C) 2000-2002 විලී සිර්ජාලා <syrjala@sci.fi>,\n"
+"බ්‍රයන් ඩේවිස් <curious@ihug.com.au>,\n"
+"ජොනතන් ඒ. ඩේවිස් <davis@jdhouse.org>,\n"
+"ජෙරමි ටෑන් <nsx@nsx.homeip.net>"
+
+#: src/hotkey/plugin.c:78
+msgid "Global Hotkeys"
+msgstr "ගෝලීය විශේෂ බොත්තම්:"
+
+#: src/jack/jack.c:410
+msgid ""
+"Based on xmms-jack, by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Ported to Audacious by Giacomo Lozito"
+msgstr ""
+"ක්‍රිස් මෝර්ගන් ගේ xmms-jack මත පදනම් වී ඇත:⏎\n"
+"http://xmms-jack.sourceforge.net/⏎\n"
+"⏎\n"
+"Audacious වෙත ඇතුලත් කළේ ජියාකොමෝ ලොසීටෝ විසිනි"
+
+#: src/jack/jack.c:416
+msgid "JACK Output"
+msgstr "JACK ප්‍රතිදානය"
+
+#: src/ladspa/plugin.c:493
+#, c-format
+msgid "%s Settings"
+msgstr "%s සිටුවම "
+
+#: src/ladspa/plugin.c:561
+msgid "LADSPA Host Settings"
+msgstr "LADSPA සත්කාරක සිටුවම "
+
+#: src/ladspa/plugin.c:570
+msgid "Module paths:"
+msgstr "මොඩියුල පථය:"
+
+#: src/ladspa/plugin.c:575
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+"බහු පථ දෙතිතෙන් වෙන්කරන්න.\n"
+"මෙම පථ සොයන්නේ LADSPA_PATH එකට අමතරවය.\n"
+"නව පථ ඇතුලත් කිරීමෙන් පසුව, නව පේනු මෘදුකාංග සදහා Enter යතුර ඔබන්න."
+
+#: src/ladspa/plugin.c:591
+msgid "Available plugins:"
+msgstr "උපයෝජ්‍ය පේනු මෘදුකාංග:"
+
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
+msgid "Enable"
+msgstr "සක්‍රිය "
+
+#: src/ladspa/plugin.c:610
+msgid "Enabled plugins:"
+msgstr "සක්‍රිය පේනු මෘදුකාංග:"
+
+#: src/ladspa/plugin.c:626
+msgid "Settings"
+msgstr "සිටුවම් "
+
+#: src/ladspa/plugin.c:645
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+"Audacious සඳහා වන LADSPA සත්කාරකය⏎\n"
+"ප්‍රකාශන අයිතිය 2011 ජෝන් ලින්ඩ්ග්‍රෙන්"
+
+#: src/ladspa/plugin.c:650
+msgid "LADSPA Host"
+msgstr "LADSPA සත්කාරක "
+
+#: src/lirc/lirc.c:76
+#, c-format
+msgid "%s: could not init LIRC support\n"
+msgstr "%s: LIRC සඳහා සහයවිය නොහැක\n"
+
+#: src/lirc/lirc.c:83
+#, c-format
+msgid ""
+"%s: could not read LIRC config file\n"
+"%s: please read the documentation of LIRC\n"
+"%s: how to create a proper config file\n"
+msgstr ""
+"%s: LIRC වින්‍යාස ගොනුව කියවිය නොහැක \n"
+"%s: කරුණාකර LIRC වලට අදාල ලේඛන කියවන්න \n"
+"%s: ක්‍රමානුකූල වින්‍යාස ගොනුවක් සාදන්නේ කෙසේද \n"
+
+#: src/lirc/lirc.c:114
+#, c-format
+msgid "%s: trying to reconnect...\n"
+msgstr " %s: ප්‍රතිසම්බන්ධ වීමට උත්සාහ කිරීම...\n"
+
+#: src/lirc/lirc.c:354
+#, c-format
+msgid "%s: unknown command \"%s\"\n"
+msgstr "%s: නොදන්නා විධානයකි \"%s\"\n"
+
+#: src/lirc/lirc.c:365
+#, c-format
+msgid "%s: disconnected from LIRC\n"
+msgstr "%s: LIRC වලින් ක්‍රියාවිරහිත කර ඇත \n"
+
+#: src/lirc/lirc.c:371
+#, c-format
+msgid "%s: will try reconnect every %d seconds...\n"
+msgstr "%s: සෑම තත්පර %d වරක් නැවත සම්බන්ධ වීමට උත්සාහ කරයි...\n"
+
+#: src/lirc/lirc.c:381
+msgid ""
+"A simple plugin to control Audacious using the LIRC remote control daemon\n"
+"\n"
+"Adapted for Audacious by:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Based on the XMMS LIRC plugin by:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"For more information about LIRC, see http://lirc.org."
+msgstr ""
+"LIRC දුරස්ථ පාලක daemon භාවිතයෙන් Audacious පාලනය කිරීමට සරල පේනු මෘදුකාංගයක්⏎\n"
+"⏎\n"
+"වෙත ඇතුලත් කරන ලද්දේ:⏎\n"
+"ටෝන්‍ය් ව්‍රෝන් <chainsaw@gentoo.org>⏎\n"
+"ජෝනෑස් හැජුමැකි <jharjuma@gmail.com>⏎\n"
+"⏎\n"
+"XMMS LIRC පේනු මෘදුකාංගයමත පදනම් විය:⏎\n"
+"Carl van Schaik <carl@leg.uct.ac.za>⏎\n"
+"Christoph Bartelmus <xmms@bartelmus.de>⏎\n"
+"Andrew O. Shadoura <bugzilla@tut.by>⏎\n"
+"⏎\n"
+"LIRC පිළිබඳ වැඩි විස්තර සඳහා,http://lirc.org බලන්න."
+
+#: src/lirc/lirc.c:392
+msgid "Connection"
+msgstr "සබැඳුම"
+
+#: src/lirc/lirc.c:393
+msgid "Reconnect to LIRC server"
+msgstr "සේවාදායකයට ප්‍රතිසම්බන්ධ කරන්න "
+
+#: src/lirc/lirc.c:395
+msgid "Wait before reconnecting:"
+msgstr "ප්‍රතිසම්බන්ධ වීමට පෙර මදක් සිටින්න:"
+
+#: src/lirc/lirc.c:405
+msgid "LIRC Plugin"
+msgstr "LIRC පේනු මෘදුකාංගය"
+
+#: src/lyricwiki/lyricwiki.c:117
+msgid "No lyrics available"
+msgstr "පද රචනා නොමැත"
+
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
+#, c-format
+msgid "Unable to fetch %s"
+msgstr "කැඳවාගෙන යා නොහැක %s"
+
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
+#, c-format
+msgid "Unable to parse %s"
+msgstr "parse කළ නොහැක %s"
+
+#: src/lyricwiki/lyricwiki.c:260
+msgid "Looking for lyrics ..."
+msgstr "පද රචනා සොයමින් පවතී ..."
+
+#: src/lyricwiki/lyricwiki.c:271
+msgid "Missing song metadata"
+msgstr "ගීතයේ metadata නොමැත"
+
+#: src/lyricwiki/lyricwiki.c:284
+msgid "Connecting to lyrics.wikia.com ..."
+msgstr "lyrics.wikia.com වෙත සම්බන්ද වෙමින් පවතී ..."
+
+#: src/lyricwiki/lyricwiki.c:411
+msgid "LyricWiki Plugin"
+msgstr "ලිරික් විකී පේනු මෘදුකාංගය"
+
+#: src/m3u/m3u.c:121
+msgid "M3U Playlists"
+msgstr "M3U ධාවන ලැයිස්තුව"
+
+#: src/metronom/metronom.c:127
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "ටැක්ට් ජනකය: %d මිනිත්තුවට බයිට්ස් "
+
+#: src/metronom/metronom.c:129
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "ටැක්ට් ජනකය: %d මිනිත්තුවට බයිට්ස් %d/%d"
+
+#: src/metronom/metronom.c:246
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr ""
+"මාර්ටින් ස්ට්‍රේස් විසින් චාතුර්යය උත්පාදකක් <mys@faveve.uni-stuttgart.de>⏎\n"
+"⏎\n"
+"භාවිතා කිරීම සඳහා, add a URL: tact://beats*num/den⏎\n"
+"e.g. tact://77 to play 77 beats per minute⏎\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+
+#: src/metronom/metronom.c:255
+msgid "Tact Generator"
+msgstr "ටැක්ට් ජනකය"
+
+#: src/mixer/mixer.c:169
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+"Audacious සඳහා නාලිකා මිශ්‍රන පේනු මෘදුකාංගයක්\n"
+"ප්‍රකාශන අයිතිය 2011-2012 John Lindgren and Michał Lipski"
+
+#: src/mixer/mixer.c:173
+msgid "Channel Mixer"
+msgstr "නාලිකා මිශ්‍රකය"
+
+#: src/mixer/mixer.c:174
+msgid "Output channels:"
+msgstr "ප්‍රතිදාන නාලිකා:"
+
+#: src/mixer/mixer.c:184
+msgid "Channel Mixer"
+msgstr "නාලිකා මිශ්‍රකය"
+
+#: src/mms/mms.c:224
+msgid "MMS Plugin"
+msgstr "MMS පේනු මෘදුකාංගය"
+
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "විභේදනය"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "බිටු-8"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "බිටු-16"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "නාලිකා "
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr " නැවත සාම්පල කිරීම"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "කිට්ටුතම (වේගවත්ම)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "රේඛීය (වේගවත්)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "හිර ඇලිය (යහපත්)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "බහු අදියර (ප්‍රශස්ත)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "සාම්පල ශ්‍රීඝ‍්‍රතාව"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "මට්ටම:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "කපා හැරීම:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "ප්‍රතිනාදකය"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "\tමන්ද්‍රස්වරය වැඩිවීම"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "වටපිටාව"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "ප්‍රාක්වර්ධකය"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "විවිධ"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "අධික සාම්පල"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "ශබ්දය අඩු කිරීම"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Amiga MODs ධාවනය කරන්න "
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "නැවත කිරීම"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "නැවත ගණන් කිරීම"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "සදහටම නැවත නැවත කිරීමට, නැවත වරක් ගණන් කිරීම -1 හි පිහිටුවන්න."
+
+#: src/modplug/plugin_main.c:238
+msgid "ModPlug (Module Player)"
+msgstr "මොඩ් කෙවෙනිය (මොඩියුල ධාවකය)"
+
+#: src/mpg123/mpg123.c:213
+msgid "Surround"
+msgstr "සිසාළ "
+
+#: src/mpg123/mpg123.c:569
+msgid "MPG123 Plugin"
+msgstr "MPG123 පේනු මෘදුකාංගය"
+
+#: src/mpris2/plugin.c:403
+msgid "MPRIS 2 Server"
+msgstr "MPRIS 2 සේවාදායකය"
+
+#: src/neon/neon.c:1228
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr "නිඕන් HTTP/HTTPS පේනු මෘදුකාංගය"
+
+#: src/notify/event.c:64
+msgid "Stopped"
+msgstr "නැවතුන "
+
+#: src/notify/event.c:64
+msgid "Audacious is not playing."
+msgstr "ඔඩෙෂස් ක්‍රියාත්මක නොවේ."
+
+#: src/notify/notify.c:33
+msgid ""
+"Desktop Notifications Plugin for Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Audacious සදහා වැඩතල දැනුම් දීම් පෙනු-මෘදුකාංගය\n"
+"කතු හිමිකම(c) 2010 Maximilian Bogner\n"
+"කතු හිමිකම(c) 2011-2013 Lindgren සහ Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"මෙම පෙනු-මෘදුකාංගය නොමිලේ මෘදුකාංගයකි: ඔබට එය නැවත බෙදාහැරීම සහ/හෝ එයට ෆ්‍රී සොෆ්ට්වෙයා "
+"ෆඋන්ඩේශන් මගින් ප්‍රකාශනය කල GNU පොදු මහජන වරපත අනුවාද 3 හෝ (ඔබගේ තෝරාගැනීම පරිදී) "
+"ඕනෑම පසු අනුවාදයක් යටතේ වෙනස්කම් සිදු කල හැක. \n"
+"\n"
+"මෙම පෙනු-මෘදුකාංගය බෙදා හරින්නේ එය ප්‍රයෝජනවත් වේ යැයි අපේක්ෂාවෙනි, නමුත් කිසිදු වගකීමකින් "
+"තොරවය; විකිණිය හැකි ව්‍යංග්‍ය වගකීම හා අවශ්‍යතාවට සරිලන ව්‍යංග වගකීම ද නොමැතිවය. වැඩි විස්තර "
+"සදහා GNU පොදු මහජන වරපත බලන්න.\n"
+"\n"
+"ඔබට මම මෘදුකාංගය සමග GNU පොදු මහජන වරපතේ පිටපතක් ලැබී තිබිය යුතුය, එසේ නොමැති නම් "
+"<http://www.gnu.org/licenses/>. බලන්න."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "යළි ධාවන පාලන යතුරු පෙන්නන්න "
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "නිතර නිවේදන පෙන්නන්න"
+
+#: src/notify/notify.c:92
+msgid "Desktop Notifications"
+msgstr "වැඩතලය දැනුම් දීම "
+
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "පෙන්නන්න "
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "විරාමය "
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "ඊළඟ "
+
+#: src/oss4/plugin.c:36
+msgid "1. Default device"
+msgstr "1.පෙරනිමි ආම්පන්නය "
+
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
+msgid "Audio device:"
+msgstr "ස්වයංක්‍රිය අම්පන්නය:"
+
+#: src/oss4/plugin.c:77
+msgid "Use alternate device:"
+msgstr "විකල්ප අම්පන්නයක් භාවිතා කරන්න:"
+
+#: src/oss4/plugin.c:81
+msgid "Save volume between sessions."
+msgstr "සැසි අතර ශබ්දය සුරකින්න."
+
+#: src/oss4/plugin.c:83
+msgid "Enable format conversions made by the OSS software."
+msgstr "OSS මෘදුකාංගයෙන් සාදන ලද ආකෘති අනුවර්තන සක්‍රීය කරන්න."
+
+#: src/oss4/plugin.c:85
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "අතාත්වික ඝටනාවෙන් මිදීමට කේවල ප්‍රකාරය සක්‍රිය කරන්න."
+
+#: src/oss4/plugin.c:108
+msgid ""
+"OSS4 Output Plugin for Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"Audacious සඳහා වන OSS4 ප්‍රතිදාන \n"
+"ප්‍රකාශන අයිතිය 2010-2012 Michał Lipski\n"
+"\n"
+"#audacious හි මිනිසුන් වෙත ස්තූති කරමි, විශේෂයෙන් Tony Vroon සහ John Lindgren මෙන්ම පෙර "
+"OSS පේනු මෘදුකාංගයයෙහි කතෘන් හට ."
+
+#: src/oss4/plugin.c:115
+msgid "OSS4 Output"
+msgstr "OSS4 ප්‍රතිදානය"
+
+#: src/pls/pls.c:113
+msgid "PLS Playlists"
+msgstr "PLS ධාවන ලැයිස්තුව"
+
+#: src/psf/plugin.c:264
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr "PSF PSF1/PSF2 විකේතකය විවෘත කරන්න "
+
+#: src/pulse_audio/pulse_audio.c:644
+msgid ""
+"Audacious PulseAudio Output Plugin\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+"Audacious PulseAudio ප්‍රතිදාන පේනු මෘදුකාංගය\n"
+"\n"
+"මෙම මෘදුකාංගය නිදහස් මෘදුකාංගයකි; නිදහස් මෘදුකාංග පදනම විසින් ප්‍රකාශ කරන ලද GNU සාමාන්‍ය "
+"පොදු බලපත්‍රය යටතේ ඔබට මෙය නැවත බෙදා හැරීම හෝ වෙනස් කිරීම කළ හැක; බලපත්‍රයේ 2වන "
+"සංස්කරණය හෝ(ඔබගේ කැමත්ත අනුව) පසු සංස්කරණයක් යටතේ.\n"
+"\n"
+"මෙම මෘදුකාංගය බෙදාහැර ඇත්තේ ප්‍රයෝජනවත් වේ යන බලාපොරොත්තුවෙන් වුවත් වගකීමක් නොමැත; විකිණිය "
+"හැකි හෝ යම් නිශ්චිත අරමුණකට ලෙසවත් ගම්‍යමාන වන වගකීමකින් තොරයි. වැඩි විස්තර සඳහා GNU සාමාන්‍ය "
+"පොදු බලපත්‍රය බලන්න. \n"
+"\n"
+"මෙම මෘදුකාංගය සමග ඔබට GNU සාමාන්‍ය පොදු බලපත්‍රයහි පිටපතක් ලැබිය යුතුයි; නැතිනම් නිදහස් "
+"මෘදුකාංග පදනමට දන්වන්න. Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+
+#: src/pulse_audio/pulse_audio.c:662
+msgid "PulseAudio Output"
+msgstr "ශ්‍රව්‍ය ස්පන්ද ප්‍රතිදානය "
+
+#: src/resample/resample.c:161
+msgid ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"ඔඩෙෂස් සඳහා නියැදි අනුපාත පරිවර්තකය \n"
+"ප්‍රකාශන හිමිකම 2010-2012 ජෝන් ලින්දඩ්ග්රෙන් "
+
+#: src/resample/resample.c:165
+msgid "Skip/repeat samples"
+msgstr "නියැදි මගහැරීම/නැවත කිරීම "
+
+#: src/resample/resample.c:166
+msgid "Linear interpolation"
+msgstr "රේඛිය අන්තර් නිවේෂණය"
+
+#: src/resample/resample.c:167
+msgid "Fast sinc interpolation"
+msgstr "වේගවත් සින්ක් අන්තර් නිවේෂණය"
+
+#: src/resample/resample.c:168
+msgid "Medium sinc interpolation"
+msgstr "මධ්‍යම සින්ක් අන්තර් නිවේෂණය"
+
+#: src/resample/resample.c:169
+msgid "Best sinc interpolation"
+msgstr "හොඳම සින්ක් අන්තර් නිවේෂණය"
+
+#: src/resample/resample.c:172
+msgid "Conversion"
+msgstr "පරිවර්තනය"
+
+#: src/resample/resample.c:173
+msgid "Method:"
+msgstr "ක්‍රමය "
+
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
+msgid "Rate:"
+msgstr "අනුපාතය:"
+
+#: src/resample/resample.c:179
+msgid "Rate Mappings"
+msgstr "අනුපාතය සිතියම්කරණය"
+
+#: src/resample/resample.c:180
+msgid "Use rate mappings"
+msgstr "අනුපාතය සිතියම්කරණය භාවිතා කරන්න"
+
+#: src/resample/resample.c:182
+msgid "8 kHz:"
+msgstr "8 කිලෝ හරට්ස්:"
+
+#: src/resample/resample.c:185
+msgid "16 kHz:"
+msgstr "16 කිලෝ හරට්ස්:"
+
+#: src/resample/resample.c:188
+msgid "22.05 kHz:"
+msgstr "22.05 කිලෝ හරට්ස්:"
+
+#: src/resample/resample.c:191
+msgid "44.1 kHz:"
+msgstr "44.1 කිලෝ හරට්ස්:"
+
+#: src/resample/resample.c:194
+msgid "48 kHz:"
+msgstr "48 කිලෝ හරට්ස්:"
+
+#: src/resample/resample.c:197
+msgid "96 kHz:"
+msgstr "96 කිලෝ හරට්ස්:"
+
+#: src/resample/resample.c:200
+msgid "192 kHz:"
+msgstr "192 කිලෝ හරට්ස්:"
+
+#: src/resample/resample.c:210
+msgid "Sample Rate Converter"
+msgstr "නියැදි අනුපාත පරිවර්තකය "
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "ඔව්. \tපරිශ්‍රීලක: %s සදහා භාවිත දත්ත සුරකින්න"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "අනුමැතිය තහනම් කිරීම "
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr "Audacious සදහා භාවිත දත්ත සුරකීමට මෙම අමුණට පිවිසෙන්න :"
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr "මම කවුළුව විවෘතව තබා 'අවසර පිරික්සන්න' නැවත ක්ලික් කරන්න\n"
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"කණගාටු නොවන්න ඔබගේ භාවිත දත්ත ඔබගේ පරිගණකයේ ම සුරක්ෂිත කරයි.\n"
+"ඒවා Audacious සදහා අවසර ලැබුණු වහාම සුරක්ෂිත වේ"
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "ජාල ගැටළු."
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "අවසානයට සම්බන්ධ වීමේ ගැටළුවක් විය.fm.කරුණාකර පසුව නැවත උත්සහ කරන්න "
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "පිරික්සන..."
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "C_heck අනුමැතිය "
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_අනුමැතිය අවලංගු කිරීම "
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr "ඔබ ඔඩෙෂස් හට ඔබගේ අවසාන fm ගිණුමෙන් ගීත ලබා ගැනීමට අවසර දිය යුතුය.\n"
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Scrobbler පේනු මෘදුකාංගය ඇරභිය නොහැකිය.⏎\n"
+"සමහරවිට ඔබගේ පිහිටැවුමෙහි ගැටලුවක් ඇත."
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Pitxyoki විසින් Audacious Scrobbler පේනු මෘදුකාංගය,\n"
+"\n"
+"ප්‍රකාශන අයිතිය © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "ස්ක්රෝබ්ලර් 2.0"
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious අවසානයට වැඩි දියුණුකළ අනුවාදය භාවිත කරයි.fm Scrobbler.⏎ \n"
+"කරුණාකර Scrobbler පේනු මෘදුකාංගයේ අභිරුචිය පරීක්ෂා කර බලන්න."
+
+#: src/sdlout/plugin.c:26
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"Audacious සඳහා වන SDL ප්‍රතිදාන පේනු මෘදුකාංගය\n"
+"ප්‍රකාශන අයිතිය 2010 ජෝන් ලින්ඩ්ග්‍රෙන්"
+
+#: src/sdlout/plugin.c:31
+msgid "SDL Output"
+msgstr "SDL ප්‍රතිදානය"
+
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
+msgid "Library"
+msgstr "පුස්තකාලය "
+
+#: src/search-tool/search-tool.c:219
+msgid "Unknown Artist"
+msgstr "නාඳුනන ශිල්පියා"
+
+#: src/search-tool/search-tool.c:221
+msgid "Unknown Album"
+msgstr "නාඳුනන ඇල්බමය "
+
+#: src/search-tool/search-tool.c:632
+#, c-format
+msgid ""
+"%s\n"
+" on %s by %s"
+msgstr ""
+"%s\n"
+"මතුපිට %s විසින් %s"
+
+#: src/search-tool/search-tool.c:638
+#, c-format
+msgid "%d album"
+msgid_plural "%d albums"
+msgstr[0] "%d ඇල්බමය "
+msgstr[1] "%d ඇල්බම"
+
+#: src/search-tool/search-tool.c:640
+#, c-format
+msgid ""
+"%s\n"
+" %s, %d song"
+msgid_plural ""
+"%s\n"
+" %s, %d songs"
+msgstr[0] ""
+"%s⏎\n"
+"%s, %d ගීතය "
+msgstr[1] ""
+"%s\n"
+"%s, %d ගීත "
+
+#: src/search-tool/search-tool.c:646
+#, c-format
+msgid ""
+"%s\n"
+" %d song by %s"
+msgid_plural ""
+"%s\n"
+" %d songs by %s"
+msgstr[0] ""
+"%s\n"
+"%d ගීතයෙන් %s"
+msgstr[1] ""
+"%s⏎\n"
+"%d ගීත වලින් %s"
+
+#: src/search-tool/search-tool.c:687
+msgid "_Create Playlist"
+msgstr "_ධාවන ලැයිස්තුව තනන්න "
+
+#: src/search-tool/search-tool.c:694
+msgid "_Add to Playlist"
+msgstr "_ධාවන ලැයිස්තුවට එකතු කරන්න "
+
+#: src/search-tool/search-tool.c:734
+msgid "Search library"
+msgstr "පුස්තකාලය සොයන්න "
+
+#: src/search-tool/search-tool.c:739
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"ඔඩෙෂස් තුලට ඔබගේ ගීත පුස්තකාලය ආයාත කිරීමට, ෆෝල්ඩරයක් තෝරා \"නැවුම් කරන්න\" නිරූපකය ඔබන්න."
+
+#: src/search-tool/search-tool.c:747
+msgid "Please wait ..."
+msgstr "කරුණාකර රැඳී සිටින්න ..."
+
+#: src/search-tool/search-tool.c:769
+msgid "Choose Folder"
+msgstr "ෆෝල්ඩරය තෝරන්න "
+
+#: src/search-tool/search-tool.c:808
+msgid "Search Tool"
+msgstr "සෙවීමේ මෙවලම "
+
+#: src/skins/plugin.c:49
+msgid "Winamp Classic Interface"
+msgstr "Winamp සම්භාව්‍ය අතුරු මුහුණත"
+
+#: src/skins/skins_cfg.c:204
+msgid "_Player:"
+msgstr "_ධාවකය:"
+
+#: src/skins/skins_cfg.c:205
+msgid "Select main player window font:"
+msgstr "කවුළු ෆොන්ටයේ ප්‍රධාන ධාවකය තෝරන්න:"
+
+#: src/skins/skins_cfg.c:207
+msgid "_Playlist:"
+msgstr "_ධාවන ලැස්තුව:"
+
+#: src/skins/skins_cfg.c:208
+msgid "Select playlist font:"
+msgstr "ධාවන ලැස්තු ෆොන්ටය තෝරන්න:"
+
+#: src/skins/skins_cfg.c:212
+msgid "_Fonts"
+msgstr "_ ෆොන්ටය"
+
+#: src/skins/skins_cfg.c:215
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "බිට්මැප් ෆොන්ට භාවිතා කරන්න (ASCII පමණක් සහය වන )"
+
+#: src/skins/skins_cfg.c:217
+msgid "Scroll song title in both directions"
+msgstr "ගීත තේමාව දෙපසට චලනය කරන්න "
+
+#: src/skins/skins_cfg.c:295
+msgid "_Skin"
+msgstr "_මතුපිට"
+
+#: src/skins/skins_cfg.c:342
+msgid "Interface Preferences"
+msgstr "අතුරු මුහුණත් අභිරුචි "
+
+#: src/skins/ui_equalizer.c:328
+msgid "Preamp"
+msgstr "පූර්ව වර්ධකය"
+
+#: src/skins/ui_equalizer.c:332
+msgid "31 Hz"
+msgstr "31 හරට්ස් "
+
+#: src/skins/ui_equalizer.c:333
+msgid "63 Hz"
+msgstr "63 හරට්ස් "
+
+#: src/skins/ui_equalizer.c:333
+msgid "125 Hz"
+msgstr "125 හරට්ස් "
+
+#: src/skins/ui_equalizer.c:333
+msgid "250 Hz"
+msgstr "250 හරට්ස් "
+
+#: src/skins/ui_equalizer.c:333
+msgid "500 Hz"
+msgstr "500 හරට්ස් "
+
+#: src/skins/ui_equalizer.c:333
+msgid "1 kHz"
+msgstr "1 හරට්ස් "
+
+#: src/skins/ui_equalizer.c:334
+msgid "2 kHz"
+msgstr "2 හරට්ස් "
+
+#: src/skins/ui_equalizer.c:334
+msgid "4 kHz"
+msgstr "4 හරට්ස් "
+
+#: src/skins/ui_equalizer.c:334
+msgid "8 kHz"
+msgstr "8 හරට්ස් "
+
+#: src/skins/ui_equalizer.c:334
+msgid "16 kHz"
+msgstr "16 හරට්ස් "
+
+#: src/skins/ui_equalizer.c:375
+msgid "Audacious Equalizer"
+msgstr "ඔඩෙෂස් ඉකුවලිසරය "
+
+#: src/skins/ui_equalizer.c:890
+msgid "Presets"
+msgstr "පෙර සකසන ලද "
+
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
+msgid "Load preset"
+msgstr "පෙර සකසනය ප්‍රවේශනය කරන්න "
+
+#: src/skins/ui_equalizer.c:988
+msgid "Load auto-preset"
+msgstr "පෙර සකසන-ස්වයංක්‍රිය ප්‍රවේශනය"
+
+#: src/skins/ui_equalizer.c:1018 src/skins/ui_equalizer.c:1036
+#: src/skins/ui_equalizer.c:1052
+msgid "Load equalizer preset"
+msgstr "පෙර සකසන ඉකුවලිසරය ප්‍රවේශනය"
+
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
+msgid "Save preset"
+msgstr "පෙර සකසනය සුරකින්න "
+
+#: src/skins/ui_equalizer.c:1087
+msgid "Save auto-preset"
+msgstr "පෙර සකසනය-ස්වයංක්‍රියව සුරකින්න"
+
+#: src/skins/ui_equalizer.c:1118 src/skins/ui_equalizer.c:1154
+msgid "Save equalizer preset"
+msgstr "පෙර සකසන ඉකුවලිසරය සුරකින්න"
+
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
+msgid "Delete preset"
+msgstr "පෙර සකසනය මකන්න"
+
+#: src/skins/ui_equalizer.c:1190
+msgid "Delete auto-preset"
+msgstr "පෙර සකසනය-ස්වයංක්‍රියව මකන්න"
+
+#: src/skins/ui_main.c:414
+msgid "kbps"
+msgstr "තත්පරයට කිලෝ බයිට්ස් "
+
+#: src/skins/ui_main.c:422
+msgid "kHz"
+msgstr " කිලෝ හරට්ස් "
+
+#: src/skins/ui_main.c:770
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "සොයනවා %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/ui_main.c:791
+#, c-format
+msgid "Volume: %d%%"
+msgstr "ශබ්ද මට්ටම : %d%%"
+
+#: src/skins/ui_main.c:814
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "තුලනය : %d%% වමට "
+
+#: src/skins/ui_main.c:816
+msgid "Balance: center"
+msgstr "තුලනය: මැදට "
+
+#: src/skins/ui_main.c:818
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "තුලනය: %d%% දකුණට "
+
+#: src/skins/ui_main.c:942
+msgid "Options Menu"
+msgstr "විකල්ප මෙනුව "
+
+#: src/skins/ui_main.c:946
+msgid "Disable 'Always On Top'"
+msgstr "අක්‍රිය කරන්න 'සැමවිටම ඉහළ '"
+
+#: src/skins/ui_main.c:948
+msgid "Enable 'Always On Top'"
+msgstr "සක්‍රිය කරන්න 'සැමවිටම ඉහළ '"
+
+#: src/skins/ui_main.c:951
+msgid "File Info Box"
+msgstr "ගොනු තොරතුරු පෙට්ටිය "
+
+#: src/skins/ui_main.c:956
+msgid "Visualization Menu"
+msgstr "දෘෂ්ටි කල්පන මෙනුව "
+
+#: src/skins/ui_main.c:1591
+msgid "Single mode."
+msgstr "තනි ප්‍රකාරය."
+
+#: src/skins/ui_main.c:1593
+msgid "Playlist mode."
+msgstr "ධාවන ලැස්තු ප්‍රකාරය."
+
+#: src/skins/ui_main.c:1615
+msgid "Stopping after song."
+msgstr "ගීතයකින් පසු නැවතීම."
+
+#: src/skins/ui_main.c:1617
+msgid "Not stopping after song."
+msgstr "ගීතයකින් පසු නොනැවතීම."
+
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "පුනරාවර්ථන ස්ථානය A කුලකය."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "පුනරාවර්ථන ස්ථානය B කුලකය."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "පුනරාවර්ථන ස්ථාන හිස් කරන ලදී."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
+msgid "Autoscroll Song Name"
+msgstr "ගීතයේ නමෙන් ස්වයංක්‍රියව අනුචලනය කිරීම"
+
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
+msgid "Stop after Current Song"
+msgstr "පවතින ගීතයෙන් පසු නැවතීම "
+
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
+msgid "Peaks"
+msgstr "කාර්යබහුල "
+
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
+msgid "Repeat"
+msgstr "නැවත කරන්න "
+
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
+msgid "Shuffle"
+msgstr "කලවම් කරන්න "
+
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
+msgid "No Playlist Advance"
+msgstr "ධාවන ලැස්තු නැත "
+
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
+msgid "Show Player"
+msgstr "ධාවකය පෙන්වන්න "
+
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
+msgid "Show Playlist Editor"
+msgstr "ධාවන ලැස්තු සකසනය පෙන්වන්න "
+
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
+msgid "Show Equalizer"
+msgstr " ඉකුවලිසරය පෙන්වන්න "
+
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
+msgid "Always on Top"
+msgstr "සැමවිටම ඉහළ"
+
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
+msgid "Put on All Workspaces"
+msgstr "කාර්ය ඉඩ තබන්න "
+
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
+msgid "Roll up Player"
+msgstr "ධාවකය ඉහළට රැගෙනයන්න "
+
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
+msgid "Roll up Playlist Editor"
+msgstr "ධාවන ලැස්තු සකසනය ඉහළට රැගෙනයන්න "
+
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
+msgid "Roll up Equalizer"
+msgstr "ඉකුවලිසරය ඉහළට රැගෙනයන්න "
+
+#: src/skins/ui_manager.c:114
+msgid "Analyzer"
+msgstr "විශ්ලේශකය "
+
+#: src/skins/ui_manager.c:115
+msgid "Scope"
+msgstr "විෂය පථය "
+
+#: src/skins/ui_manager.c:116
+msgid "Voiceprint"
+msgstr "හඬ මුද්‍රණ"
+
+#: src/skins/ui_manager.c:117
+msgid "Off"
+msgstr "වහනවා "
+
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
+msgid "Normal"
+msgstr "සාමාන්‍ය "
+
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+msgid "Fire"
+msgstr "දල්වනවා "
+
+#: src/skins/ui_manager.c:123
+msgid "Vertical Lines"
+msgstr "සිරස් රේඛා"
+
+#: src/skins/ui_manager.c:127
+msgid "Lines"
+msgstr " රේඛා"
+
+#: src/skins/ui_manager.c:128
+msgid "Bars"
+msgstr "තීරු "
+
+#: src/skins/ui_manager.c:132
+msgid "Dot Scope"
+msgstr "තිත් සහිත විෂය පථය"
+
+#: src/skins/ui_manager.c:133
+msgid "Line Scope"
+msgstr " රේඛා සහිත විෂය පථය"
+
+#: src/skins/ui_manager.c:134
+msgid "Solid Scope"
+msgstr "ඝන විෂය පථය"
+
+#: src/skins/ui_manager.c:140
+msgid "Ice"
+msgstr "හිම "
+
+#: src/skins/ui_manager.c:145
+msgid "Smooth"
+msgstr "මෘදු "
+
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
+msgid "Slowest"
+msgstr "මන්දගාමිම "
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slow"
+msgstr "මන්දගාමි"
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
+msgid "Medium"
+msgstr "මධ්‍යම "
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Fast"
+msgstr "වේගවත් "
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fastest"
+msgstr "වේගවත්ම "
+
+#: src/skins/ui_manager.c:165
+msgid "Time Elapsed"
+msgstr "ගතවූ කාළය "
+
+#: src/skins/ui_manager.c:166
+msgid "Time Remaining"
+msgstr "ඉතුරුවී ඇති කාළය "
+
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
+msgid "Previous"
+msgstr "පෙර "
+
+#: src/skins/ui_manager.c:195
+msgid "Visualization"
+msgstr "දෘෂ්ටි කල්පනය "
+
+#: src/skins/ui_manager.c:196
+msgid "Visualization Mode"
+msgstr "දෘෂ්ටි කල්පන ප්‍රකාරය "
+
+#: src/skins/ui_manager.c:197
+msgid "Analyzer Mode"
+msgstr "විශ්ලේශකය ප්‍රකාරය "
+
+#: src/skins/ui_manager.c:198
+msgid "Scope Mode"
+msgstr "විෂය පථ ප්‍රකාරය "
+
+#: src/skins/ui_manager.c:199
+msgid "Voiceprint Mode"
+msgstr "හඬ මුද්‍රණ ප්‍රකාරය "
+
+#: src/skins/ui_manager.c:200
+msgid "WindowShade VU Mode"
+msgstr "කවුළු ඡායා VU ප්‍රකාරය "
+
+#: src/skins/ui_manager.c:201
+msgid "Analyzer Falloff"
+msgstr "විශ්ලේශකය අඩුවීම "
+
+#: src/skins/ui_manager.c:202
+msgid "Peaks Falloff"
+msgstr "කාර්යබහුල බව අඩුවීම "
+
+#: src/skins/ui_manager.c:207
+msgid "Playlist"
+msgstr "ධාවන ලැයිස්තුව"
+
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
+msgid "Play Playlist"
+msgstr "ධාවන ලැයිස්තුව ධාවනය කරන්න"
+
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
+msgid "New Playlist"
+msgstr "නව ධාවන ලැයිස්තුව"
+
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
+msgid "Select Next Playlist"
+msgstr "ඊළඟ ධාවන ලැයිස්තුව තෝරන්න"
+
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
+msgid "Select Previous Playlist"
+msgstr " පෙර ධාවන ලැයිස්තුව තෝරන්න"
+
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
+msgid "Delete Playlist"
+msgstr "ධාවන ලැයිස්තුව මකන්න "
+
+#: src/skins/ui_manager.c:224
+msgid "Import Playlist"
+msgstr "ධාවන ලැයිස්තුව ආයාත කරන්න "
+
+#: src/skins/ui_manager.c:225
+msgid "Loads a playlist file into the selected playlist."
+msgstr "ධාවන ලැයිස්තු ගොනුව තෝරන ලද ධාවන ලැයිස්තුවට ප්‍රවේශනය කරන්න."
+
+#: src/skins/ui_manager.c:228
+msgid "Export Playlist"
+msgstr "ධාවන ලැයිස්තුව නිර්යාත කරන්න"
+
+#: src/skins/ui_manager.c:229
+msgid "Saves the selected playlist."
+msgstr "තෝරන ලද ධාවන ලැයිස්තුව සුරකින්න."
+
+#: src/skins/ui_manager.c:231
+msgid "Refresh List"
+msgstr "ලැස්තුව නැවුම් කරන්න "
+
+#: src/skins/ui_manager.c:232
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr " ධාවන ලැයිස්තු පිවිසුම හා සබැදි පාරදත්ත නැවුම් කරන්න."
+
+#: src/skins/ui_manager.c:235
+msgid "Playlist Manager"
+msgstr "ධාවන ලැයිස්තු කළමනාකරණය "
+
+#: src/skins/ui_manager.c:238
+msgid "Queue Manager"
+msgstr "පෙළගැස්ම කළමනාකරණය "
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "දක්වන්න "
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "අතුරු මුහුණත"
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr "අතුරු මුහුණත් අභිරුචි ..."
+
+#: src/skins/ui_manager.c:250
+msgid "Add Internet Address..."
+msgstr "අන්තර්ජාල යොමුව එක්කරන්න ..."
+
+#: src/skins/ui_manager.c:251
+msgid "Adds a remote track to the playlist."
+msgstr " ධාවන ලැයිස්තුවට දුරස්ථ ඛණ්ඩය එකතු කරන්න "
+
+#: src/skins/ui_manager.c:254
+msgid "Add Files..."
+msgstr "ගොනු එකතු කරන්න..."
+
+#: src/skins/ui_manager.c:255
+msgid "Adds files to the playlist."
+msgstr "ධාවන ලැයිස්තුවට ගොනු එකතු කරන්න"
+
+#: src/skins/ui_manager.c:260
+msgid "Search and Select"
+msgstr "සොයන්න සහ තෝරන්න "
+
+#: src/skins/ui_manager.c:261
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr "ධාවන ලැයිස්තුව සොයා නිශ්චිත නිර්ණායක මත ධාවන ලැයිස්තු පිවීසුම තෝරන්න "
+
+#: src/skins/ui_manager.c:264
+msgid "Invert Selection"
+msgstr "වරණය පෙරලන්න "
+
+#: src/skins/ui_manager.c:265
+msgid "Inverts the selected and unselected entries."
+msgstr "තෝරාගත් සහ තෝරානොගත් පිවිසුම් පෙරළන්න."
+
+#: src/skins/ui_manager.c:268
+msgid "Select All"
+msgstr "සියල්ල තෝරන්න"
+
+#: src/skins/ui_manager.c:269
+msgid "Selects all of the playlist entries."
+msgstr "ධාවන ලැස්තු පිවිසුමේ සියල්ල තෝරන්න."
+
+#: src/skins/ui_manager.c:272
+msgid "Select None"
+msgstr "කිසිවක් තෝරානොගන්න "
+
+#: src/skins/ui_manager.c:273
+msgid "Deselects all of the playlist entries."
+msgstr "ධාවන ලැයිස්තු පිවිසුම් සියල්ලෙහි තෝරාගැනීම ඉවත් කරන්න."
+
+#: src/skins/ui_manager.c:278
+msgid "Remove All"
+msgstr "සියල්ල ඉවත් කරන්න "
+
+#: src/skins/ui_manager.c:279
+msgid "Removes all entries from the playlist."
+msgstr "සියලු පිවිසුම් ධාවන ලැයිස්තුවෙන් ඉවත් කරන්න."
+
+#: src/skins/ui_manager.c:282
+msgid "Clear Queue"
+msgstr "පෙළගැස්ම හිස් කරන්න"
+
+#: src/skins/ui_manager.c:283
+msgid "Clears the queue associated with this playlist."
+msgstr "ධාවන ලැයිස්තුව හා සබැදි පෙළගැස්ම හිස් කරන්න."
+
+#: src/skins/ui_manager.c:286
+msgid "Remove Unavailable Files"
+msgstr "අනුපයෝජ්‍ය ගොනු ඉවත් කරන්න "
+
+#: src/skins/ui_manager.c:287
+msgid "Removes unavailable files from the playlist."
+msgstr "අනුපයෝජ්‍ය ගොනු ධාවන ලැයිස්තුවෙන් ඉවත් කරන්න."
+
+#: src/skins/ui_manager.c:290
+msgid "Remove Duplicates"
+msgstr "ද්විකරණ ඉවත් කරන්න "
+
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
+msgid "By Title"
+msgstr "මාතෘකාවෙන් "
+
+#: src/skins/ui_manager.c:293
+msgid "Removes duplicate entries from the playlist by title."
+msgstr "ද්විකරණ පිවිසුම් ධාවන ලැයිස්තුමාතෘකාවෙන් ඉවත් කරන්න."
+
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
+msgid "By Filename"
+msgstr "ගොනු නාමයෙන් "
+
+#: src/skins/ui_manager.c:297
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr "ද්විකරණ පිවිසුම් ධාවන ලැයිස්තු ගොනු නාමයෙන් ඉවත් කරන්න."
+
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
+msgid "By Path + Filename"
+msgstr "පථයෙන් + ගොනු නාමයෙන්"
+
+#: src/skins/ui_manager.c:301
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr "ද්විකරණ පිවිසුම් ධාවන ලැයිස්තුවේ සම්පුර්ණ පථයෙන් ඉවත් කරන්න."
+
+#: src/skins/ui_manager.c:304
+msgid "Remove Unselected"
+msgstr "තෝරානොගත් ඒවා ඉවත් කරන්න "
+
+#: src/skins/ui_manager.c:305
+msgid "Remove unselected entries from the playlist."
+msgstr "තෝරානොගත් පිවිසුම් ධාවන ලැයිස්තුවෙන් ඉවත් කරන්න "
+
+#: src/skins/ui_manager.c:308
+msgid "Remove Selected"
+msgstr "තෝරාගත් ඒවා ඉවත් කරන්න "
+
+#: src/skins/ui_manager.c:309
+msgid "Remove selected entries from the playlist."
+msgstr "තෝරාගත් පිවිසුම් ධාවන ලැයිස්තුවෙන් ඉවත් කරන්න."
+
+#: src/skins/ui_manager.c:314
+msgid "Randomize List"
+msgstr "සසම්භාවී ධාවන ලැයිස්තුව "
+
+#: src/skins/ui_manager.c:315
+msgid "Randomizes the playlist."
+msgstr " ධාවන ලැයිස්තුව සසම්භාවීව තෝරන්න."
+
+#: src/skins/ui_manager.c:318
+msgid "Reverse List"
+msgstr "ලැස්තුවේ ආපස්සට යන්න "
+
+#: src/skins/ui_manager.c:319
+msgid "Reverses the playlist."
+msgstr " ධාවන ලැස්තුවේ ආපස්සට යන්න."
+
+#: src/skins/ui_manager.c:322
+msgid "Sort List"
+msgstr "ලැයිස්තුව අනුපිළිවලට සකසන්න "
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "Sorts the list by title."
+msgstr "ලැයිස්තුව මාතෘකාවෙන් අනුපිළිවලට සකසන්න."
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+msgid "By Album"
+msgstr "ඇල්බමයෙන් "
+
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+msgid "Sorts the list by album."
+msgstr "ඇල්බමයෙන් ලැයිස්තුව අනුපිළිවලට සකසන්න."
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+msgid "By Artist"
+msgstr "ශිල්පියාගෙන් "
+
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+msgid "Sorts the list by artist."
+msgstr "ශිල්පියාගෙන් ලැයිස්තුව අනුපිළිවලට සකසන්න."
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "Sorts the list by filename."
+msgstr "ගොනු නාමයෙන් ලැයිස්තුව අනුපිළිවලට සකසන්න."
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "Sorts the list by full pathname."
+msgstr "පථ නාමයෙන් ලැයිස්තුව අනුපිළිවලට සකසන්න."
+
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+msgid "By Date"
+msgstr "දිනයෙන් "
+
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+msgid "Sorts the list by modification time."
+msgstr "විකරණ වේලාව අනුව ලැයිස්තුව අනුපිළිවලට සකසන්න."
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+msgid "By Track Number"
+msgstr "ඛණ්ඩ අංකයෙන් "
+
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+msgid "Sorts the list by track number."
+msgstr "ඛණ්ඩ අංකයෙන් ලැයිස්තුව අනුපිළිවලට සකසන්න."
+
+#: src/skins/ui_manager.c:352
+msgid "Sort Selected"
+msgstr "තෝරාගත් අනුපිළිවලට "
+
+#: src/skins/ui_manager.c:388
+msgid "File"
+msgstr "ගොනුව "
+
+#: src/skins/ui_manager.c:391
+msgid "Plugin Services"
+msgstr "පේනු මෘදුකාංග සේවාවන් "
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View Track Details"
+msgstr "ඛණ්ඩ තොරතුරු දක්වන්න "
+
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+msgid "View track details"
+msgstr "ඛණ්ඩ තොරතුරු දක්වන්න"
+
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
+msgid "About Audacious"
+msgstr "ඔඩෙෂස් ගැන "
+
+#: src/skins/ui_manager.c:402
+msgid "Play File"
+msgstr "ගොනුව ධාවනය කරන්න"
+
+#: src/skins/ui_manager.c:403
+msgid "Load and play a file"
+msgstr "ප්‍රවේශනය කර ගොනුව ධාවනය කරන්න"
+
+#: src/skins/ui_manager.c:405
+msgid "Play Location"
+msgstr "නිශ්චනය ධාවනය කරන්න"
+
+#: src/skins/ui_manager.c:406
+msgid "Play media from the selected location"
+msgstr "තෝරාගත් නිශ්චනයෙන් මාධ්‍යය ධාවනය කරන්න"
+
+#: src/skins/ui_manager.c:408
+msgid "Plugin services"
+msgstr "පේනු මෘදුකාංග සේවාවන්"
+
+#: src/skins/ui_manager.c:410
+msgid "Preferences"
+msgstr "අභිරුචි"
+
+#: src/skins/ui_manager.c:411
+msgid "Open preferences window"
+msgstr "අභිරුචි කවුළුව විවර කරන්න "
+
+#: src/skins/ui_manager.c:414
+msgid "Quit Audacious"
+msgstr "ඔඩෙෂස් තුලින් නික්මෙන්න "
+
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
+msgid "Set A-B"
+msgstr "A-B කුලකය "
+
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
+msgid "Clear A-B"
+msgstr "A-B හිස් කරන්න "
+
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "මගහැර ගොනුවට පිවිසෙන්න "
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
+msgid "Jump to Time"
+msgstr "මගහැර වේලාවට පිවිසෙන්න"
+
+#: src/skins/ui_manager.c:428
+msgid "Queue Toggle"
+msgstr "ටොගල පෙළගැස්ම "
+
+#: src/skins/ui_manager.c:429
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr " ධාවන ලැස්තුවේ පෙළගැස්මේ පිවිසුම සක්‍රිය/අක්‍රිය කරන්න."
+
+#: src/skins/ui_manager.c:432
+msgid "Copy"
+msgstr "පිටපත් කරන්න "
+
+#: src/skins/ui_manager.c:435
+msgid "Cut"
+msgstr "කපන්න "
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "අලවන්න "
+
+#: src/skins/ui_manager.c:445
+msgid "Load"
+msgstr "ප්‍රවේශනය "
+
+#: src/skins/ui_manager.c:446
+msgid "Import"
+msgstr "ආයාත කරන්න "
+
+#: src/skins/ui_manager.c:447
+msgid "Save"
+msgstr "සුරකින්න "
+
+#: src/skins/ui_manager.c:448
+msgid "Delete"
+msgstr "මකන්න "
+
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
+msgid "Preset"
+msgstr "පෙර සකසන"
+
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
+msgid "Auto-load preset"
+msgstr "ස්වයංක්‍රිය පෙර සකසනය ප්‍රවේශනය කරන්න "
+
+#: src/skins/ui_manager.c:454
+msgid "Load auto-load preset"
+msgstr "ස්වයංක්‍රිය ප්‍රවේශනය-පෙර සකසනය ප්‍රවේශනය "
+
+#: src/skins/ui_manager.c:457
+msgid "Load default preset into equalizer"
+msgstr "පෙරනිමි පෙර සකසනය ඉකුවලිසරයට ප්‍රවේශනය කරන්න "
+
+#: src/skins/ui_manager.c:459
+msgid "Zero"
+msgstr "බින්දුව "
+
+#: src/skins/ui_manager.c:460
+msgid "Set equalizer preset levels to zero"
+msgstr "ඉකුවලිසරයේ පෙර සකසන මට්ටම බින්දුව ලෙස තබන්නන "
+
+#: src/skins/ui_manager.c:462
+msgid "From file"
+msgstr "ගොනුවෙන් "
+
+#: src/skins/ui_manager.c:463
+msgid "Load preset from file"
+msgstr "පෙර සකසනය ගොනුවෙන් ප්‍රවේශනය කරන්න "
+
+#: src/skins/ui_manager.c:465
+msgid "From WinAMP EQF file"
+msgstr "WinAMP EQF ගොනුවෙන්"
+
+#: src/skins/ui_manager.c:466
+msgid "Load preset from WinAMP EQF file"
+msgstr "පෙර සකසනය WinAMP EQF ගොනුවෙන් ප්‍රවේශනය කරන්න "
+
+#: src/skins/ui_manager.c:468
+msgid "WinAMP Presets"
+msgstr "පෙර සකසන ලද WinAMP"
+
+#: src/skins/ui_manager.c:469
+msgid "Import WinAMP presets"
+msgstr "පෙර සකසන ලද WinAMP ආයාත කරන්න "
+
+#: src/skins/ui_manager.c:475
+msgid "Save auto-load preset"
+msgstr "ස්වයංක්‍රියව සුරකින්න-පෙර සකසනය ප්‍රවේශනය කරන්න "
+
+#: src/skins/ui_manager.c:478
+msgid "Save default preset"
+msgstr "පෙරනිමි පෙර සකසනය සුරකින්න "
+
+#: src/skins/ui_manager.c:480
+msgid "To file"
+msgstr "ගොනුවට "
+
+#: src/skins/ui_manager.c:481
+msgid "Save preset to file"
+msgstr "පෙර සකසනය ගොනුවට සුරකින්න"
+
+#: src/skins/ui_manager.c:483
+msgid "To WinAMP EQF file"
+msgstr "WinAMP EQF ගොනුවට "
+
+#: src/skins/ui_manager.c:484
+msgid "Save preset to WinAMP EQF file"
+msgstr "පෙර සකසනය WinAMP EQF ගොනුවට සුරකින්න"
+
+#: src/skins/ui_manager.c:490
+msgid "Delete auto-load preset"
+msgstr "ස්වයංක්‍රියව මකන්න-පෙර සකසන ප්‍රවේශනය "
+
+#: src/skins/ui_playlist.c:244
+msgid "Search entries in active playlist"
+msgstr "සක්‍රිය ධාවන ලැයිස්තුවේ පිවිසුම් සොයන්න "
+
+#: src/skins/ui_playlist.c:251
+msgid ""
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr ""
+"ධාවන ලැයිස්තුවේ පිවිසුම්, ක්ෂේත්‍ර එකක් හෝ වැඩි ගණනක් ගොනු කිරිමනේ තෝරන්න. ක්ෂේත්‍ර විධිමත් ප්‍රකාශන "
+"වාග් රීති, අකුරු තටු-සංවේදී නැති භාවිතා කරයි. ඔබට විධිමත් ප්‍රකාශන වාග් රීති ක්‍රියාත්මක වන ආකාරය "
+"පිළිබඳ අවබෝධයක් නැති නම්, ඔබ සොයන වචන කොටස ඇතුල් කරන්න."
+
+#: src/skins/ui_playlist.c:259
+msgid "Title: "
+msgstr "මාතෘකාව:"
+
+#: src/skins/ui_playlist.c:267
+msgid "Album: "
+msgstr "ඇල්බමය:"
+
+#: src/skins/ui_playlist.c:275
+msgid "Artist: "
+msgstr "ශිල්පියා:"
+
+#: src/skins/ui_playlist.c:283
+msgid "Filename: "
+msgstr "ගොනු නාමය:"
+
+#: src/skins/ui_playlist.c:292
+msgid "Clear previous selection before searching"
+msgstr "පෙර තේරීම සෙවීමට පෙර හිස් කරන්න "
+
+#: src/skins/ui_playlist.c:295
+msgid "Automatically toggle queue for matching entries"
+msgstr "ගැලපෙන පිවිසුම් සඳහා ස්වයංක්‍රියව පෙළගැස්ම ටෝගල කරන්න "
+
+#: src/skins/ui_playlist.c:298
+msgid "Create a new playlist with matching entries"
+msgstr "ගැලපෙන පිවිසුම් සමග නව ධාවන ලැයිස්තුව තනන්න "
+
+#: src/skins/ui_playlist.c:738
+msgid "Audacious Playlist Editor"
+msgstr "ඔඩෙෂස් ධාවන ලැස්තු සකසනය "
+
+#: src/skins/ui_playlist.c:772
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d ගෙන් %d)"
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr "සංරක්ෂිත Winamp 2.x මතුපිට "
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr "සංරක්ෂණය නොකරන ලද Winamp 2.x මතුපිට"
+
+#: src/skins/util.c:773
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr "නාමාවලිය නිර්මාණය කීරීමට නොහැකිය (%s): %s\n"
+
+#: src/sndfile/plugin.c:416
+msgid ""
+"Based on the xmms_sndfile plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"xmms_sndfile පේනු මෘදුකාංගය මත පදනම් වී ඇත:\n"
+"ප්‍රකාශන අයිතිය (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Audacious සඳහා ඇතුලත් කරන ලද්දේ Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"මෙම මෘදුකාංගය නිදහස් මෘදුකාංගයකි; නිදහස් මෘදුකාංග පදනම විසින් ප්‍රකාශ කරන ලද GNU සාමාන්‍ය "
+"පොදු බලපත්‍රය යටතේ ඔබට මෙය නැවත බෙදා හැරීම හෝ වෙනස් කිරීම කළ හැක; බලපත්‍රයේ 2වන "
+"සංස්කරණය හෝ(ඔබගේ කැමත්ත අනුව) පසු සංස්කරණයක් යටතේ.\n"
+"\n"
+"මෙම මෘදුකාංගය බෙදාහැර ඇත්තේ ප්‍රයෝජනවත් වේ යන බලාපොරොත්තුවෙන් වුවත් වගකීමක් නොමැත; විකිණිය "
+"හැකි හෝ යම් නිශ්චිත අරමුණකට ලෙසවත් ගම්‍යමාන වන වගකීමකින් තොරයි. වැඩි විස්තර සඳහා GNU සාමාන්‍ය "
+"පොදු බලපත්‍රය බලන්න. \n"
+"\n"
+"මෙම මෘදුකාංගය සමග ඔබට GNU සාමාන්‍ය පොදු බලපත්‍රයහි පිටපතක් ලැබිය යුතුයි; නැතිනම් නිදහස් "
+"මෘදුකාංග පදනමට දන්වන්න. Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+
+#: src/sndfile/plugin.c:435
+msgid "Sndfile Plugin"
+msgstr "Snd ගොනු පේනු මෘදුකාංගය"
+
+#: src/sndio/sndio.c:172
+msgid "About Sndio Output Plugin"
+msgstr "Sndio ප්‍රතිදාන පේනු මෘදුකාංගය පිළිබඳ"
+
+#: src/sndio/sndio.c:173
+msgid ""
+"Sndio Output Plugin\n"
+"\n"
+"Written by Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Sndio ප්‍රතිදාන පේනු මෘදුකාංගය⏎\n"
+"⏎\n"
+"ලියනු ලැබුවේ තෝමස් ප්ෆැෆ් විසින් <tpfaff@tp76.info>⏎\n"
+
+#: src/sndio/sndio.c:248
+msgid "Unsupported format"
+msgstr "සහාය නොමැති හැඩතලයකි"
+
+#: src/sndio/sndio.c:249
+msgid ""
+"A format not supported by the audio device was requested.\n"
+"\n"
+"Please try again with the sndiod(1) server running."
+msgstr ""
+"ශ්‍රව්‍ය ආම්පන්නයට සහය නොදක්වන හැඩතලයක් අයැදුම් කරන ලදී.⏎\n"
+"⏎\n"
+"sndiod(1) සේවාදායකය ධාවනය වන අතරතුර නැවත උත්සාහ කරන්න."
+
+#: src/sndio/sndio.c:384
+msgid "sndio device"
+msgstr "sndio ආම්පන්නය"
+
+#: src/sndio/sndio.c:400
+msgid "(empty means default)"
+msgstr "(හිස් ව තැබීම යනු පෙරනිමියයි )"
+
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "එකඟයි"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "අවලංගු කිරීම"
+
+#: src/song_change/song_change.c:54
+msgid "Song Change"
+msgstr "ගීත වෙනස්කිරීම "
+
+#: src/song_change/song_change.c:436
+msgid "Command to run when Audacious starts a new song."
+msgstr "ඔඩෙෂස් නව ගීතයක් ආරම්භ කළ විට ධාවනය සඳහා විධානය."
+
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
+msgid "Command:"
+msgstr "විධානය:"
+
+#: src/song_change/song_change.c:442
+msgid "Command to run toward the end of a song."
+msgstr "ගීතයක අවසානය තෙක් ධාවනය සඳහා විධානය."
+
+#: src/song_change/song_change.c:448
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr "ඔඩෙෂස් ධාවන ලැස්තුවේ අවසානයට පැමිණිවිට ධාවනය සඳහා විධානය."
+
+#: src/song_change/song_change.c:454
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr "ගීතයක මාතෘකාව වෙනස් වූ විට ධාවනය සඳහා විධානය (ජාල ප්‍රවාහ මාතෘකා )."
+
+#: src/song_change/song_change.c:460
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command):\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%l: Length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr ""
+"ඔබට පහත දැක්වෙන අනුලකුණු වැල්හි ආකෘති විධානය කිරීමට පෙර ආදේශ කළ හැක\n"
+"(ධාවන ලැයිස්තු විධාන අවසානයේදී ඇතැම්විට සියලුම විධාන ප්‍රයෝජනවත් නොවිය හැක):\n"
+"\n"
+"%F: සංඛ්‍යාතය (හර්ට්ස් වලින්)\n"
+"%c: නාලිකා ගණන \n"
+"%f: ගොනු නාමය (සම්පුර්ණ පථය)\n"
+"%l: ආයාමය (මිලි තත්පර වලින්)\n"
+"%n හෝ %s: ගීතයේ නම \n"
+"%r: අනුපාතය (තත්පරයට බිට්ස් වලින්)\n"
+"%t: ධාවන ලැයිස්තුවේ ස්ථානය (%02d)\n"
+"%p: දැන් ධාවනය වන (1 or 0)\n"
+"%a: ශිල්පියා \n"
+"%b: ඇල්බමය \n"
+"%T: ඛණ්ඩයේ මතෘකාව "
+
+#: src/song_change/song_change.c:487
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr ""
+"කවචය වෙත හුවමාරු කරන ලද පරාමිතික කොටස් ලෙස ප්‍රාවරිකෘත කර ඇත. එය "
+"එසේ නොකරහොත් ආරක්ෂාව පිළිබඳ අවදානමක් පවතී."
+
+#: src/song_change/song_change.c:498
+msgid "Commands"
+msgstr "විධාන:"
+
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Audacious සඳහා වන SoX Resampler පේනු මෘදුකාංගය\n"
+"ප්‍රකාශන අයිතිය 2013 Michał Lipski\n"
+"\n"
+"නියැදි අනුපාත පරිවර්තන පේනු මෘදුකාංගය මත පදනම් වී ඇත:\n"
+"ප්‍රකාශන අයිතිය 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "කඩිනම්"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "පහළ"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "ඉහළ"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "අති- උච්ච"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "ප්‍රශස්තතාව:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "Sox නැවත සාම්පල කිරීම "
+
+#: src/speed-pitch/speed-pitch.c:225
+msgid "Speed and Pitch"
+msgstr "වේගය සහ ස්වරමානය"
+
+#: src/speed-pitch/speed-pitch.c:226
+msgid "Speed:"
+msgstr "වේගය:"
+
+#: src/speed-pitch/speed-pitch.c:229
+msgid "Pitch:"
+msgstr "ස්වරමානය:"
+
+#: src/speed-pitch/speed-pitch.c:264
+msgid "Speed and Pitch"
+msgstr "වේගය සහ ස්වරමානය"
+
+#: src/statusicon/statusicon.c:390
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+"තත්ත්ව සුරුවම් පේනු මෘදුකාංගයක්\n"
+"\n"
+"ප්‍රකාශන අයිතිය 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"ප්‍රකාශන අයිතිය 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"මෙම පේනු මෘදුකාංගය තත්ත්ව සුරුවමක් සපයනු ලබයි, කවුළු කළමනාකාරකයෙහි පද්ධති ට්‍රේ කොටසේ රඳවා "
+"තැබෙන ලෙස."
+
+#: src/statusicon/statusicon.c:397
+msgid "Mouse Scroll Action"
+msgstr "මුසික අනුචලන ක්‍රියාව"
+
+#: src/statusicon/statusicon.c:398
+msgid "Change volume"
+msgstr "ශබ්දය වෙනස්කිරීම "
+
+#: src/statusicon/statusicon.c:401
+msgid "Change playing song"
+msgstr "වාදනය වන ගීතය වෙනස්කිරීම "
+
+#: src/statusicon/statusicon.c:404
+msgid "Other Settings"
+msgstr "අනෙකුත් සැකසුම්"
+
+#: src/statusicon/statusicon.c:405
+msgid "Disable the popup window"
+msgstr "උත්පතන කවුළුව අක්‍රිය කරන්න "
+
+#: src/statusicon/statusicon.c:407
+msgid "Close to the system tray"
+msgstr "පද්ධති තට්ටුවට ආසන්නව "
+
+#: src/statusicon/statusicon.c:409
+msgid "Advance in playlist when scrolling upward"
+msgstr "අනුචලනය ඉහළට සිදුකරන විට ධාවන ලැයිස්තු ප්‍රගමනය "
+
+#: src/statusicon/statusicon.c:418
+msgid "Status Icon"
+msgstr "තත්ව නිරූපකය"
+
+#: src/stereo_plugin/stereo.c:17
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+"Extra Stereo පේනු මෘදුකාංගය\n"
+"\n"
+"Johan Levin විසින්, 1999"
+
+#: src/stereo_plugin/stereo.c:25
+msgid "Extra Stereo"
+msgstr "අතිරේක ත්‍රිමාන"
+
+#: src/stereo_plugin/stereo.c:36
+msgid "Extra Stereo"
+msgstr "අතිරේක ත‍්‍ර‍්‍රිමාණ"
+
+#: src/tonegen/tonegen.c:84
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f හර්ට්ස් "
+
+#: src/tonegen/tonegen.c:84
+msgid "Tone Generator: "
+msgstr "ස්වර ජනකය:"
+
+#: src/tonegen/tonegen.c:197
+msgid ""
+"Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
+msgstr ""
+"Sine tone ජනකය Håvard Kvålen විසින් <havardk@xmms.org>\n"
+"වෙනස් කරන ලද්දේ Daniel J. Peng විසින් <danielpeng@bigfoot.com>\n"
+"\n"
+"භාවිතා කිරීම සඳහා, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
+
+#: src/tonegen/tonegen.c:206
+msgid "Tone Generator"
+msgstr "ස්වර ජනකය"
+
+#: src/unix-io/unix-io.c:243
+msgid ""
+"File I/O Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
+msgstr ""
+"Audacious සඳහා වන ගොනු ආදාන ප්‍රතිදාන පේනු මෘදුකාංගය\n"
+"ප්‍රකාශන අයිතිය 2009-2012 John Lindgren\n"
+"\n"
+"මෙම පේනු මෘදුකාංගය අත්‍යවශ්‍යයයි. ක්‍රියා විරහිත නොකරන්න."
+
+#: src/unix-io/unix-io.c:266
+msgid "File I/O Plugin"
+msgstr "ගොනු ආදාන ප්‍රතිදාන පේනු මෘදුකාංගය"
+
+#: src/voice_removal/voice_removal.c:58
+msgid "Voice Removal"
+msgstr "කටහඬ ඉවත් කිරීම"
+
+#: src/vorbis/vorbis.c:562
+msgid ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Based on the Xiph.org Foundation's Ogg Vorbis Plugin:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Original code by:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contributions from:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Audacious Ogg Vorbis විකේතකය\n"
+"\n"
+"Xiph.org Foundation's Ogg Vorbis පේනු මෘදුකාංගය මත පදනම් වී ඇත:\n"
+"http://www.xiph.org/\n"
+"\n"
+"මූලික කේතය කරනු ලැබුවේ:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"දායකත්වය:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
+
+#: src/vorbis/vorbis.c:582
+msgid "Ogg Vorbis Decoder"
+msgstr "Ogg Vorbis විකේතකය"
+
+#: src/vtx/vtx.c:242
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Vortex ගොනු හැඩතල ධාවකය Sashnov Alexander විසින්<sashnov@ngs.ru>\n"
+"Based on in_vtx.dll Roman Sherbakov විසින් <v_soft@microfor.ru>\n"
+"Audacious පේනු මෘදුකාංගය Pavel Vymetalek විසින් <pvymetalek@seznam.cz>"
+
+#: src/vtx/vtx.c:248
+msgid "VTX Decoder"
+msgstr "VTX විකේතකය"
+
+#: src/wavpack/wavpack.c:282
+msgid "lossy (hybrid)"
+msgstr "හානිමත් (දෙමුහුන්)"
+
+#: src/wavpack/wavpack.c:284
+msgid "lossy"
+msgstr "හානිමත් "
+
+#: src/wavpack/wavpack.c:334
+msgid ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
+msgstr ""
+"ප්‍රකාශන හිමිකම 2006 William Pitcock <nenolod@nenolod.net>\n"
+"ඇතැම් පේනු මෘදුකාංග කේත Miles Egan විසිනි."
+
+#: src/wavpack/wavpack.c:341
+msgid "WavPack Decoder"
+msgstr "WavPack විකේතකය"
+
+#: src/xsf/plugin.c:274
+msgid "2SF Decoder"
+msgstr " 2SF විකේතකය"
+
+#: src/xspf/xspf.c:440
+msgid "XML Shareable Playlists (XSPF)"
+msgstr "XML හුවමාරු කළ හැකි ධාවන ලැයිස්තුව (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-පේනු - ගොනුව තෝරන්න"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "තෝරාගත් අනුපිළිවලට"

audacious-plugins-3.3.4.tar.bz2/po/sk.po -> audacious-plugins-3.4.2.tar.bz2/po/sk.po Changed

@@ -1,594 +1,618 @@
 # Slovak translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Andrej Herceg <herceg.andrej@zoznam.sk>, 2007, 2008, 2010, 2011.
-# <lukas.dobransky@gmail.com>, 2012.
-# Tomáš Vadina <kyberdev@gmail.com>, 2012.
-# <vdcorduroy@gmail.com>, 2012.
+# Andrej Herceg <herceg.andrej@zoznam.sk>, 2007, 2008, 2010, 2011
+# citro <lukas.dobransky@gmail.com>, 2012
+# Tomáš Vadina <kyberdev@gmail.com>, 2012
+# Corduroy <vdcorduroy@gmail.com>, 2013
+# Corduroy <vdcorduroy@gmail.com>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-28 14:17+0000\n"
-"Last-Translator: citro <lukas.dobransky@gmail.com>\n"
-"Language-Team: Slovak\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-04 12:38+0000\n"
+"Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
+"Language-Team: Slovak (http://www.transifex.com/projects/p/audacious/"
+"language/sk/)\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "mono"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "stereo"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "Priestorový zvuk"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "AAC dekóder"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "sekvenčný"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib prehrávač)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "Zásuvný modul na spustenie prehrávania v presne určený čas.\n\nNapísali Adam Feakin a Daniel Stodden."
+msgstr ""
+"Zásuvný modul na spustenie prehrávania v presne určený čas.\n"
+"\n"
+"Napísali Adam Feakin a Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Alarm"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Toto je budiaci signál."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "OK"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Nastavenie Alarmu"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Čas"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "hodín"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "h"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "minút"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Ticho po:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Budiť o (predvolené):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Toto je budiaci signál."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Vyberte dni, kedy má budík budiť"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Štandardné"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Upozornenie"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Deň"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Pondelok"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Streda"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Piatok"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Sobota"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Pondelok"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Nastavenie Alarmu"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Čas"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Budiť o (predvolené):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Ticho po:"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "hodín"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "minút"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Vyberte dni, kedy má budík budiť"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Deň"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Štandardné"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Dni"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Zosilovanie"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "sekúnd"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Hlasitosť"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Aktuálna"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Začať na"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Skončiť na"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Aktuálna"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Dodatočný príkaz"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "povoliť"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Zoznam skladieb (voliteľné)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Vyber zoznam skladieb"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Upozornenie"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Upozorňovať"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Možnosti"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Čo tieto možnosti znamenajú?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nČas\n Budiť o: \n Čas budíka.\n\n Vypnúť po: \n Vypnúť budík po uplynutí tejto doby.\n (ak nie je budiaci dialóg zatorený)\n\n\nDni\n Deň:\n Vyberte dni pre aktiváciu budíka.\n\n Čas:\n Vyberte čas pre budenie na každý deň,\n alebo použite prednastavený čas.\n\n\nHlasitosť\n Zoslabenie: \n Zoslabuje až na vybranú hodnotu po vybranú dobu.\n\n Začať o: \n Zoslabiť z tejto hlasitosti.\n\n Skončiť na: \n Hlasitosť na koniec zoslabenia. Ak je doba zoslabenia \n na hodnote 0, potom bude hlasitosť táto.\n\n\nMožnosti:\n Dodatočné príkazy:\n Spusť tento príkaz na čas budenia.\n\n Zoznam skladieb: \n Načíta tento zoznam skladieb, z ktorého bude hrať \n (musí mať príponu .m3u). Ak zoznam nie je zadaný, \n budú použité skladby, ktoré budú v aktuálnom zozname \n skladieb. URL MP3/OGG prúdu môže byť taktiež \n zadaná, ale načítanie zoznamu skladieb z URL nie je\n momentálne podporované.\n\n Pripomenutie:\n Pri vypnutí budíka zobrazí odkaz. Text odkazu\n vpíšte do vstupného poľa a ak si želáte zobrazovať\n odkaz, stlačte tlačidlo\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Pomocník"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Zrušiť"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Váš odkaz pre dnes je.."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Ďakujem"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Album"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Predvolené PCM zariadenie"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Predvolené zariadenie mixéra"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Predvoľby výstupného modulu ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "PCM zariadenie:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Zariadenie mixéra:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Prvok mixéra:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Obísť problém so zasekávaním pri vyprázdňovaní"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "ALSA výstupný zásuvný modul pre Audacious\nCopyright 2009-2012 John Lindgren\n\nMoja vďaka patrí Williamovy Pitcockovy, autorovy ALSA výstupného zásuvného modulu NG, ktorého kód mi poslúžil ako predloha keď ALSA manual nestačil."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"ALSA výstupný zásuvný modul pre Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"Moja vďaka patrí Williamovy Pitcockovy, autorovy ALSA výstupného zásuvného "
+"modulu NG, ktorého kód mi poslúžil ako predloha keď ALSA manual nestačil."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "ALSA výstup"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (MIDI prehrávač)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Nezvolili ste žiadne porty sekvencéra určené pre prehrávanie MIDI. Môžete tak urobiť v predvoľbách MIDI modulu."
+msgstr ""
+"Nezvolili ste žiadne porty sekvencéra určené pre prehrávanie MIDI. Môžete "
+"tak urobiť v predvoľbách MIDI modulu."
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI prehrávač)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Koncové zariadenie pre ALSA "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Toto koncové zariadenie posiela MIDI udalosti skupine užívateľom vybraných portov ALSA sekvencéra. Rozhranie ALSA sekvencéra je vysoko prispôsobivé. Môže poskytovať porty pre hardvérové syntetizátory zvukovej karty (napr. emu10k1), alebo syntetizátorom softvérovým, vonkajším zariadeniam atď.\nToto koncové zariadenie nevytvára zvuk, MIDI udalosti sú spracovávané priamo zariadením/programom, ktoré sa ukrýva za ALSA portom. Napríklad MIDI udalosti poslané hardvérovému syntetizátoru budú prehrané priamo ním.\nOvládač koncového zariadenia napísal Giacomo Lozito."
+msgstr ""
+"Toto koncové zariadenie posiela MIDI udalosti skupine užívateľom vybraných "
+"portov ALSA sekvencéra. Rozhranie ALSA sekvencéra je vysoko prispôsobivé. "
+"Môže poskytovať porty pre hardvérové syntetizátory zvukovej karty (napr. "
+"emu10k1), alebo syntetizátorom softvérovým, vonkajším zariadeniam atď.\n"
+"Toto koncové zariadenie nevytvára zvuk, MIDI udalosti sú spracovávané priamo "
+"zariadením/programom, ktoré sa ukrýva za ALSA portom. Napríklad MIDI "
+"udalosti poslané hardvérovému syntetizátoru budú prehrané priamo ním.\n"
+"Ovládač koncového zariadenia napísal Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Koncové zariadenie FluidSynth "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Toto koncové zariadenie vytvára zvuk posielaním MIDI udalostí do FluidSynth (softvérový syntetizátor pracujúci v reálnom čase založený na špecifikácii SoundFont2 www.fluidsynth.org).\nVyprodukovaný zvuk môže byť upravený efektovými modulmi prehrávača a následne je spracovaný zvoleným výstupným modulom.\nOvládač koncového zariadenia napísal Giacomo Lozito."
+msgstr ""
+"Toto koncové zariadenie vytvára zvuk posielaním MIDI udalostí do FluidSynth "
+"(softvérový syntetizátor pracujúci v reálnom čase založený na špecifikácii "
+"SoundFont2 www.fluidsynth.org).\n"
+"Vyprodukovaný zvuk môže byť upravený efektovými modulmi prehrávača a "
+"následne je spracovaný zvoleným výstupným modulom.\n"
+"Ovládač koncového zariadenia napísal Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Port"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Názov klienta"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Názov portu"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Výstupné porty ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Zvuková karta: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Ovládanie mixéra: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Nastavenia mixéra"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "Koncové zariadenie\nALSA"
+msgstr ""
+"Koncové zariadenie\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - podrobnosti o koncovom zariadení"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Výber koncového zariadenia"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Nastavenie prehrávania"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Transponovať: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Posun bicích: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Pokročilé nastavenia"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "dopredu vypočítať dĺžku MIDI súborov v zozname skladieb"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "extrahovať komentáre z MIDI súboru (ak existujú)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "extrahovať slová z MIDI súboru (ak existujú)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - vyberte súbor"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "AMIDI-Plug Nastavenia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - vyberte SoundFont súbor"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Nastavenia SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Názov súboru"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Veľkosť (v bajtoch)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Načítať SoundFont pri spustení prehrávača"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Načítať SoundFont pri prehrávaní prvého MIDI súboru"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Nastavenia syntetizátora"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "zosilnenie"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "použiť predvolené"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "hodnota:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "polyfónia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "dozvuk"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "áno"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "nie"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "zbor"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "vzorkovacia frekvencia"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "vlastná "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Koncové zariadenie\nFluidSynth"
+msgstr ""
+"Koncové zariadenie\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Názov:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " Podrobnosti o MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Formát:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Dĺžka (ms):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Počet stôp:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "premenlivé"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (váž.):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Čas. pomer:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " Komentáre a slová MIDI skladby "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* v MIDI súbore sa nenachádzajú žiadne komentáre *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* v MIDI súbore sa nenachádzajú žiadne texty skladby *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (neplatné UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "O AMIDI zásuvnom module"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr "AMIDI-Plug"
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -609,7 +633,26 @@
 "\n"
 "Tony Vroon\n"
 "for the good help with alpha testing"
-msgstr "\nmodulárny prehrávač MIDI hudby\nhttp://www.develia.org/projects.php?p=amidiplug\n\nnapísal Giacomo Lozito\n<james@develia.org>\n\nzvláštne poďakovanie...\n\nClemens Ladisch a Jaroslav Kysela\nza ich úžasné programy aplaymidi a amixer; boli\nnaozaj užitočné, spolu s alsa-lib dokumentáciou\nsom sa naučil viac o ALSA API\n\nAlfredo Spadafina\nza pekné logo MIDI klávesnice\n\nTony Vroon\nza pomoc pri testovaní"
+msgstr ""
+"\n"
+"modulárny prehrávač MIDI hudby\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"napísal Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"zvláštne poďakovanie...\n"
+"\n"
+"Clemens Ladisch a Jaroslav Kysela\n"
+"za ich úžasné programy aplaymidi a amixer; boli\n"
+"naozaj užitočné, spolu s alsa-lib dokumentáciou\n"
+"som sa naučil viac o ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"za pekné logo MIDI klávesnice\n"
+"\n"
+"Tony Vroon\n"
+"za pomoc pri testovaní"
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
@@ -652,7 +695,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "OSD sa zobrazí počas prehrávania ak sa zmení názov, ale meno súboru ostane nezmenené. Je to hlavne vhodné na zobrazenie zmien názvov skladieb pri prehrávaní internetových prúdov."
+msgstr ""
+"OSD sa zobrazí počas prehrávania ak sa zmení názov, ale meno súboru ostane "
+"nezmenené. Je to hlavne vhodné na zobrazenie zmien názvov skladieb pri "
+"prehrávaní internetových prúdov."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -784,8 +830,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Nebol nájdený kompozitný správca.\nAk viete, že žiadny nebeží, prosím, aktivujte kompozitného správcu, inak nebude OSD pracovať správne"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Nebol nájdený kompozitný správca.\n"
+"Ak viete, že žiadny nebeží, prosím, aktivujte kompozitného správcu, inak "
+"nebude OSD pracovať správne"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -848,47 +898,47 @@
 msgid "Misc"
 msgstr "Rôzne"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "ASXv1/ASXv2 zoznamy skladieb"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious zoznamy skladieb (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Farba"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Rozsah rozostrenia"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Nastavenia: Bauer stereophonic-to-binaural"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Úroveň zdroja:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Frekvencia pre vystrihnutie:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Predvoľby:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Analyzér spektra"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -898,233 +948,246 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> a ostatní.\n\nVeľká vďaka libcdio vývojárom <http://www.gnu.org/software/libcdio/>\na libcddb vývojárom <http://libcddb.sourceforge.net/>.\n\nTaktiež vďaka pre Tonyho Vrrona za vedenie a rady.\n\nToto bol Google Summer of Code 2007 projekt."
+msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> a ostatní.\n"
+"\n"
+"Veľká vďaka libcdio vývojárom <http://www.gnu.org/software/libcdio/>\n"
+"a libcddb vývojárom <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Taktiež vďaka pre Tonyho Vrrona za vedenie a rady.\n"
+"\n"
+"Toto bol Google Summer of Code 2007 projekt."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Zariadenia"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Rýchlosť disku:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Prepísať zariadenie:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "&lt;b&gt;Metadáta&lt;/b&gt;"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Použiť CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Použiť CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Namiesto CDDBP použiť HTTP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Server: "
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Cesta: "
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Port: "
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Audio CD zásuvný modul"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Zlyhala inicializácia cdio podsystému."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Neplatná URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Stopa %d sa nenašla."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Stopa %d je dátová stopa."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Zlyhalo otvorenie audio výstupu."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Chyba pri čítaní audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Zvukové CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Zlyhalo CD zariadenie %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "Nebolo nájdené žiadne spôsobilé CD zariadenie."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Zlyhalo dokončenie inicializácie otvoreného CD zariadenia."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Zlyhalo načítanie prvého/posledného čísla skladby."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Nie je možné prečítať začiatok/koniec LSN pre stopu %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Zlyhalo vytvorenie cddb pripojenia."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Nepodaril sa dotaz na CDDB server"
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Nepodaril sa dotaz na CDDB server: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Zlyhalo načítanie cddb info: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Mechanika je prázdna."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Nepodporovaný typ disku."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Prehrať CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Pridať CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Položky Audio CD menu"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Kompresia"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Stredná hlasitosť:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Dynamický rozsah:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Dynamic Range Compression zásuvný modul pre Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Dynamic Range Compression zásuvný modul pre Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Dynamický rozsah kompresora"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Dekodér konzolovej hudby"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Všeobecné"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Prehrávanie"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Hĺbky:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "s"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Výšky:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Predvolená dĺžka skladby:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Prevzorkovanie"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Povoliť prevzorkovanie zvuku"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Prevzorkovať na:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ignorovať dĺžku z SPC značiek"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Predĺžiť dozvuk"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "Predvolená dĺžka skladby, vyjadrená v sekundách, je použitá pri skladbách, ktoré neposkytujú informáciu o dĺžke (napr. skladby s opakovaním)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Predvolená dĺžka skladby, vyjadrená v sekundách, je použitá pri skladbách, "
+"ktoré neposkytujú informáciu o dĺžke (napr. skladby s opakovaním)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1132,88 +1195,108 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "Dekodér konzolovej hudby založený na Game_Music_Emu 0.5.2\nPodporované formáty: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n\nZásuvný modul pre Audacious napísal:\nWilliam Pitcock <nenolod@dereferenced.org>\nShay Green <gblargg@gmail.com>"
+msgstr ""
+"Dekodér konzolovej hudby založený na Game_Music_Emu 0.5.2\n"
+"Podporované formáty: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Zásuvný modul pre Audacious napísal:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "Prelínanie sa nepodarilo, pretože skladby mali rôzny počet kanálov. Môžete\npoužiť Zmiešavač kanálov a previesť piesne na rovnaký počet kanálov."
+msgstr ""
+"Prelínanie sa nepodarilo, pretože skladby mali rôzny počet kanálov. Môžete\n"
+"použiť Zmiešavač kanálov a previesť piesne na rovnaký počet kanálov."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Prelínanie zlyhalo, pretože skladby majú rozdielnu vzorkovaciu frekvenciu:\n\nNa prevzorkovanie skladieb na rovnakú frekvenciu môžete použiť efektový modul „Konvertor vzorkovacej frekvencie“."
+msgstr ""
+"Prelínanie zlyhalo, pretože skladby majú rozdielnu vzorkovaciu frekvenciu:\n"
+"\n"
+"Na prevzorkovanie skladieb na rovnakú frekvenciu môžete použiť efektový "
+"modul „Konvertor vzorkovacej frekvencie“."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Crossfade zásuvný modul pre Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Crossfade zásuvný modul pre Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Prelínanie"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Prekrývanie:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Prelínanie"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Kryštalizér"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Intenzita:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet zásuvný modul"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Ozvena"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Oneskorenie:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Spätná väzba:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Hlasitosť:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Echo zásuvný modul\nnapísal Johan Levin, 1999\n\nSurround echo napísal Carl van Schaik, 1999"
+msgstr ""
+"Echo zásuvný modul\n"
+"napísal Johan Levin, 1999\n"
+"\n"
+"Surround echo napísal Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Ozvena"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1221,9 +1304,16 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Multi-formátový dekódujúci modul zvuku pre Audacious\nzaložený na multimediálnom frameworku FFmpeg\n(http://www.ffmpeg.org/)\n\nZásuvný modul pre Audacious napísal:\nWilliam Pitcock <nenolod@nenolod.net>\nMatti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Multi-formátový dekódujúci modul zvuku pre Audacious\n"
+"založený na multimediálnom frameworku FFmpeg\n"
+"(http://www.ffmpeg.org/)\n"
+"\n"
+"Zásuvný modul pre Audacious napísal:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg zásuvný modul"
 
@@ -1291,7 +1381,21 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "This program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1305,11 +1409,13 @@
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Mono"
 
@@ -1357,7 +1463,7 @@
 msgid "Error protection"
 msgstr "Ochrana pred chybami"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Kvalita"
 
@@ -1437,429 +1543,492 @@
 msgid "Tags"
 msgstr "Značky"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Nastavenie kodéra Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Úroveň kvality (0-10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "bezstratový"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Pôvodný kód napísal:\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Pôvodný kód napísal:\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "FLAC dekodér"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "GIO zásuvný modul pre Audacious\nCopyright 2009-2012 John Lindgren"
+msgstr ""
+"GIO zásuvný modul pre Audacious\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "GIO zásuvný modul"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Zásuvný modul pre klávesové skratky Gnome\nOvládajte prehrávač klávesovými skratkami Gnome.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+"Zásuvný modul pre klávesové skratky Gnome\n"
+"Ovládajte prehrávač klávesovými skratkami Gnome.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Klávesové skratky GNOME"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Číslo položky"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Názov"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Umelec"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Rok"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Stopa"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Žáner"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Poradie vo fronte"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Dĺžka"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Cesta k súboru"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Vlastný názov"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Dátový tok"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Vybrať stĺpce"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Dostupné:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Vybrané:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Ukotviť vľavo"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Ukotviť vpravo"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Ukotviť hore"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Ukotviť dole"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Uvolniť"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Zakázať"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "_Otvoriť súbory ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Otvoriť _URL ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "Prid_ať súbory ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Pridať U_RL ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Prehliadať knižnicu"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "_O programe ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Predvoľby"
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Hrať"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "P_ozastaviť"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "Za_staviť"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "Pred_chádzajúca"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Nasledujúca"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "O_pakovať"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "Ná_hodné prehrávanie"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "Nep_okračovať podľa zoznamu skladieb"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Zastaviť po tejto skl_adbe"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "Zastaviť po tejto skladbe"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "_Informácie o skladbe ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "S_kočiť na čas ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "Skočiť na sk_ladbu ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Podľa čí_sla stopy"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Podľa _názvu"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Podľa čí_sla stopy"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Podľa _umelca"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Podľa a_lbumu"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Podľa dátumu vy_dania"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Podľa _cesty k súboru"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Podľa vlastného ná_zvu"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "Obrátené poradie"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "Náhodné po_radie"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Prehrať tento zoznam skladieb"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Obnoviť"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Odstrániť nedost_upné súbory"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Zoradiť"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Triediť výber"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Odstrániť nedost_upné súbory"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Nový"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Pre_menovať ..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Zatvoriť"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Importovať ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Exportovať ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Správca_zoznamu skladieb ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Správca _fronty .."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "Zo_silniť"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "S_tíšiť"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Ekvalizér"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "E_fekty"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Rozhranie"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Vizualizácie"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Zobraziť _panel s ponukou"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Zobraziť panel s i_nformáciami"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Zobraziť znázornenie oblasti informácií"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Zobraziť panel so _stavom"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Zobraziť tlačitka_zatvorenie"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Zobraziť _hlavičky stĺpcov"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Vybrať stĺp_ce ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "Ro_lovať na zmenenú skladbu"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Súbor"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Prehrávanie"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "Zoznam sk_ladieb"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Služby"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Výstup"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Zobrazenie"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "Pridať alebo odobrať z _fronty"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "Vys_trihnúť"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "V_ložiť"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Ozn_ačiť všetko"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Premenovať ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Rozhranie GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Napĺňanie vyrovnávajúcej pamäte ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Chyba"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1867,113 +2036,124 @@
 msgstr[1] "%d kanál"
 msgstr[2] "%d kanály"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Predchádzajúca stopa"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr "Predchádzajúca skladba"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Prehrať"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Pozastaviť/Pokračovať"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Zastaviť"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Nasledujúca stopa"
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr "Nasledujúca skladba"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
 msgstr "Vpred o 5 sekúnd"
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
 msgstr "Späť o 5 sekúnd"
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
 msgstr "Stlmiť"
 
+#: src/hotkey/gui.c:78
+msgid "Volume up"
+msgstr "Zvýšenie hlasitosti"
+
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr "Zníženie hlasitosti"
+
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Zosilniť"
+msgid "Jump to file"
+msgstr "Prejsť na súbor"
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Stíšiť"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Prejsť na súbor"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Zobraziť OSD"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Prepnúť okno(á) prehrávača"
+msgid "Toggle repeat"
+msgstr "Opakovanie"
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Zobraziť OSD"
+msgid "Toggle shuffle"
+msgstr "Náhodné prehrávanie"
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Prepnúť opakovanie"
+msgid "Toggle stop after current"
+msgstr "Zastaviť po skončení aktuálnej skladby"
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Prepnúť náhodné prehrávanie"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr "Presuň na vrch okno(á) prehrávača"
+msgid "Raise player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(žiadne)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Priradenie primárneho tlačidla myši bez modifikátoru nie je odporúčané.\n\nChcete pokračovať?"
+msgstr ""
+"Priradenie primárneho tlačidla myši bez modifikátoru nie je odporúčané.\n"
+"\n"
+"Chcete pokračovať?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Priradenie tlačidiel myši"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Nastavenie modulu Globálne klávesové skratky"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "V textovom poli stlačte kombináciu klávesov.\nMôžete priradiť aj tlačítka na myši."
+msgstr ""
+"V textovom poli stlačte kombináciu klávesov.\n"
+"Môžete priradiť aj tlačítka na myši."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Klávesové skratky:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Činnosť:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Priradenie klávesu:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1986,104 +2166,132 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "Zásuvný modul pre globálne klávesové skratky\nOvládajte prehrávač kombináciami kláves alebo multimediálnymi tlačidlami.\n\nCopyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\nPrispievatelia:\nCopyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\nCopyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n Bryn Davies <curious@ihug.com.au>,\n Jonathan A. Davis <davis@jdhouse.org>,\n Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+"Zásuvný modul pre globálne klávesové skratky\n"
+"Ovládajte prehrávač kombináciami kláves alebo multimediálnymi tlačidlami.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Prispievatelia:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Globálne klávesové skratky"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Založené na xmms-jack, ktorý napísal Chris Morgan:\nhttp://xmms-jack.sourceforge.net/\n\nPort pre Audacious napísal Giacomo Lozito"
+msgstr ""
+"Založené na xmms-jack, ktorý napísal Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Port pre Audacious napísal Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "JACK výstup"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Nastavenia %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Nastavenia hostiteľa LADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Cesty modulu:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr " Oddeliť viac ciest s dvojbodkou.\nTieto cesty sú vyhľadávané v rátane do LADSPA_PATH.\nPo pridaní novej cesty, stlačte Enter pre vyhľadanie nových modulov. "
+msgstr ""
+" Oddeliť viac ciest s dvojbodkou.\n"
+"Tieto cesty sú vyhľadávané v rátane do LADSPA_PATH.\n"
+"Po pridaní novej cesty, stlačte Enter pre vyhľadanie nových modulov. </ "
+"Small>"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Dostupné moduly:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Povoliť"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Povolené moduly:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "LADSPA Host pre Audacious\nCopyright 2011 John Lindgren"
+msgstr ""
+"LADSPA Host pre Audacious\n"
+"Copyright 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "LADSPA Host"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
-msgstr "%s: nie je možné inicializovať podporu LIRC\n\n"
+msgstr ""
+"%s: nie je možné inicializovať podporu LIRC\n"
+"\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: nie je možné načítať konfiguračný súbor LIRC\n%s: prosím prečítajte si dokumentáciu k LIRC\n%s: ako správne vytvoriť konfiguračný súbor\n"
+msgstr ""
+"%s: nie je možné načítať konfiguračný súbor LIRC\n"
+"%s: prosím prečítajte si dokumentáciu k LIRC\n"
+"%s: ako správne vytvoriť konfiguračný súbor\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: pokúšam sa znova pripojiť...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: neznámy príkaz \"%s\"\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: odpojené od LIRC\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: skúsim sa znova napojiť každých %d sekúnd...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2097,155 +2305,307 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "Jednoduchý zásuvný modul na ovladanie Audacious použitím LIRC daemonom.\n\nAdaptáciu pre Audacious spravili:\nTony Vroon <chainsaw@gentoo.org>\nJoonas Harjumäki <jharjuma@gmail.com>\nZaložené na XMMS LIRC zásuvnom module, ktorý napísali:\nCarl van Schaik <carl@leg.uct.ac.za>\nChristoph Bartelmus <xmms@bartelmus.de>\nAndrew O. Shadoura <bugzilla@tut.by>\n\nPre viac informácií o LIRC, navštívte http://lirc.org."
+msgstr ""
+"Jednoduchý zásuvný modul na ovladanie Audacious použitím LIRC daemonom.\n"
+"\n"
+"Adaptáciu pre Audacious spravili:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"Založené na XMMS LIRC zásuvnom module, ktorý napísali:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Pre viac informácií o LIRC, navštívte http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Pripojenie"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Znovu sa pripojiť k serveru LIRC"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Počkajte pred opätovným pripojením:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "LIRC zásuvný modul"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Žiadne texty k dispozícii"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Nedá sa načítať %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Nedá sa analyzovať %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Vyhľadáva sa text skladby..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Chýba metadata skladby"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Pripájanie na lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "LyricWiki zásuvný modul"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "M3U zoznam skladieb"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generátor taktu: %d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generátor taktu: %d bpm %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "Generátor taktov napísal Martin Strauss <mys@faveve.uni-stuttgart.de>\n\nPre použitie, pridajte URL: tact://beats*num/den\nnapr. tact://77 to play 77 beats per minute\nalebo tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr ""
+"Generátor taktov napísal Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Pre použitie, pridajte URL: tact://beats*num/den\n"
+"napr. tact://77 to play 77 beats per minute\n"
+"alebo tact://60*3/4 to play 60 bpm in 3/4 tacts"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Generátor taktov"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Channel Mixer zásuvný modul pre Audacious\nCopyright 2011-2012 John Lindgren a Michał Lipski"
+msgstr ""
+"Channel Mixer zásuvný modul pre Audacious\n"
+"Copyright 2011-2012 John Lindgren a Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Zmiešavač kanálov"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Výstupné kanály:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Zmiešavač kanálov"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "MMS zásuvný modul"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Module Player) zásuvný modul"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Priestorový zvuk"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "MPG123 zásuvný modul"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 Server"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS zásuvný modul"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Zastavené"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious teraz neprehráva."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
-"\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Založené na libnotify-aosd, napísal Maximilian Bogner:\nhttp://www.mbogner.de/projects/libnotify-aosd/\n\nCopyright (C) 2010 Maximilian Bogner\nCopyright (C) 2011 John Lindgren\n\nThis plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n\nThis plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Oznámenia na plochu"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Pozastaviť"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Nasledujúca"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Štandardné zariadenie"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Zvukové zariadenie:"
 
@@ -2270,22 +2630,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "OSS4 výstupný zásuvný modul pre Audacious\nCopyright 2010-2012 Michał Lipski\n\nChcem poďakovať ľuďom z #audacious, najmä Tonymu Vroonovy a Johnovy Lindgrenovy a samozrejme autorom predošlého OSS zásuvného modulu."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"OSS4 výstupný zásuvný modul pre Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"Chcem poďakovať ľuďom z #audacious, najmä Tonymu Vroonovy a Johnovy "
+"Lindgrenovy a samozrejme autorom predošlého OSS zásuvného modulu."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "OSS4 výstup"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "PLS zoznamy skladieb"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 dekodér"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2303,155 +2669,219 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Audacious PulseAudio výstupný zásuvný modul\n\nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\nGNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License\nalong with this program; if not, write to the Free Software\nFoundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"Audacious PulseAudio výstupný zásuvný modul\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "PulseAudio výstup"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Sample Rate Converter zásuvný modul pre Audacious\nCopyright 2010-2012 John Lindgren"
+msgstr ""
+"Sample Rate Converter zásuvný modul pre Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Preskoč/opakuj vzorky"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Lineárna interpolácia"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Rýchla sinc interpolácia"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Priemerná sinc interpolácia"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Najlepšia sinc interpolácia"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Prevod"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Metóda:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Hodnotenie:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Mapovanie hodnotenia"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Použiť mapovanie hodnotenia"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Konvertor vzorkovacej frekvencie"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Zmeniť heslo"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Služby"
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.FM"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Prístupové meno:"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Heslo:"
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "URL Scrobblera:"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "Vyskytol sa problém s pripojením k Last.fm. Prosím, skúste to neskôr."
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Audacious AudioScrobbler zásuvný modul\n\nPôvodne napísali Audun Hove <audun@nlc.no> a Pipian <pipian@pipian.com>"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr ""
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"Audacious odteraz používa vylepšenú verziu doplnku Last.fm Scrobbler.\n"
+"Prosím, skontrolujte Predvoľby doplnku Scrobbler."
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "SDL výstupný zásuvný modul pre Aduacious\nCopyright 2010 John Lindgren"
+msgstr ""
+"SDL výstupný zásuvný modul pre Aduacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "SDL výstup"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Knižnica"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Neznámy Umelec"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Neznámy Album"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\n na %s od %s"
+msgstr ""
+"%s\n"
+" na %s od %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
@@ -2459,7 +2889,7 @@
 msgstr[1] "%d álb"
 msgstr[2] "%d albumov"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2467,11 +2897,17 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d skladba"
-msgstr[1] "%s\n %s, %d skladby"
-msgstr[2] "%s\n %s, %d skladieb"
+msgstr[0] ""
+"%s\n"
+" %s, %d skladba"
+msgstr[1] ""
+"%s\n"
+" %s, %d skladby"
+msgstr[2] ""
+"%s\n"
+" %s, %d skladieb"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2479,77 +2915,85 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d skladba od %s"
-msgstr[1] "%s\n %d skladby od %s"
-msgstr[2] "%s\n %d skladieb od %s"
+msgstr[0] ""
+"%s\n"
+" %d skladba od %s"
+msgstr[1] ""
+"%s\n"
+" %d skladby od %s"
+msgstr[2] ""
+"%s\n"
+" %d skladieb od %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Vytvoriť zoznam skladieb"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Pridať do zoznamu skladieb"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Vyhľadať knižnicu"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Pre import hudobnej knižnice do Audacious, vyberte priečinok a potom kliknite na ikonu \"obnoviť\"."
+msgstr ""
+"Pre import hudobnej knižnice do Audacious, vyberte priečinok a potom "
+"kliknite na ikonu \"obnoviť\"."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Čakajte prosím ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Vybrať priečinok"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Vyhľadávací nástroj"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Winamp Classic Interface"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "V _okne prehrávača:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Vyberte písmo pre hlavné okno prehrávača:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "V zozname _skladieb:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Vyberte písmo pre zoznam skladieb:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Písma"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Použiť bitmapové písma (podporuje iba ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Rolovať názov skladby obidvoma smermi"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Vzhľad"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Predvoľby rozhrania"
 
@@ -2605,7 +3049,7 @@
 msgid "Presets"
 msgstr "Predvoľby"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Načítať predvoľbu"
 
@@ -2618,7 +3062,7 @@
 msgid "Load equalizer preset"
 msgstr "Načítať predvoľbu ekvalizéra"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Uložiť predvoľbu"
 
@@ -2630,7 +3074,7 @@
 msgid "Save equalizer preset"
 msgstr "Uložiť predvoľby ekvaizéra"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Vymazať predvoľbu"
 
@@ -2638,739 +3082,753 @@
 msgid "Delete auto-preset"
 msgstr "Vymazať automatickú predvoľbu"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kb/s"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "Hz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "prejsť na %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Hlasitosť: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Vyváženie: %d%% vľavo"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Vyváženie: stred"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Vyváženie: %d%% vpravo"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Ponuka s možnosťami"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Vypnúť „Vždy navrchu“"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Zapnúť „Vždy navrchu“"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Informácie o súbore"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Ponuka s typom znázornenia"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Režim jednej skladby."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Režim zoznamu skladieb."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Zastaviť po skončení skladby."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Nezastaviť po skončení skladby."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Automatický posun názvu skladby"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Zastaviť po skončení aktuálnej skladby"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Vrcholy"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Opakovať"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Náhodné poradie"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Neprehrávať ďalšiu skladbu zo zoznamu"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Zobraziť prehrávač"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Zobraziť editor zoznamu skladieb"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Zobraziť ekvalizér"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Vždy navrchu"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Zobrazovať na všetkých plochách"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Zrolovať prehrávač"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Zrolovať editor zoznamu skladieb"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Zrolovať ekvalizér"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Analyzátor"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Osciloskop"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Frekvenčné spektrum"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Žiadne"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Normálny"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Oheň"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Vertikálne čiary"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Čiary"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Obdĺžniky"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Bodový osciloskop"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Čiarový osciloskop"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Vyplnený osciloskop"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Ľad"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Plynulý"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Najpomalšie"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Pomaly"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Stredne"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Rýchlo"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Najrýchlejšie"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Odohraný čas"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Zostávajúci čas"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Pozastaviť"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Predchádzajúca"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Nasledujúca"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Vizualizácia"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Typ zobrazenia"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Typ analyzátora"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Typ osciloskopu"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Typ frekvenčného spektra"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Typ vizualizácie pri zrolovanom okne"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Klesanie stĺpcov"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Klesanie vrcholov"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Zoznam skladieb"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Hraj zoznam skladieb"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Nový zoznam skladieb"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Vybrať nasledujúci zoznam skladieb"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Vybrať predchádzajúci zoznam skladieb"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Zmazať zoznam skladieb"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Importovať zoznam skladieb"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Pridá súbor so zoznamom do vybraného zoznamu skladieb."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Exportovať zoznam skladieb"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Uloží vybraný zoznam skladieb."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Obnoviť zoznam"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Obnovuje metadáta patriace k skladbe zo zoznamu."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Správca zoznamu skladieb"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Správca fronty"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Zobrazenie"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Rozhranie"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Predvoľby rozhrania ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Pridať internetovú adresu…"
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Do zoznamu skladieb pridá vzdialenú stopu."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Pridať súbory…"
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Do zoznamu skladieb pridá súbory."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Hľadanie a výber"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "Prehľadá zoznam skladieb a vyberie skladby podľa zadaných kritérií."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Invertovať výber"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Zamení vybrané a nevybrané položky."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Označiť všetko"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Vyberie všetky skladby v zozname."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Zrušiť výber"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Zruší výber skladieb zoznamu."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Odstrániť všetky"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Zo zoznamu odstráni všetky skladby."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Vyprázdniť front"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Vyprázdni front spojený s týmto zoznamom skladieb."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Odstrániť nedostupné súbory"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Zo zoznamu skladieb odstráni nedostupné súbory."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Odstrániť duplikáty"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Podľa názvu"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Zo zoznamu skladieb odstráni skladby s rovnakými názvami."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Podľa názvu súboru"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Zo zoznamu skladieb odstráni skladby s rovnakými názvami súboru."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Podľa cesty a názvu súboru"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr "Zo zoznamu skladieb odstráni skladby s rovnakou cestou a názvom súboru."
+msgstr ""
+"Zo zoznamu skladieb odstráni skladby s rovnakou cestou a názvom súboru."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Odstrániť neoznačené"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Zo zoznamu odstráni neoznačené skladby."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Odstrániť označené"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Zo zoznamu odstráni označené skladby."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Premiešať poradie"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Skladby v zozname zoradí náhodne."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Obrátiť poradie"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Obráti poradie skladieb v zozname."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Triediť zoznam"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Zoradí skladby v zozname podľa názvu."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Podľa albumu"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Zoradí skladby v zozname podľa názvu."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Podľa umelca"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Zoradí skladby v zozname podľa umelca."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Zoradí skladby v zozname podľa názvu súboru."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Zoradí skladby v zozname podľa celej cesty."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Podľa dátumu"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Zoradí skladby v zozname podľa dátumu poslednej úpravy súboru."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Podľa čísla stopy"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Zoradí skladby v zozname podľa čísla stopy."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Triediť výber"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Súbor"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Služby modulov"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Zobraziť informácie o skladbe"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Zobrazí informácie o skladbe"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "O Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Prehrať súbor"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Načíta a prehrá súbor"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Prehrať z adresy"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Prehrá súbor z vybranej adresy"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Služby modulov"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Predvoľby"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Otvorí okno s predvoľbami"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Ukončí Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Nastaviť A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Odstrániť A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Prejsť na súbor"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Prejsť na čas"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Prepnúť frontu"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Povolí/zakáže položku vo fronte zoznamu skladieb."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Vystrihnúť"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Vložiť"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Načítať"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Importovať"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Uložiť"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Vymazať"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Predvoľby"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Automaticky načítavané predvoľby"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Načítať automaticky načítavané predvoľby"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Načítať štandardné predvoľby do ekvalizéra"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Vynulovať"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Vynulovať predvoľby ekvalizéra"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Zo súboru"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Načítať predvoľby zo súboru"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Zo súboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Načítať predvoľby zo súboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Predvoľby WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Importovať predvoľby WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Uložiť automaticky načítavané predvoľby"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Uložiť štandardné predvoľby"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "Do súboru"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Uložiť predvoľby do súboru"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "Do súboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Uložiť predvoľby do súboru WinAMP EQF"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Vymazať automaticky načítavané predvoľby"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Vyhľadať skladby v aktívnom zozname skladieb"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Položky v zozname skladieb vyberiete vyplnením jedného alebo viacerých polí. Polia používajú regulárne výrazy a neberie sa ohľad na veľkosť písmen. Ak regulárnym výrazom nerozumiete, jednoducho zadajte časť textu, ktorý chcete vyhľadať."
+msgstr ""
+"Položky v zozname skladieb vyberiete vyplnením jedného alebo viacerých polí. "
+"Polia používajú regulárne výrazy a neberie sa ohľad na veľkosť písmen. Ak "
+"regulárnym výrazom nerozumiete, jednoducho zadajte časť textu, ktorý chcete "
+"vyhľadať."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Názov: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Album: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Umelec: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Názov súboru: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Pred hľadaním vymazať predchádzajúci výber"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Zhodujúce sa položky pridať do (odstrániť z) frontu"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Zo zhodujúcich sa položiek vytvoriť nový zoznam skladieb"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Editor zoznamu skladieb"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d z %d)"
@@ -3388,81 +3846,124 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Nepodarilo sa vytvoriť adresár (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Založené na xmms_sndfile zásuvnom module:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Pre Aduacious upravil Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Založené na xmms_sndfile zásuvnom module:\nCopyright (C) 2000, 2002 Erik de Castro Lopo\n\nPre Aduacious upravil Tony Vroon <chainsaw@gentoo.org>\n\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Sndfile zásuvný modul"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "O Sndio výstupnom zásuvnom module"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Sndio Output zásuvný modul\n\nnapísal Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+"Sndio Output zásuvný modul\n"
+"\n"
+"napísal Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Nepodporovaný formát"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Formát nie je podporovaný týmto zvukovým zariadením.\n\nSkúste to znova prosím s bežiacim sndiod(1) serverom."
+msgstr ""
+"Formát nie je podporovaný týmto zvukovým zariadením.\n"
+"\n"
+"Skúste to znova prosím s bežiacim sndiod(1) serverom."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "sndio zariadenie"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(prázdne znamená predvolené)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "OK"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Zrušiť"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Zmena skladby"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Príkaz, ktorý sa vykoná keď Audacious začne prehrávať novú skladbu."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Príkaz:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Príkaz, ktorý sa vykoná na konci skladby."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
-msgstr "Príkaz, ktorý sa vykoná, keď Audacious dosiahne koniec zoznamu skladieb."
+msgstr ""
+"Príkaz, ktorý sa vykoná, keď Audacious dosiahne koniec zoznamu skladieb."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Príkaz, ktorý sa vykoná pri zmene názvu skladby (t.j. pre názvy v sieťových prúdoch)."
+msgstr ""
+"Príkaz, ktorý sa vykoná pri zmene názvu skladby (t.j. pre názvy v sieťových "
+"prúdoch)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3479,35 +3980,86 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Môžete použiť nasledujúce formátovacie reťazce,\nktoré budú pri spustení príkazu nahradené (nie všetky\nsú užitočné pre príkaz spúšťaný na konci zoznamu skladieb).\n\n%F: Frekvencia (v hertzoch)\n%c: Počet kanálov\n%f: Názov súboru (celá cesta)\n%l: Dĺžka (v milisekundách)\n%n alebo %s: Názov skladby\n%r: Dátový tok (v bitoch za sekundu)\n%t: Pozícia v zozname skladieb (%02d)\n%p: Práve sa hrá (1 alebo 0)\n%a: Umelec\n%b: Album\n%T: Názov stopy"
+msgstr ""
+"Môžete použiť nasledujúce formátovacie reťazce,\n"
+"ktoré budú pri spustení príkazu nahradené (nie všetky\n"
+"sú užitočné pre príkaz spúšťaný na konci zoznamu skladieb).\n"
+"\n"
+"%F: Frekvencia (v hertzoch)\n"
+"%c: Počet kanálov\n"
+"%f: Názov súboru (celá cesta)\n"
+"%l: Dĺžka (v milisekundách)\n"
+"%n alebo %s: Názov skladby\n"
+"%r: Dátový tok (v bitoch za sekundu)\n"
+"%t: Pozícia v zozname skladieb (%02d)\n"
+"%p: Práve sa hrá (1 alebo 0)\n"
+"%a: Umelec\n"
+"%b: Album\n"
+"%T: Názov stopy"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Parametre predávané shellu by mali byť uzatvorené do úvodzoviek. Nerešpektovanie tejto rady predstavuje bezpečnostné riziko."
+msgstr ""
+"Parametre predávané shellu by mali byť uzatvorené do "
+"úvodzoviek. Nerešpektovanie tejto rady predstavuje bezpečnostné riziko.</"
+"span>"
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Príkazy"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Rýchlosť a výška"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Rýchlosť"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Výška"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Rýchlosť a výška"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3516,94 +4068,113 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "Status Icon zásuvný modul\n\nCopyright 2005-2007 Giacomo Lozito <james@develia.org>\nCopyright 2010 Michał Lipski <tallica@o2.pl>\n\nTento zásuvný modul poskytuje stavovú ikonu, umiestnenú v\nstavovej oblasti správcu okien."
+msgstr ""
+"Status Icon zásuvný modul\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Tento zásuvný modul poskytuje stavovú ikonu, umiestnenú v\n"
+"stavovej oblasti správcu okien."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Rolovanie kolieskom myši"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Zmeniť hlasitosť"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Zmeniť prehrávanú skladbu"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Ostatné nastavenia"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Zakázať vyskakovacie okno"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Zatvor do systémového zásobníka"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Pokračovať v zozname skladieb ak sa posúva smerom hore"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Stavová ikona"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Extra Stereo zásuvný modul\n\nNapísal Johan Levin, 1999"
+msgstr ""
+"Extra Stereo zásuvný modul\n"
+"\n"
+"Napísal Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Generátor tónov: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "Sínusový generátor tónov, napísal Håvard Kvålen <havardk@xmms.org>\nUpravil Daniel J. Peng <danielpeng@bigfoot.com>\n\nPre použitie, pridajte URL: tone://frequency1;frequency2;frequency3;...\nnapr.. tone://2000;2005 prehrá 2000 Hz tón a 2005 Hz tón"
+msgstr ""
+"Sínusový generátor tónov, napísal Håvard Kvålen <havardk@xmms.org>\n"
+"Upravil Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Pre použitie, pridajte URL: tone://frequency1;frequency2;frequency3;...\n"
+"napr.. tone://2000;2005 prehrá 2000 Hz tón a 2005 Hz tón"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Generátor tónov"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "File I/O zásuvný modul pre Audacious\nCopyright 2009-2012 John Lindgren\n\nTENTO ZÁSUVNÝ MODUL PRE NUTNÝ. NEVYPINÁJTE HO."
+msgstr ""
+"File I/O zásuvný modul pre Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"TENTO ZÁSUVNÝ MODUL PRE NUTNÝ. NEVYPINÁJTE HO."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "File I/O zásuvný modul"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Odstránenie hlasu"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3622,46 +4193,72 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Audacious Ogg Vorbis dekodér\n\nZaložené na Xiph.org Foundation's Ogg Vorbis zásuvnom module:\nhttp://www.xiph.org/\n\nPôvodný kód:\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nPrispievatelia:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Audacious Ogg Vorbis dekodér\n"
+"\n"
+"Založené na Xiph.org Foundation's Ogg Vorbis zásuvnom module:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Pôvodný kód:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Prispievatelia:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis dekodér"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr "Vortex file format prehávač napísal Sashnov Alexander <sashnov@ngs.ru>\nZaložené na in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\nAudacious zásuvný modul napísal Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+"Vortex file format prehávač napísal Sashnov Alexander <sashnov@ngs.ru>\n"
+"Založené na in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious zásuvný modul napísal Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "VTX dekodér"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "stratový (hybrid)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "stratový"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n\nčasť kódu zásuvného modulu napísal Miles Egan."
+msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"časť kódu zásuvného modulu napísal Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "WavPack dekodér"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "2SF dekodér"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Shareable Playlists (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - vyberte súbor"

audacious-plugins-3.3.4.tar.bz2/po/sr_RS.po -> audacious-plugins-3.4.2.tar.bz2/po/sr_RS.po Changed

@@ -3,589 +3,613 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011-2012.
+# MirosNik <miroslavnikolic@rocketmail.com>, 2011-2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-16 23:46+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-31 17:04+0000\n"
 "Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: Serbian\n"
+"Language-Team: Serbian (Serbia) (http://www.transifex.com/projects/p/"
+"audacious/language/sr_RS/)\n"
+"Language: sr_RS\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sr_RS\n"
-"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"
+"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"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "моно"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "стерео"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "окружење"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "ААЦ декодер"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "низовни"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "Ад прикључак (АдБибл програм)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "Прикључак који може бити коришћен да започне пуштање у одређено време.\n\nПрвобитни аутори су Адам Фикин и Данијел Стоден."
+msgstr ""
+"Прикључак који може бити коришћен да започне пуштање у одређено време.\n"
+"\n"
+"Првобитни аутори су Адам Фикин и Данијел Стоден."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Аларм"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Ово је ваш позив за буђење."
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "У реду"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Подешавања аларма"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Време"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "сат(а)"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr "часова"
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "минута"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Утишај након:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Активирај аларм у (основно):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Ово је ваш позив за буђење."
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Изаберите којим данима ће се активирати аларм"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Основно"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Подсетник"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "Дан"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Понедељак"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Среда"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "Петак"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Субота"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Недеља"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Понедељак"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Подешавања аларма"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Време"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Активирај аларм у (основно):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "часова"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Утишај након:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "сат(а)"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "минута"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Изаберите којим данима ће се активирати аларм"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Дан"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Основно"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Дани"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Ишчезавање"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "секунде"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Јачина"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Тренутно"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "Започни при"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "Заврши при"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Тренутно"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Додатна наредба"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "укључи"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Списак нумера (необавезно)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Изаберите списак нумера"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Подсетник"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Користи подсетник"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Опције"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Шта значе ове опције?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nВреме\n Активирај аларм у: \n Време када ће се активирати аларм.\n\n Утишај након: \n Зауставља аларм након истека овог времена.\n (ако није затворено прозорче буђења)\n\n\nДани\n Дан:\n Изаберите којим данима ће бити активиран аларм.\n\n Време:\n Изаберите време аларма за сваки дан, или\n штиклирајте квадратић да користите основно време.\n\n\nЈачина\n Ишчезавање: \n Повећава јачину звука до изабране јачине\n у овом временском периоду.\n\n Започни при: \n Започиње појачавање од ове јачине.\n\n Заврши при: \n Јачина при којој ће бити заустављено појачање.\n Ако је време појачања 0 онда подешава јачину\n на ову и започиње пуштање.\n\n\nОпције:\n Додатна наредба:\n Покреће ову наредбу за време аларма.\n\n Списак нумера: \n Учитава овај списак нумера да би пуштао песме \n (мора да садржи .m3u проширење). Ако није дат\n списак нумера онда ће бити коришћене песме\n које се тренутно налазе на списку.\n Адреса мп3/огг тока може такође бити унешена\n овде.\n\n Подсетник:\n Приказује подсетник након искључења аларма,\n упишите подсетник у поље и штиклирајте\n квадратић ако желите да буде приказиван.\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Помоћ"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Откажи"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Ваш подсетник за данас је.."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Хвала вам"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Омот албума"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Основни ПЦМ уређај"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Основни уређај мешача"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Поставке Алсиног прикључка излаза"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "ПЦМ уређај:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Уређај миксера:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Елемент мешача:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Решите суви прекид"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "Прикључак излаза АЛСА-е за Безочника\nАуторска права 2009-2012 Џон Линдгрин\n\nЗахваљујем се Вилијаму Питкоку, аутору НГ прикључка излаза АЛСА-е, чији је код служио као узор када упутство АЛСА-е није било довољно."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"Прикључак излаза АЛСА-е за Безочника\n"
+"Ауторска права 2009-2012 Џон Линдгрин\n"
+"\n"
+"Захваљујем се Вилијаму Питкоку, аутору НГ прикључка излаза АЛСА-е, чији је "
+"код служио као узор када упутство АЛСА-е није било довољно."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "Излаз АЛСА-е"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "АМИДИ-Прикључак (МИДИ програм)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Нисте изабрали ниједан порт секвенцера за МИДИ пуштање. То можете урадити у поставкама МИДИ прикључка."
+msgstr ""
+"Нисте изабрали ниједан порт секвенцера за МИДИ пуштање. То можете урадити у "
+"поставкама МИДИ прикључка."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "АМИДИ-Прикључак (МИДИ програм)"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "АЛСА позадинац "
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Овај позадинац шаље МИДИ догађаје у групу портова АЛСА секвенцера коју је изабрао корисник. Сучеље АЛСА секвенцера је врло разноврсно, може да обезбеди портове за хардверске синтисајзере звучних картица (тј. ему10к1), али такође и за софтверске синтисајзере, спољне уређаје, итд.\nОвај позадинац не производи звук, МИДИ догађајима се управља непосредно са уређаја/програма иза АЛСА портова; на пример, МИДИ догађаји послати хардверском синтисајзеру ће бити директно репродуковани.\nОвај програм је написао Ђакомо Лоцито."
+msgstr ""
+"Овај позадинац шаље МИДИ догађаје у групу портова АЛСА секвенцера коју је "
+"изабрао корисник. Сучеље АЛСА секвенцера је врло разноврсно, може да "
+"обезбеди портове за хардверске синтисајзере звучних картица (тј. ему10к1), "
+"али такође и за софтверске синтисајзере, спољне уређаје, итд.\n"
+"Овај позадинац не производи звук, МИДИ догађајима се управља непосредно са "
+"уређаја/програма иза АЛСА портова; на пример, МИДИ догађаји послати "
+"хардверском синтисајзеру ће бити директно репродуковани.\n"
+"Овај програм је написао Ђакомо Лоцито."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Флуид синт позадинац "
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Овај позадинац производи звук тако што шаље МИДИ догађаје Флуид синту, реално временском софтверском синтисајзеру заснованом на СаундФонт2 спецификацији (www.fluidsynth.org).\nПроизведени звук може бити манипулисан помоћу програмских прикључака за ефекте а обрађен изабраним прикључком излаза.\nОвај програм је написао Ђакомо Лоцито."
+msgstr ""
+"Овај позадинац производи звук тако што шаље МИДИ догађаје Флуид синту, "
+"реално временском софтверском синтисајзеру заснованом на СаундФонт2 "
+"спецификацији (www.fluidsynth.org).\n"
+"Произведени звук може бити манипулисан помоћу програмских прикључака за "
+"ефекте а обрађен изабраним прикључком излаза.\n"
+"Овај програм је написао Ђакомо Лоцито."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Порт"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Име програма"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Име порта"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "АЛСА, излазни портови"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Звучна картица: "
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Контрола миксера: "
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Подешавања миксера"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "АЛСА\nпозадинац"
+msgstr ""
+"АЛСА\n"
+"позадинац"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "АМИДИ прикључак — информације о позадинцу"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Избор позадинца"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Подешавања репродукције"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Премештај: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Промена бубња: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Напредна подешавања"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "унапред израчунај дужину МИДИ датотека у списку нумера"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "извуци коментаре из МИДИ датотеке (ако постоје)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "извуци текст песме из МИДИ датотеке (ако постоји)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "АМИДИ\nприкључак"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "АМИДИ прикључак — изаберите датотеку"
+msgstr ""
+"АМИДИ\n"
+"прикључак"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Подешавања АМИДИ прикључка"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "АМИДИ прикључак — изаберите СаундФонт датотеку"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Подешавања СаундФонта"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Назив датотеке"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Величина (бајтова)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Учитај СФ при покретању програма"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Учитај СФ при првом пуштању МИДИ датотеке"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Подешавања синтисајзера"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "појачање"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "користи основно"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "вредност:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "полифонија"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "одјек"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "да"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "не"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "хор"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "узорковање"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "произвољно "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "ФлуидСинт\nпозадинац"
+msgstr ""
+"ФлуидСинт\n"
+"позадинац"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Назив:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " МИДИ Информације "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Трајање (msec):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Број нумера:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "променљиво"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "БПМ:"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "БПМ (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Див време:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " МИДИ коментари и текстови песама "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* нема доступних коментара у овој МИДИ датотеци *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* нема доступних текстова песама у овој МИДИ датотеци *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (неисправан УТФ-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "О АМИДИ прикључку"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -649,7 +673,10 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Приказује ОСД када се, у току репродукције, измени наслов песме али назив датотеке остане исти. Ово је углавном корисно за приказивање измена у насловима у интернет токовима."
+msgstr ""
+"Приказује ОСД када се, у току репродукције, измени наслов песме али назив "
+"датотеке остане исти. Ово је углавном корисно за приказивање измена у "
+"насловима у интернет токовима."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -781,8 +808,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Није откривен композитни управник;\nосим ако знате да је један већ покренут, молим покрените композитног управника јер у супротном ОСД неће радити исправно"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Није откривен композитни управник;\n"
+"осим ако знате да је један већ покренут, молим покрените композитног "
+"управника јер у супротном ОСД неће радити исправно"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -845,47 +876,47 @@
 msgid "Misc"
 msgstr "Остало"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "АСИксв1/АСИксв2 спискови нумера"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Безочникови спискови нумера (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Боје"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Обим замућења"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Поставке Бојер стереофонског-у-бинаурални"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Ниво довода:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Учестаност исецања:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Претподешавања:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Бојер стереофонски-у-бинаурални (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Анализатор спектра"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -895,233 +926,246 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "Ауторска права (C) 2007-2012 Калин Крисан <ccrisan@gmail.com> и остали.\n\nВелико хвала „libcdio“ програмерима <http://www.gnu.org/software/libcdio/>\nи „libcddb“ програмерима <http://libcddb.sourceforge.net/>.\n\nХвала ти такође Тони Врун што си ме саветовао и водио.\n\nБеше то Гугл лето пројекта Кôд 2007."
+msgstr ""
+"Ауторска права (C) 2007-2012 Калин Крисан <ccrisan@gmail.com> и остали.\n"
+"\n"
+"Велико хвала „libcdio“ програмерима <http://www.gnu.org/software/libcdio/>\n"
+"и „libcddb“ програмерима <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Хвала ти такође Тони Врун што си ме саветовао и водио.\n"
+"\n"
+"Беше то Гугл лето пројекта Кôд 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Уређај"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Брзина читања:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Препиши уређај:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Метаподаци"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Користи ЦД-текст"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Користи ЦДБП"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Користи ХТТП уместо ЦДДБП-а"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Путања:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Прикључник:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Прикључак звучног ЦД-а"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Нисам успео да започнем цдуи подсистем."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Неисправна путања „%s“."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Нисам пронашао нумеру „%d“."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Нисам успео да отворим излаз звука."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Аудио ЦД"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Нисам успео да отворим ЦД уређај „%s“."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "Нисам пронашао уређај за читање ЦД-а."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Нисам успео да завршим покретање отвореног ЦД уређаја."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Нисам успео да пронађем број прве/последње нумере."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Не могу да прочитам почетак/крај ЛСН-а за нумеру „%d“."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Нисам успео да направим везу са цд базом података."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Нисам успео да пропитам сервер базе података ЦД-а"
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Нисам успео да пропитам сервер базе података ЦД-а: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Нисам успео да прочитам обавештење базе података цд-а: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Уређај је празан."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Неподржана врста диска."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Пусти ЦД"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Додај ЦД"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Ставке изборника звучног ЦД-а"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Сажимање"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Главна јачина:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Динамички опсег:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Прикључак сажимања динамичког опсега за Безочника\nАуторска права 2010-2012 Џон Линдгрин"
+msgstr ""
+"Прикључак сажимања динамичког опсега за Безочника\n"
+"Ауторска права 2010-2012 Џон Линдгрин"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Сажиматељ динамичког опсега"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Конзолни музички декодер игре"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Опште"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Репродукција"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "Ниски тонови:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "секунди"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "Високи тонови:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Основно трајање песме:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Поновно узорковање"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Укључи поновно узорковање"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Проток поновног узорковања:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "СПЦ"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Занемари трајање из СПЦ ознака"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Повећај одјек"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "Основно трајање песме, изражено у секундама, се користи за песме које не пружају информације о трајању (тј. упетљане нумере)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Основно трајање песме, изражено у секундама, се користи за песме које не "
+"пружају информације о трајању (тј. упетљане нумере)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1129,88 +1173,106 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "Мотор конзолног музичког декодера је заснован на „Game_Music_Emu“-у 0.5.2\nПодржани формати: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\nПрикључак за Безочника су приредили:\nВилијам Питкок <nenolod@dereferenced.org>, \nШај Грин <gblargg@gmail.com>"
+msgstr ""
+"Мотор конзолног музичког декодера је заснован на „Game_Music_Emu“-у 0.5.2\n"
+"Подржани формати: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"Прикључак за Безочника су приредили:\n"
+"Вилијам Питкок <nenolod@dereferenced.org>, \n"
+"Шај Грин <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "Постепени прелаз није успео јер је песма имала различит број канала. Можете да користите Мешача канала да претворите песме на исти број канала."
+msgstr ""
+"Постепени прелаз није успео јер је песма имала различит број канала. Можете "
+"да користите Мешача канала да претворите песме на исти број канала."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Постепени прелаз није успео јер је песма имала различит проток узорка. Можете да користите Претварача протока узорка да претворите песме на исти проток узорка."
+msgstr ""
+"Постепени прелаз није успео јер је песма имала различит проток узорка. "
+"Можете да користите Претварача протока узорка да претворите песме на исти "
+"проток узорка."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Прикључак постепеног прелаза за Безочника\nАуторска права 2010-2012 Џон Линдгрин"
+msgstr ""
+"Прикључак постепеног прелаза за Безочника\n"
+"Ауторска права 2010-2012 Џон Линдгрин"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Постепени прелаз"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Преклапање:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Постепени прелаз"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Јакост:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Прикључак „cue“ табеле"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Одјек"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Застој:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "ms"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Одзив:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Јачина звука:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Прикључак одјека\nАутор Јохан Левин 1999\n\nОкружење одјека је написао Карл ван Шаик, 1999"
+msgstr ""
+"Прикључак одјека\n"
+"Аутор Јохан Левин 1999\n"
+"\n"
+"Окружење одјека је написао Карл ван Шаик, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Одјек"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1218,9 +1280,15 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Прикључак декодирања вишеобликног звука за Безочника који користи\nвишемедијски радни оквир ФФмпег-а (http://www.ffmpeg.org/)\n\nПрикључак за Безочника су приредили:\nВилијам Питкок <nenolod@nenolod.net>\nМати Хамалајнен <ccr@tnsp.org>"
+msgstr ""
+"Прикључак декодирања вишеобликног звука за Безочника који користи\n"
+"вишемедијски радни оквир ФФмпег-а (http://www.ffmpeg.org/)\n"
+"\n"
+"Прикључак за Безочника су приредили:\n"
+"Вилијам Питкок <nenolod@nenolod.net>\n"
+"Мати Хамалајнен <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Прикључак ФФмпег-а"
 
@@ -1288,7 +1356,21 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Овај програм је слободан; можете га расподељивати\nи мењати под условима ГНУ-ове опште јавне лиценце\nкоју је објавила Задужбина за слободни софтвер.\nПодржано је друго издање лиценце или новије.\n\nОвај програм се расподељује у нади да ће бити користан,\nали БЕЗ ИКАКВЕ ГАРАНЦИЈЕ, чак и без примењене гаранције\nТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\nПогледајте ГНУ-ову општу јавну лиценцу за више детаља.\n\nТребало би да сте примили примерак ГНУ-ове опште јавне лиценце\nуз овај програм. Ако нисте, пишите на адресу:\n„Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA“."
+msgstr ""
+"Овај програм је слободан; можете га расподељивати\n"
+"и мењати под условима ГНУ-ове опште јавне лиценце\n"
+"коју је објавила Задужбина за слободни софтвер.\n"
+"Подржано је друго издање лиценце или новије.\n"
+"\n"
+"Овај програм се расподељује у нади да ће бити користан,\n"
+"али БЕЗ ИКАКВЕ ГАРАНЦИЈЕ, чак и без примењене гаранције\n"
+"ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"
+"Погледајте ГНУ-ову општу јавну лиценцу за више детаља.\n"
+"\n"
+"Требало би да сте примили примерак ГНУ-ове опште јавне лиценце\n"
+"уз овај програм. Ако нисте, пишите на адресу:\n"
+"„Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301, USA“."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1302,11 +1384,13 @@
 msgid "Joint Stereo"
 msgstr "Удружени стерео"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Моно"
 
@@ -1354,7 +1438,7 @@
 msgid "Error protection"
 msgstr "Грешка заштите"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Квалитет"
 
@@ -1434,429 +1518,492 @@
 msgid "Tags"
 msgstr "Ознаке"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Подешавање Ворбис шифрера"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Ниво квалитета (0 — 10):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "без губитака"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Оригинални кôд је написао\nРалф Ерцингер <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Оригинални кôд је написао\n"
+"Ралф Ерцингер <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "ФЛАЦ декодер"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "ГУИ прикључак за Безочника\nАуторска права 2009-2012 Џон Линдгрин"
+msgstr ""
+"ГУИ прикључак за Безочника\n"
+"Ауторска права 2009-2012 Џон Линдгрин"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "ГУИ прикључак"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Прикључак Гномове пречице\nОмогућава вам да управљате програмом користећи Гномове пречице.\n\nАуторска права (C) 2007-2008 Саша Хласјак <contact@saschahlusiak.de>"
+msgstr ""
+"Прикључак Гномове пречице\n"
+"Омогућава вам да управљате програмом користећи Гномове пречице.\n"
+"\n"
+"Ауторска права (C) 2007-2008 Саша Хласјак <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Гномове пречице"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Број ставке"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Наслов"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Извођач"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Година"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Албум"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Нумера"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Положај колоне"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Трајање"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Путања датотеке"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Назив датотеке"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Произвољан наслов"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Битски проток"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Изабери колоне"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Доступно:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Изабрано:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Усидри на лево"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Усидри на десно"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Усидри на врх"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Усидри на дно"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Откачи"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Искључи"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "Отвори _датотеке ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Отвори _адресу ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "Додај да_тотеке ..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Додај ад_ресу ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "_Претражи библиотеку"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "О _програму ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Поставке ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "Пу_сти"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "Па_узирај"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Заустави"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "_Претходно"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "С_ледеће"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "_Понови"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "_Насумично"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "Н_е напредуј у списку нумера"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "Заустави _након ове песме"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "Подаци о _песми ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Пређи на _време ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "Пређи на _песму ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "Према броју _нумере"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "Према _наслову"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Према броју _нумере"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "Према _извођачу"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "Према _албуму"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "Према _датуму издавања"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "Према _путањи датотеке"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "Према п_роизвољном наслову"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "Преокрени п_оредак"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "_Случајан поредак"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "_Пусти овај списак нумера"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Освежи"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Уклони _недоступне датотеке"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "Пор_еђај"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Поређај означене"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Уклони _недоступне датотеке"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Ново"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "_Преименуј ..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Затвори"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "Ув_ези ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "Из_вези ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Управник списка _нумера ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Управник _редоследа ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "По_јачај"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "У_тишај"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "Ује_дначавач"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "Е_фекти"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "Су_чеље"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Визуализације"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Прикажи траку _изборника"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Прикажи траку _података"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "Прикажи _визуелизацију траке обавштења"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Прикажи траку _стања"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Прикажи дугмад за _затварање"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Прикажи _наслове колона"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Изабери _колоне ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "_Клизај при промени песме"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Датотека"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Извођење"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Списак нумера"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "_Услуге"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "_Излаз"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "_Преглед"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Стави у ред/Избаци из реда"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "_Исеци"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "У_множи"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "У_баци"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "_Изабери све"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "_Преименуј ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "ГТК сучеље"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s — Безочник"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Баферујем ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Безочник"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Грешка"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1864,113 +2011,124 @@
 msgstr[1] "%d канала"
 msgstr[2] "%d један канал"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kb/s"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "Претходна нумера"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Пусти"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Паузирај/настави"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Заустави"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "Следећа нумера"
+msgid "Rewind 5 seconds"
+msgstr ""
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "Унапред 5 секунде"
+msgid "Mute"
+msgstr "Искључи звук"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "Уназад 5 секунде"
+msgid "Volume up"
+msgstr ""
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "Искључи звук"
+msgid "Volume down"
+msgstr ""
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "Појачај"
+msgid "Jump to file"
+msgstr ""
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "Утишај"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Скочи до датотеке"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "Прикажи приказ на екрану"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr "Укључи/искључи главни прозор"
+msgid "Toggle repeat"
+msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "Прикажи приказ на екрану"
+msgid "Toggle shuffle"
+msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "Укључи/искључи понављање"
+msgid "Toggle stop after current"
+msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "Укључи/искључи премештање"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr "Издигни главни прозор"
+msgid "Raise player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(ништа)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Није препоручљиво повезати главну дугмад миша без измењивача.\n\nДа ли желите да наставите?"
+msgstr ""
+"Није препоручљиво повезати главну дугмад миша без измењивача.\n"
+"\n"
+"Да ли желите да наставите?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Повезујем дугмад миша"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Подешавања прикључка општих пречица"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Притисните комбинацију тастера унутар поља за текст.\nМожете такође да повежете дугмад миша."
+msgstr ""
+"Притисните комбинацију тастера унутар поља за текст.\n"
+"Можете такође да повежете дугмад миша."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Пречице:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Радња:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Свезе тастера:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1983,104 +2141,131 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "Прикључак општих пречица\nУправљајте програмом користећи комбинације општих тастера или мултимедијалних тастера.\n\nАуторска права (C) 2007-2008 Саша Хласјак <contact@saschahlusiak.de>\n\nОстали сарадници:\nАуторска права (C) 2006-2007 Владимир Пасков <vlado.paskov@gmail.com>\nАуторска права (C) 2000-2002 Вил Сирјала <syrjala@sci.fi>\n Брајан Девис <curious@ihug.com.au>\n Џонатан А. Давис <davis@jdhouse.org>\n Џереми Тан <nsx@nsx.homeip.net>"
+msgstr ""
+"Прикључак општих пречица\n"
+"Управљајте програмом користећи комбинације општих тастера или "
+"мултимедијалних тастера.\n"
+"\n"
+"Ауторска права (C) 2007-2008 Саша Хласјак <contact@saschahlusiak.de>\n"
+"\n"
+"Остали сарадници:\n"
+"Ауторска права (C) 2006-2007 Владимир Пасков <vlado.paskov@gmail.com>\n"
+"Ауторска права (C) 2000-2002 Вил Сирјала <syrjala@sci.fi>\n"
+" Брајан Девис <curious@ihug.com.au>\n"
+" Џонатан А. Давис <davis@jdhouse.org>\n"
+" Џереми Тан <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Опште пречице"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "Засновано на иксммс-џеку, који је приредио Крис Морган:\nhttp://xmms-jack.sourceforge.net/\n\nЂакомо Лоцито је припремио за Безочника"
+msgstr ""
+"Засновано на иксммс-џеку, који је приредио Крис Морган:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Ђакомо Лоцито је припремио за Безочника"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "ЏЕК излаз"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Подешавања за %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Подешавања ЛАДСПА домаћину"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Путање модула:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Раздвојте више путања са две тачке.\nТе путање су тражене као додатне уз „ЛАДСПА ПУТАЊА“.\nНакон додавања нових путања, притисните Унеси да потражите нове прикључке."
+msgstr ""
+"Раздвојте више путања са две тачке.\n"
+"Те путање су тражене као додатне уз „ЛАДСПА ПУТАЊА“.\n"
+"Након додавања нових путања, притисните Унеси да потражите нове прикључке.</"
+"small>"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Доступни прикључци:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Укључи"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Укључени прикључци:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Подешавања"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "ЛАДСПА домаћин за Безочника\nАуторска права 2011 Џон Линдгрин"
+msgstr ""
+"ЛАДСПА домаћин за Безочника\n"
+"Ауторска права 2011 Џон Линдгрин"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "ЛАДСПА домаћин"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: не могу да започнем ЛИРЦ подршку\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: не могу да прочитам датотеку ЛИРЦ подешавања\n%s: молим прочитајте ЛИРЦ документацију\n%s: како да направите личну датотеку подешавања\n"
+msgstr ""
+"%s: не могу да прочитам датотеку ЛИРЦ подешавања\n"
+"%s: молим прочитајте ЛИРЦ документацију\n"
+"%s: како да направите личну датотеку подешавања\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: покушавам да се поново повежем...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: непозната наредба „%s“\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: прекинута је веза са ЛИРЦ-а\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: покушаћу да се поново повежем сваке %d секунде...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2094,155 +2279,309 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "Једноставан прикључак за управљање Безочником коришћењем демона даљинског управљања ЛИРЦ-а\n\nЗа Безочника су га прилагодили:\nТони Врун <chainsaw@gentoo.org>\nЈунас Харјумаки <jharjuma@gmail.com>\n\nЗаснован на ЛИРЦ прикључку ИксММЦ-а који су написали:\nКарл ван Шаик <carl@leg.uct.ac.za>\nКристоф Бартелмус <xmms@bartelmus.de>\nЕндрју О. Шадура <bugzilla@tut.by>\n\nДа сазнате више о ЛИРЦ-у, погледајте „http://lirc.org“."
+msgstr ""
+"Једноставан прикључак за управљање Безочником коришћењем демона даљинског "
+"управљања ЛИРЦ-а\n"
+"\n"
+"За Безочника су га прилагодили:\n"
+"Тони Врун <chainsaw@gentoo.org>\n"
+"Јунас Харјумаки <jharjuma@gmail.com>\n"
+"\n"
+"Заснован на ЛИРЦ прикључку ИксММЦ-а који су написали:\n"
+"Карл ван Шаик <carl@leg.uct.ac.za>\n"
+"Кристоф Бартелмус <xmms@bartelmus.de>\n"
+"Ендрју О. Шадура <bugzilla@tut.by>\n"
+"\n"
+"Да сазнате више о ЛИРЦ-у, погледајте „http://lirc.org“."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "Веза"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Поново се повежи са ЛИРЦ сервером"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Сачекај пре поновног повезивања:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "ЛИРЦ прикључак"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Нема доступних текстова"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Не могу да довучем „%s“"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Не могу да обрадим „%s“"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Тражим текст песме ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Недостају метаподаци песме"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "Повезујем се на „lyrics.wikia.com“ ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "Прикључак за Лирик вики"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "М3У списак нумера"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Генератор такта: %d отк/мин"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Генератор такта: %d отк/мин %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "Генератор такта је написао Мартин Штраус <mys@faveve.uni-stuttgart.de>\n\nДа га користите, додајте адресу: „tact://beats*num/den“\nнпр.: „tact://77“ да добијете 77 откуцаја у минуту\nили: „tact://60*3/4“ да добијете 60 отк./мин у 3/4 такту"
+msgstr ""
+"Генератор такта је написао Мартин Штраус <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Да га користите, додајте адресу: „tact://beats*num/den“\n"
+"нпр.: „tact://77“ да добијете 77 откуцаја у минуту\n"
+"или: „tact://60*3/4“ да добијете 60 отк./мин у 3/4 такту"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Генератор такта"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Прикључак мешача канала за Безочника\nАуторска права 2011-2012 Џон Линдгрин и Михал Липски"
+msgstr ""
+"Прикључак мешача канала за Безочника\n"
+"Ауторска права 2011-2012 Џон Линдгрин и Михал Липски"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Мешач канала"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Излазни канали:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Мешач канала"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "ММС прикључак"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "Мод прикључак (Програм за модле)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Окружење"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "МПГ123 прикључак"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "МПРИС 2 сервер"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Неон ХТТП/ХХТПС прикључак"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Заустављено"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Безочник не пушта песме."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
-"\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Засновано на „libnotify-aosd“-у Максимилијана Богнера:\nhttp://www.mbogner.de/projects/libnotify-aosd/\n\nАуторска права (C) 2010 Максимилијан Богнер\nАуторска права (C) 2011 Џон Линдгрин\n\nОвај прикључак је слободан софтвер: можете га прослеђивати\nи/или мењати под условима ГНУ Опште јавне лиценце коју је\nобјавила Задужбина слободног софтвера, било верзије 3 те\nлиценце, или (по вашем избору) било које новије верзије.\n\nОвај прикључак се расподељује у нади да ће бити користан,\nали БЕЗ ИКАКВЕ ГАРАНЦИЈЕ; чак и без примењене гаранције\nТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ. \nПогледајте ГНУ Општу јавну лиценцу за више детаља.\n\nТребали сте да примите примерак ГНУ Опште јавне лиценце уз овај\nпрограм. Ако нисте, погледајте <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Обавештења радне површи"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Паузирај"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Следећа"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Основни уређај"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Звучни уређај:"
 
@@ -2267,22 +2606,28 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "Прикључак ОСС4 излаза за Безочника\nАуторска права 2010-2012 Михал Липски\n\nЖелим да се захвалим људима на „#audacious“, нарочито Тони Вруну и Џону Линдгрину и наравно ауторима претходног ОСС прикључка."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"Прикључак ОСС4 излаза за Безочника\n"
+"Ауторска права 2010-2012 Михал Липски\n"
+"\n"
+"Желим да се захвалим људима на „#audacious“, нарочито Тони Вруну и Џону "
+"Линдгрину и наравно ауторима претходног ОСС прикључка."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "ОСС4 излаз"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "ПЛС спискови нумера"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "ОпенПСФ ПСФ1/ПСФ2 декодер"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2300,155 +2645,218 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "ПулсеАудио излазни прикључак Безочника\n\nОвај програм је слободан софтвер; можете га прослеђивати\nи/или мењати под условима ГНУ Опште јавне лиценце коју је\nобјавила Задужбина слободног софтвера; верзије 2 лиценце\nили (по вашем избору) било које новије верзије.\n\nОвај програм се расподељује у нади да ће бити користан,\nали БЕЗ ИКАКВЕ ГАРАНЦИЈЕ; чак и без примењене гаранције\nТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\nПогледајте ГНУ Општу јавну лиценцу за више детаља.\n\nТребали сте да примите примерак ГНУ Опште јавне лиценце\nуз овај програм; ако нисте, пишите Задужбини слободног\nсофтва на адресу: Free Software Foundation, Inc.,\n51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\nUSA."
+msgstr ""
+"ПулсеАудио излазни прикључак Безочника\n"
+"\n"
+"Овај програм је слободан софтвер; можете га прослеђивати\n"
+"и/или мењати под условима ГНУ Опште јавне лиценце коју је\n"
+"објавила Задужбина слободног софтвера; верзије 2 лиценце\n"
+"или (по вашем избору) било које новије верзије.\n"
+"\n"
+"Овај програм се расподељује у нади да ће бити користан,\n"
+"али БЕЗ ИКАКВЕ ГАРАНЦИЈЕ; чак и без примењене гаранције\n"
+"ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"
+"Погледајте ГНУ Општу јавну лиценцу за више детаља.\n"
+"\n"
+"Требали сте да примите примерак ГНУ Опште јавне лиценце\n"
+"уз овај програм; ако нисте, пишите Задужбини слободног\n"
+"софтва на адресу: Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "Пулс‑аудио излаз"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Прикључак Претварача протока узорка за Безочника\nАуторска права 2010-2012 Џон Линдгрин"
+msgstr ""
+"Прикључак Претварача протока узорка за Безочника\n"
+"Ауторска права 2010-2012 Џон Линдгрин"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Прескочи/понови узорке"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Линијско уметање"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Брзо уметање усклађења"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Средње уметање усклађења"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Најбоље уметање усклађења"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Претварање"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Проток:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Мапирање протока"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Користи мапирање протока"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 kHz:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 kHz:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 kHz:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 kHz:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 kHz:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 kHz:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Претварач протока узорка"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Промените лозинку"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Услуге"
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Ласт.фм"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Корисничко име:"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Лозинка:"
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "Адреса Скроблера:"
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:233
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Безочников прикључак Аудио Скроблера\n\nОригинално су га урадили Аудун Хов <audun@nlc.no> и Пипиан <pipian@pipian.com>"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Скроблер"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr ""
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "Прикључак СДЛ излаза за Безочника\nАуторска права 2010 Џон Линдгрин"
+msgstr ""
+"Прикључак СДЛ излаза за Безочника\n"
+"Ауторска права 2010 Џон Линдгрин"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "СДЛ излаз"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Библиотека"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Непознат извођач"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Непознат албум"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\n „%s“ изводи %s"
+msgstr ""
+"%s\n"
+" „%s“ изводи %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
@@ -2457,7 +2865,7 @@
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2470,7 +2878,7 @@
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2483,73 +2891,75 @@
 msgstr[2] ""
 msgstr[3] ""
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Направи списак нумера"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Додај у списак нумера"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Претражите библиотеку"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Да увезете вашу музичку библиотеку у Безочнику, изаберите фасциклу и затим кликните на иконицу „освежи“."
+msgstr ""
+"Да увезете вашу музичку библиотеку у Безочнику, изаберите фасциклу и затим "
+"кликните на иконицу „освежи“."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Молим сачекајте ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Изаберите фасциклу"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Алат за претрагу"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Винампово уобичајено сучеље"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Плејер:"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Изаберите словни лик главног прозора плејера:"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Списак нумера:"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Изабери словни лик списка нумера:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "_Словни ликови"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Користи битмап словне ликове (подржава само АСКРИ)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Померај наслов песме у оба смера"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "_Маска"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Поставке сучеља"
 
@@ -2605,7 +3015,7 @@
 msgid "Presets"
 msgstr "Претподешавања"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Учитава претподешавање"
 
@@ -2618,7 +3028,7 @@
 msgid "Load equalizer preset"
 msgstr "Учитава претподешавање уједначавача"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Чува претподешавање"
 
@@ -2630,7 +3040,7 @@
 msgid "Save equalizer preset"
 msgstr "Чува претподешавање уједначавача"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Избриши претподешавање"
 
@@ -2638,739 +3048,754 @@
 msgid "Delete auto-preset"
 msgstr "Брише самостално претподешавање"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kb/s"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Тражи до: %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Јачина звука: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Уравнотеженост: %d%% леви"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Уравнотеженост: центрирано"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Уравнотеженост: %d%% десни"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Изборник опција"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Искључи „Увек у првом плану“"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Укључи „Увек у првом плану“"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Поље информација о датотеци"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Изборник приказивања"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Једноставни режим."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Режим списка нумера."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Зауставља након песме."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Не зауставља након песме."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Сам померај назив песме"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Заустави после текуће песме"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Врхови"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Понови"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Насумично"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Не напредуј у списку нумера"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Прикажи плејер"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Прикажи уређивач списка нумера"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Прикажи уједначавач"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Увек у првом плану"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "Стави на све радне просторе"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Замотај плејер"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Замотај уређивач списка нумера"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Замотај уједначавач"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Анализатор"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Досег"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Отисак гласа"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Искључено"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Нормалан"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Ватра"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Вертикалне линије"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Линије"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Траке"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Тачкасти досег"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Линијски досег"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Испуњен досег"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Лед"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Глатко"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Најспорије"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Споро"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Средње"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Брзо"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Најбрже"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Протекло време"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Преостало време"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Паузирај"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Претходна"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Следећа"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Приказивање"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Режим приказивања"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Режим анализатора"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Режим досега"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Режим отиска гласа"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "ВУ режим скривања прозора"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Опадање анализатора"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Опадање врхова"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Списак нумера"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Пусти списак нумера"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Нови списак нумера"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Изабери следећи списак нумера"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Изабери претходни списак нумера"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Избриши списак нумера"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Увези списак нумера"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Учитава датотеку списка нумера у изабрани списак нумера."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Извези списак нумера"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Чува изабрани списак нумера."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Освежи списак"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Освежава метаподатке придружене ставци списка нумера."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Управник списка нумера"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Управник редоследа"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Поглед"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Сучеље"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Поставке сучеља ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Додај интернет адресу..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Додаје удаљену нумеру на списак нумера."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Додај датотеке..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Додаје датотеке на списак нумера."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Претражи и означи"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr "Претржује списак нумера и означава ставке са списка нумера према одређеном услову."
+msgstr ""
+"Претржује списак нумера и означава ставке са списка нумера према одређеном "
+"услову."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Обрни избор"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Преокреће означене и неозначене ставке."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Означи све"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Означава све ставке са списка нумера."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Означи ништа"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Одзначава све ставке са списка нумера."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Уклони све"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Уклања све ставке са списка нумера."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Обриши заказано"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Брише заказано придружено овом списку нумера."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Уклони недоступне датотеке"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Уклања недоступне датотеке са списка нумера."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Уклони дупликате"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "Према наслову"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Уклања дупликате са списка нумера према наслову."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "Према називу датотеке"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Уклања дупликате са списка нумера према називу датотеке."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "Према путањи и називу датотеке"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Уклања дупликате са списка нумера према њиховој пуној путањи."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Уклони неозначене"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Уклања неозначене ставке са списка нумера."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Уклони означене"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Уклања означене ставке са списка нумера."
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Насумице испремештај списак"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Насумице испремешта списак нумера."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Преокрени списак"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Преокреће списак нумера."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Поређај списак"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Ређа списак према наслову."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "Према албуму"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Ређа списак према извођачу."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "Према извођачу"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Ређа списак према извођачу."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Ређа списак према имену датотеке."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Ређа списак према пуном имену путање."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "Према датуму"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Ређа списак према датуму измене."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "Према броју нумере"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Ређа списак према броју нумере."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Поређај означене"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Датотека"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Услуге прикључка"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Прикажи детаље нумере"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Приказује детаље нумере"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "О Безочнику"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Пусти датотеку"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Учитава и пушта датотеку"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Пусти локацију"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Пушта медиј са изабране локације"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Услуге додатака"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Поставке"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Отвара прозор поставки"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Гаси Безочника"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Постави А—Б"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Обриши А—Б"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Скочи до датотеке"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Пређи на време"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "У ред/из реда"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Укључује/искључује ставке у/из ред(а) списак(а) нумера."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Умножи"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Исеци"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Убаци"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Учитај"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Увези"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Сачувај"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Обриши"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Претподешавање"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Самостално учитај претподешавања"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Учитава самостално учитана претподешавања"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Учитава основно претподешавање у уједначавачу"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Нула"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Поставља нивое претподешавања уједначавача на нулу"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "Из датотеке"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Учитава претподешавање из датотеке"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Из ВинАМП ЕКуФ датотеке"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Учитава претподешавање из ВинАМП ЕКуФ датотеке"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "ВинАМП претподешавања"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Увези ВинАМП претподешавања"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Чува самостално учитано претподешавање"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Чува основно претподешавање"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "У датотеку"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Чува претподешавање у датотеку"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "У ВинАМП ЕКуФ датотеку"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Чува претподешавање у ВинАМП ЕКуФ датотеку"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Брише самостално учитано претподешавање"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Претражи ставке у активном списку нумера"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Обележите ставке у списку нумера попуњавајући једно или више поља. Поља користе синтаксу обичних израза, не разликују величину слова. Ако не знате како обични изрази функционишу, једноставно дословно унесите део онога што тражите."
+msgstr ""
+"Обележите ставке у списку нумера попуњавајући једно или више поља. Поља "
+"користе синтаксу обичних израза, не разликују величину слова. Ако не знате "
+"како обични изрази функционишу, једноставно дословно унесите део онога што "
+"тражите."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Наслов: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Албум: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Извођач: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Назив датотеке: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Обриши претходни избор пре претраге"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Подударајуће ставке самостално пребаци у ред"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Направи нови списак нумера са подударајућим ставкама"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Уређивач списка нумера"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d од %d)"
@@ -3388,81 +3813,124 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Не могу да направим фасциклу (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Заснован на прикључку иксммс_звучнедатотеке:\n"
+"Ауторска права (C) 2000, 2002 Ерик де Кастро Лопо\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"За Безочника га је прилагодио Тони Врун <chainsaw@gentoo.org>\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Заснован на прикључку иксммс_звучнедатотеке:\nАуторска права (C) 2000, 2002 Ерик де Кастро Лопо\n\nЗа Безочника га је прилагодио Тони Врун <chainsaw@gentoo.org>\n\nОвај програм је слободан софтвер; можете га прослеђивати\nи/или мењати под условима ГНУ Опште јавне лиценце коју је\nобјавила Задужбина слободног софтвера; верзије 2 лиценце\nили (по вашем избору) било које новије верзије.\n\nОвај програм се расподељује у нади да ће бити користан,\nали БЕЗ ИКАКВЕ ГАРАНЦИЈЕ; чак и без примењене гаранције\nТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\nПогледајте ГНУ Општу јавну лиценцу за више детаља.\n\nТребали сте да примите примерак ГНУ Опште јавне лиценце\nуз овај програм; ако нисте, пишите Задужбини слободног\nсофтва на адресу: Free Software Foundation, Inc.,\n51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"Овај програм је слободан софтвер; можете га прослеђивати\n"
+"и/или мењати под условима ГНУ Опште јавне лиценце коју је\n"
+"објавила Задужбина слободног софтвера; верзије 2 лиценце\n"
+"или (по вашем избору) било које новије верзије.\n"
+"\n"
+"Овај програм се расподељује у нади да ће бити користан,\n"
+"али БЕЗ ИКАКВЕ ГАРАНЦИЈЕ; чак и без примењене гаранције\n"
+"ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\n"
+"Погледајте ГНУ Општу јавну лиценцу за више детаља.\n"
+"\n"
+"Требали сте да примите примерак ГНУ Опште јавне лиценце\n"
+"уз овај програм; ако нисте, пишите Задужбини слободног\n"
+"софтва на адресу: Free Software Foundation, Inc.,\n"
+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Прикључак звучне датотеке"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "О прикључку звучногуи излаза"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
-msgstr "Прикључак звучногуи излаза\n\nНаписао га је Томас Пфаф <tpfaff@tp76.info>\n"
+msgstr ""
+"Прикључак звучногуи излаза\n"
+"\n"
+"Написао га је Томас Пфаф <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Неподржани облик датотеке"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Звучни уређај је затражио неподржани облик датотеке.\n\nМолим покушајте опет са покренутим „sndiod(1)“ сервером."
+msgstr ""
+"Звучни уређај је затражио неподржани облик датотеке.\n"
+"\n"
+"Молим покушајте опет са покренутим „sndiod(1)“ сервером."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "звучниуи уређај"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(празно значи задато)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "У реду"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Откажи"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Промена песме"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Наредба за покретање када Безочник започиње нову песму."
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "Наредба:"
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Наредба за покретање при крају песме."
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Наредба за покретање када Безочник стигне на крај списка нумера."
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "Наредба за покретање када се промени наслов песме (тј. наслови мрежних токова)."
+msgstr ""
+"Наредба за покретање када се промени наслов песме (тј. наслови мрежних "
+"токова)."
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3479,35 +3947,85 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Можете да користите следеће ниске формата које\nће бити замењене пре позивања наредбе\n(нису све корисне за наредбу крај-списка-нумера):\n\n%F: Учесталост (у херцима)\n%c: Број канала\n%f: Назив датотеке (пуна путања)\n%l: Трајање (у милисекундама)\n%n или %s: Назив песме\n%r: Проток (у битима у секунди)\n%t: Позиција списка нумера (%%02d)\n%p: Тренутно пуштена (1 или 0)\n%a: Уметник\n%b: Албум\n%T: Наслов нумере"
+msgstr ""
+"Можете да користите следеће ниске формата које\n"
+"ће бити замењене пре позивања наредбе\n"
+"(нису све корисне за наредбу крај-списка-нумера):\n"
+"\n"
+"%F: Учесталост (у херцима)\n"
+"%c: Број канала\n"
+"%f: Назив датотеке (пуна путања)\n"
+"%l: Трајање (у милисекундама)\n"
+"%n или %s: Назив песме\n"
+"%r: Проток (у битима у секунди)\n"
+"%t: Позиција списка нумера (%%02d)\n"
+"%p: Тренутно пуштена (1 или 0)\n"
+"%a: Уметник\n"
+"%b: Албум\n"
+"%T: Наслов нумере"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Параметри прослеђени љусци би требало да буду у наводницима. Све другачије је безбедносни ризик."
+msgstr ""
+"Параметри прослеђени љусци би требало да буду у "
+"наводницима. Све другачије је безбедносни ризик."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Наредбе"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Брзина и врхунац"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Брзина:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Врхунац:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Брзина и врхунац"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3516,94 +4034,114 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "Прикључак иконице стања\n\nАуторска права 2005-2007 Ђакомо Лоцито < james@develia.org >\nАуторска права 2010 Михал Липски <tallica@o2.pl>\n\nОвај додатак обезбеђује иконицу стања, смештену\nу области фиоке система управника прозора."
+msgstr ""
+"Прикључак иконице стања\n"
+"\n"
+"Ауторска права 2005-2007 Ђакомо Лоцито < james@develia.org >\n"
+"Ауторска права 2010 Михал Липски <tallica@o2.pl>\n"
+"\n"
+"Овај додатак обезбеђује иконицу стања, смештену\n"
+"у области фиоке система управника прозора."
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Радња клизања мишем"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Промени јачину звука"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Промени песму"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Остала подешавања"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Искључи прозор облачића"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Затвори у системску касету"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Напредује у списку нумера када клиза унапред"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Иконица стања"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Прикључак додатног стереа\n\nНаписао га је Џон Левин, 1999"
+msgstr ""
+"Прикључак додатног стереа\n"
+"\n"
+"Написао га је Џон Левин, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Додатни стерео"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Додатни стерео"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Тонски генератор: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "Синусни тонски генератор је написао Хавард Квален <havardk@xmms.org>\nПрерадио га је Данијел Ј. Пенг <danielpeng@bigfoot.com>\n\nДа га користите, додајте адресу: tone://учесталост1;учесталост2;учесталост3;...\nнпр.: tone://2000;2005 да пустите тонове 2000 Hz и 2005 Hz"
+msgstr ""
+"Синусни тонски генератор је написао Хавард Квален <havardk@xmms.org>\n"
+"Прерадио га је Данијел Ј. Пенг <danielpeng@bigfoot.com>\n"
+"\n"
+"Да га користите, додајте адресу: tone://учесталост1;учесталост2;"
+"учесталост3;...\n"
+"нпр.: tone://2000;2005 да пустите тонове 2000 Hz и 2005 Hz"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Тонски генератор"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "Прикључак У/И датотеке за Безочника\nАуторска права 2009-2012 Џон Линдгрин\n\nОВАЈ ПРИКЉУЧАК ЈЕ ПОТРЕБАН. НЕ ИСКЉУЧУЈТЕ ГА."
+msgstr ""
+"Прикључак У/И датотеке за Безочника\n"
+"Ауторска права 2009-2012 Џон Линдгрин\n"
+"\n"
+"ОВАЈ ПРИКЉУЧАК ЈЕ ПОТРЕБАН. НЕ ИСКЉУЧУЈТЕ ГА."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Прикључак У/И датотеке"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Уклањање гласа"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3622,46 +4160,74 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Безочников Огг Ворбис декодер\n\nЗаснован на Огг Ворбис прикључку Иксиф.орг удружења:\nhttp://www.xiph.org/\n\nПрвобитни код је написао:\nТони Арћери <bascule@inferno.tusculum.edu>\n\nДоприносиоци:\nКрис Монтгомери <monty@xiph.org>\nПитер Алм <peter@xmms.org>\nМајкл Смит <msmith@labyrinth.edu.au>\nЏек Мофит <jack@icecast.org>\nЈорн Бајен <jorn@nl.linux.org>\nХавард Квален <havardk@xmms.org>\nЂанкарло Паскуто <gcp@sjeng.org>\nЈуџон Загидулин <e.asphyx@gmail.com>"
+msgstr ""
+"Безочников Огг Ворбис декодер\n"
+"\n"
+"Заснован на Огг Ворбис прикључку Иксиф.орг удружења:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Првобитни код је написао:\n"
+"Тони Арћери <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Доприносиоци:\n"
+"Крис Монтгомери <monty@xiph.org>\n"
+"Питер Алм <peter@xmms.org>\n"
+"Мајкл Смит <msmith@labyrinth.edu.au>\n"
+"Џек Мофит <jack@icecast.org>\n"
+"Јорн Бајен <jorn@nl.linux.org>\n"
+"Хавард Квален <havardk@xmms.org>\n"
+"Ђанкарло Паскуто <gcp@sjeng.org>\n"
+"Јуџон Загидулин <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Огг Ворбис декодер"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr "Програм за пуштање Вортекс датотека је написао Сашнов Александер <sashnov@ngs.ru>\nЗаснован је на „in_vtx.dll“ који је написао Роман Шербаков <v_soft@microfor.ru>\nПрикључак за Безочника је написао Павел Виметалек <pvymetalek@seznam.cz>"
+msgstr ""
+"Програм за пуштање Вортекс датотека је написао Сашнов Александер "
+"<sashnov@ngs.ru>\n"
+"Заснован је на „in_vtx.dll“ који је написао Роман Шербаков <v_soft@microfor."
+"ru>\n"
+"Прикључак за Безочника је написао Павел Виметалек <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "ВТКС декодер"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "ослабљено (хибридно)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "ослабљено"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Ауторска права 2006 Вилијам Питкок <nenolod@nenolod.net>\n\nНешто кода прикључка је написао Мајлс Иган."
+msgstr ""
+"Ауторска права 2006 Вилијам Питкок <nenolod@nenolod.net>\n"
+"\n"
+"Нешто кода прикључка је написао Мајлс Иган."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Вејвпак декодер"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "2СФ декодер"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "ИксМЛ дељиви спискови пуштања (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "АМИДИ прикључак — изаберите датотеку"

audacious-plugins-3.4.2.tar.bz2/po/ta.po Added

@@ -0,0 +1,4022 @@
+# Tamil translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Gobi <gobikrishnant@gmail.com>, 2013
+# nar7esh <rajnareshwar@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins Plugins Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-06-03 19:30+0000\n"
+"Last-Translator: Gobi <gobikrishnant@gmail.com>\n"
+"Language-Team: Tamil (http://www.transifex.com/projects/p/audacious/language/"
+"ta/)\n"
+"Language: ta\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
+msgid "mono"
+msgstr "தனித்த "
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
+msgid "stereo"
+msgstr "ஒலிப்பிரிப்பு"
+
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
+msgid "surround"
+msgstr "சூழ்ந்த"
+
+#: src/aac/libmp4.c:930
+msgid "AAC Decoder"
+msgstr "AAC குறிவிலக்கி"
+
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
+msgid "sequenced"
+msgstr ""
+
+#: src/adplug/plugin.c:14
+msgid "AdPlug (AdLib Player)"
+msgstr "AdPlug (AdLib Player)"
+
+#: src/alarm/alarm.c:809
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr ""
+
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
+msgid "Alarm"
+msgstr "அலாரம்"
+
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "இது உங்களை எழுப்புவதற்கான அழைப்பு"
+
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
+
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "நினைவூட்டி"
+
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "திங்கட்கிழமை "
+
+#: src/alarm/interface.c:140
+msgid "Tuesday"
+msgstr "செவ்வாய்கிழமை "
+
+#: src/alarm/interface.c:140
+msgid "Wednesday"
+msgstr "புதன்கிழமை "
+
+#: src/alarm/interface.c:141
+msgid "Thursday"
+msgstr "வியாழக்கிழமை "
+
+#: src/alarm/interface.c:141
+msgid "Friday"
+msgstr "வெள்ளிக்கிழமை "
+
+#: src/alarm/interface.c:141
+msgid "Saturday"
+msgstr "சனிக்கிழமை "
+
+#: src/alarm/interface.c:141
+msgid "Sunday"
+msgstr "ஞாயிற்றுகிழமை "
+
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "அலாரம் அமைப்புகள்"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "நேரம் "
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "அலாரம் அடிக்கும் நேரம் (இயல்புநிலை) :"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "பின் நிசப்தமாக்குக: "
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "மணித்தியாலங்கள் "
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "நிமிடங்கள் "
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "அலாரம் வேண்டிய நாட்களை தெரிவு செய்க "
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "நாள் "
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "இயல்புநிலை"
+
+#: src/alarm/interface.c:310
+msgid "Days"
+msgstr "நாட்கள் "
+
+#: src/alarm/interface.c:319
+msgid "Fading"
+msgstr "மங்குதல் "
+
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
+msgid "seconds"
+msgstr "வினாடிகள் "
+
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
+msgid "Volume"
+msgstr "ஒலி அளவு "
+
+#: src/alarm/interface.c:339
+msgid "Start at"
+msgstr "இங்கு ஆரம்பிக்குக "
+
+#: src/alarm/interface.c:357
+msgid "Final"
+msgstr "இறுதி "
+
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "தற்போதைய "
+
+#: src/alarm/interface.c:387
+msgid "Additional Command"
+msgstr "மேலதிக பின்னூட்டு"
+
+#: src/alarm/interface.c:393
+msgid "enable"
+msgstr "செயல்படுத்துக "
+
+#: src/alarm/interface.c:400
+msgid "Playlist (optional)"
+msgstr "பாடல் பட்டியல் (விரும்பினால் மட்டும்)"
+
+#: src/alarm/interface.c:407
+msgid "Select a playlist"
+msgstr "பாடல் பட்டியலினை தெரிவு செய்க"
+
+#: src/alarm/interface.c:419
+msgid "Use reminder"
+msgstr "நினைவூட்டியினை பயன்படுத்துக "
+
+#: src/alarm/interface.c:428
+msgid "Options"
+msgstr "விருப்பத்தேர்வுகள் "
+
+#: src/alarm/interface.c:433
+msgid "What do these options mean?"
+msgstr "இவ்விருப்ப தேர்வுகள் எதனை உணர்த்துகின்றன?"
+
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
+msgid "Help"
+msgstr "உதவி "
+
+#: src/albumart/albumart.c:143
+msgid "Album Art"
+msgstr "குறுவட்டு வரைவு "
+
+#: src/alsa/config.c:212
+msgid "Default PCM device"
+msgstr "இயல்புநிலை துடிப்பு குறியீடு பண்பேற்ற சாதனம் "
+
+#: src/alsa/config.c:241
+msgid "Default mixer device"
+msgstr "இயல்புநிலை கலவை சாதனம்"
+
+#: src/alsa/config.c:428
+msgid "ALSA Output Plugin Preferences"
+msgstr "வெளியீட்டு நீட்சியை முன்னுரிமைகள்"
+
+#: src/alsa/config.c:434
+msgid "PCM device:"
+msgstr "துடிப்பு குறியீடு பண்பேற்ற சாதனம்:"
+
+#: src/alsa/config.c:436
+msgid "Mixer device:"
+msgstr "கலவை சாதனம்:"
+
+#: src/alsa/config.c:438
+msgid "Mixer element:"
+msgstr "கலவை உறுப்பு:"
+
+#: src/alsa/config.c:441
+msgid "Work around drain hangup"
+msgstr "தொங்கும் தன்மையை குறைக்குக "
+
+#: src/alsa/plugin.c:25
+msgid ""
+"ALSA Output Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+
+#: src/alsa/plugin.c:32
+msgid "ALSA Output"
+msgstr "ALSA வெளியீடு"
+
+#: src/amidi-plug/amidi-plug.c:248
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr ""
+"MIDI இயக்கத்திற்காக நீங்கள் எந்த ஒரு தொடர்வரிசை துறைகளினையும் தெரிவு செய்யவில்லை. "
+"தெரிவு செய்ய நீட்சி விருப்பங்களினை நாடுங்கள்."
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-சொருகி (MIDI இயக்கி )"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
+msgid "ALSA Backend "
+msgstr "ALSA பின்தளம்"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"இந்த பின்தளமானது பயனரால் தெரிவுசெய்யப்பட்ட குழுவில் உள்ள ALSA தொடர்நிலை துறைகளினூடாக "
+"MIDI நிகழ்வுகளை அனுப்பும். அவை ஒலி வன்பொருள் கூட்டிணைப்பு அட்டைகளுக்கு துறைகளை "
+"வழங்கும். மேலும் மென்பொருள் கூட்டிணைப்புகளுக்கும் வெளியக சாதனகளுக்கும் துறைகளை வழங்கும். "
+"⏎\n"
+"\n"
+"இந்த பின்தளமானது எந்தவொரு ஒலியையும் உருவாக்காது, MIDI நிகழ்வுகளானது சாதனங்களால் "
+"அல்லது நிகழ்ச்சிகளால் கையாளப்படும். இவை ALSA துறைகளின் உதவியுடனே இயங்கும்; உதாரணமாக "
+"MIDI நிகழ்வுகளானது வன்பொருள் கூட்டிணைப்புக்கு நேரடியாக அனுப்பி இயக்கப்படும்.⏎\n"
+"\n"
+"பின்தளமானது Giacomo Lozito என்பவரால் எழுதப்பட்டது."
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
+msgid "FluidSynth Backend "
+msgstr "திரவ கூட்டிணைப்பு பின்தளம் "
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"இந்த பின்தளம் MIDI நிகழ்வுகளில் இருந்து FluidSynth இற்கு ஒலியை உருவாக்கி செலுத்த "
+"பயன்படுகிறது, இது SoundFont2 விவரக்குறிப்பு அடிப்படையில் ஒரு நிஜ நேர மென்பொருள் "
+"தொகுப்பு ஆகும் (www.fluidsynth.org).⏎\n"
+"\n"
+"உருவாக்கப்பட்ட ஒலியானது இயக்கி விளைவு செருகுநிரல்களின் மூலம் கையாளப்பட்டு பின் "
+"தெரியப்பட்ட வெளியீட்டு செருகுநிரல்களின் மூலம் செயலாக்கப்படுகிறது. \n"
+"பின்தளமானது Giacomo Lozito ஆல் எழுதப்பட்டது."
+
+#: src/amidi-plug/i_configure-alsa.c:353
+msgid "Port"
+msgstr "துறை "
+
+#: src/amidi-plug/i_configure-alsa.c:355
+msgid "Client name"
+msgstr "பயனர் பெயர் "
+
+#: src/amidi-plug/i_configure-alsa.c:357
+msgid "Port name"
+msgstr "துறை பெயர் "
+
+#: src/amidi-plug/i_configure-alsa.c:371
+msgid "ALSA output ports"
+msgstr "ALSA வெளியீட்டு துறைகள் "
+
+#: src/amidi-plug/i_configure-alsa.c:432
+msgid "Soundcard: "
+msgstr "ஒலி அட்டை:"
+
+#: src/amidi-plug/i_configure-alsa.c:434
+msgid "Mixer control: "
+msgstr "கலவை கட்டுப்பாடு:"
+
+#: src/amidi-plug/i_configure-alsa.c:444
+msgid "Mixer settings"
+msgstr "கலவை அமைப்புகள்:"
+
+#: src/amidi-plug/i_configure-alsa.c:472
+msgid ""
+"ALSA\n"
+"backend"
+msgstr ""
+"ALSA⏎\n"
+"பின்தளம் "
+
+#: src/amidi-plug/i_configure-ap.c:63
+msgid "AMIDI-Plug - backend information"
+msgstr "AMIDI-நீட்சி - பின்தள தகவல்கள் "
+
+#: src/amidi-plug/i_configure-ap.c:221
+msgid "Backend selection"
+msgstr "பின்தள தேர்வு"
+
+#: src/amidi-plug/i_configure-ap.c:261
+msgid "Playback settings"
+msgstr "மீள் இயக்கு அமைப்புகள் "
+
+#: src/amidi-plug/i_configure-ap.c:266
+msgid "Transpose: "
+msgstr "இடமாற்றம்:"
+
+#: src/amidi-plug/i_configure-ap.c:275
+msgid "Drum shift: "
+msgstr " டிரம் மாற்றம்:"
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "Advanced settings"
+msgstr "கூடுதல் அமைப்புகள்"
+
+#: src/amidi-plug/i_configure-ap.c:297
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "பாடல் பட்டியலில் உள்ள MIDI கோப்புகளின் முன் கணக்கிட்ட நீளத்தை கணிக்க "
+
+#: src/amidi-plug/i_configure-ap.c:304
+msgid "extract comments from MIDI file (if available)"
+msgstr "MIDI கோப்பு பின்னூட்டுகளினை (இருப்பின்) பிரித்தெடுக்க"
+
+#: src/amidi-plug/i_configure-ap.c:311
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "MIDI கோப்பு பாடல்வரிகளை (இருப்பின்) பிரித்தெடுக்க"
+
+#: src/amidi-plug/i_configure-ap.c:344
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr ""
+"AMIDI⏎\n"
+"சொருகி "
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug Settings"
+msgstr "AMIDI-சொருகி - கோப்பினை அமைப்புகள் "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:63
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-சொருகி - ஒலி எழுத்துரு கோப்பினை தெரிவு செய்க "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:321
+msgid "SoundFont settings"
+msgstr "ஒலி எழுத்துரு அமைப்புகள் "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:359
+msgid "Filename"
+msgstr "கோப்பின் பெயர் "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:363
+msgid "Size (bytes)"
+msgstr "அளவு (பயிட்ஸ்)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:412
+msgid "Load SF on player start"
+msgstr "இயக்கி ஆரம்பிக்கையில் SF இனை ஏற்றுக "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:416
+msgid "Load SF on first MIDI file play"
+msgstr "முதல் MIDI கோப்பு இயக்கத்தின் போது SF இனை ஏற்றுக"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:431
+msgid "Synthesizer settings"
+msgstr "கூட்டிணைப்பு அமைப்புகள் "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:440
+msgid "gain"
+msgstr "பயன் "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
+msgid "use default"
+msgstr "இயல்புநிலையினை உபயோகிக்குக "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
+msgid "value:"
+msgstr "மதிப்பு: "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:470
+msgid "polyphony"
+msgstr "பண்ணிசை"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:500
+msgid "reverb"
+msgstr "எதிர்முழங்குக "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
+msgid "yes"
+msgstr "ஆமாம் "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
+msgid "no"
+msgstr "இல்லை "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:534
+msgid "chorus"
+msgstr "பாடகர் குழு"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "sample rate"
+msgstr "மாதிரி வீதம் "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:574
+msgid "22050 Hz "
+msgstr "22050 Hz"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:577
+msgid "44100 Hz "
+msgstr "44100 Hz"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:580
+msgid "96000 Hz "
+msgstr "96000 Hz"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:583
+msgid "custom "
+msgstr "தனிப்பயன் "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:592
+msgid "Hz "
+msgstr "Hz"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:662
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr ""
+"திரவ கூட்டிணைப்பு ⏎\n"
+"பின்தளம் "
+
+#: src/amidi-plug/i_fileinfo.c:175
+msgid "Name:"
+msgstr "பெயர்: "
+
+#: src/amidi-plug/i_fileinfo.c:200
+msgid " MIDI Info "
+msgstr " MIDI தகவல் "
+
+#: src/amidi-plug/i_fileinfo.c:214
+msgid "Format:"
+msgstr "வடிவமைப்பு: "
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "Length (msec):"
+msgstr "நீளம் (மில்லி வினாடிகள்): "
+
+#: src/amidi-plug/i_fileinfo.c:220
+msgid "No. of Tracks:"
+msgstr "பாடல்களின் இலக்கங்கள்:"
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "variable"
+msgstr "மாறி "
+
+#: src/amidi-plug/i_fileinfo.c:228
+msgid "BPM:"
+msgstr "துடிப்புகள் ஒரு நிமிடத்திற்கு: "
+
+#: src/amidi-plug/i_fileinfo.c:236
+msgid "BPM (wavg):"
+msgstr "துடிப்புகள் ஒரு நிமிடத்திற்கு (wavg): "
+
+#: src/amidi-plug/i_fileinfo.c:239
+msgid "Time Div:"
+msgstr "நேரப் பிரிவு:"
+
+#: src/amidi-plug/i_fileinfo.c:250
+msgid " MIDI Comments and Lyrics "
+msgstr " MIDI பின்னூட்டுகள் மற்றும் பாடல் வரிகள் "
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no comments available in this MIDI file *"
+msgstr "*இந்த MIDI கோப்பிற்கான எந்தவொரு பின்னூட்டும் கிடைக்கப்படவில்லை * "
+
+#: src/amidi-plug/i_fileinfo.c:314
+msgid "* no lyrics available in this MIDI file *"
+msgstr "*இந்த MIDI கோப்பிற்கான எந்தவொரு பாடல்வரிகளும் கிடைக்கப்படவில்லை * "
+
+#: src/amidi-plug/i_fileinfo.c:367
+msgid " (invalid UTF-8)"
+msgstr "(செல்லுபடியற்ற UTF-8 )"
+
+#: src/amidi-plug/i_utils.c:39
+msgid "About AMIDI-Plug"
+msgstr "AMIDI-சொருகி பற்றி "
+
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr ""
+
+#: src/amidi-plug/i_utils.c:54
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing"
+msgstr ""
+
+#: src/aosd/aosd.c:29
+msgid "Audacious OSD "
+msgstr ""
+
+#: src/aosd/aosd.c:37
+msgid "AOSD (On-Screen Display)"
+msgstr " AOSD ( திரையில் தோன்றும் காட்சி)"
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "செவ்வகம் "
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "வட்ட வடிவிலான செவ்வகம் "
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "குழிவான செவ்வகம் "
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "ஏதுமில்லை "
+
+#: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "மீள் இயக்கினை ஆரம்பிக்குக "
+
+#: src/aosd/aosd_trigger.c:75
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "பாடல் பட்டியல் இடுகை இயக்கப்படுகையில் திரையில் தோன்றும் காட்சி தூண்டப்படுகிறது. "
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Title Change"
+msgstr "தலைப்பு மாற்றம் "
+
+#: src/aosd/aosd_trigger.c:80
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr ""
+"மீள் இயக்கத்தின் போது திரையில் தோன்றும் காட்சி தூண்டப்படுகிறது, பாடல் தலைப்பு "
+"மாற்றப்படுகிறது, ஆனால் கோப்பின் பெயர் மாற்றமடையாது. இணைய நீரோடைகளின் போது இம்முறை "
+"மிகவும் பிரயோசனமானது. "
+
+#: src/aosd/aosd_trigger.c:86
+msgid "Pause On"
+msgstr "இடைநிறுத்தத்தை ஆரம்பிக்க "
+
+#: src/aosd/aosd_trigger.c:87
+msgid "Triggers OSD when playback is paused."
+msgstr "மீளியக்கம் இடைநிறுத்தப்படும் போது திரையில் தோன்றும் காட்சி தூண்டப்படுகிறது."
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Pause Off"
+msgstr "இடைநிறுத்தத்தை நிறுத்துக"
+
+#: src/aosd/aosd_trigger.c:92
+msgid "Triggers OSD when playback is unpaused."
+msgstr "மீளியக்கம் நிறுத்தப்படுகையில் திரையில் தோன்றும் காட்சி தூண்டப்படுகிறது. "
+
+#: src/aosd/aosd_ui.c:168
+msgid "Placement"
+msgstr "ஒன்றின் நிறுத்தப்பட்ட நிலை "
+
+#: src/aosd/aosd_ui.c:200
+msgid "Relative X offset:"
+msgstr "ஒப்பீட்டு X விலக்கம்:"
+
+#: src/aosd/aosd_ui.c:207
+msgid "Relative Y offset:"
+msgstr "ஒப்பீட்டு Y விலக்கம்: "
+
+#: src/aosd/aosd_ui.c:214
+msgid "Max OSD width:"
+msgstr "அதிகூடிய திரையில் தோன்றும் காட்சியின் அகலம்:"
+
+#: src/aosd/aosd_ui.c:225
+msgid "Multi-Monitor options"
+msgstr "பல்-கணினித்திரை தேர்வுகள் "
+
+#: src/aosd/aosd_ui.c:229
+msgid "Display OSD using:"
+msgstr "திரையில் தோன்றும் காட்சியினை காட்டுக இதனை பயன்படுத்தி: "
+
+#: src/aosd/aosd_ui.c:231
+msgid "all monitors"
+msgstr "அனைத்து கணினித்திரைகள் "
+
+#: src/aosd/aosd_ui.c:234
+#, c-format
+msgid "monitor %i"
+msgstr "கணினித்திரை %i"
+
+#: src/aosd/aosd_ui.c:287
+msgid "Timing (ms)"
+msgstr "நேரம் (மில்லி வினாடிகளில்) "
+
+#: src/aosd/aosd_ui.c:292
+msgid "Display:"
+msgstr "காட்சிப்படுத்துக:"
+
+#: src/aosd/aosd_ui.c:297
+msgid "Fade in:"
+msgstr "உண்மங்கியடைதல்:"
+
+#: src/aosd/aosd_ui.c:302
+msgid "Fade out:"
+msgstr "வெளிமங்குதல்:"
+
+#: src/aosd/aosd_ui.c:383
+msgid "Fonts"
+msgstr "எழுத்துருக்கள் "
+
+#: src/aosd/aosd_ui.c:391
+#, c-format
+msgid "Font %i:"
+msgstr "எழுத்துரு %i:"
+
+#: src/aosd/aosd_ui.c:409
+msgid "Shadow"
+msgstr "நிழல் "
+
+#: src/aosd/aosd_ui.c:439
+msgid "Internationalization"
+msgstr "சர்வதேசமயமாக்கல்"
+
+#: src/aosd/aosd_ui.c:445
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "UTF-8 இன் எழுத்து மாற்றத்தை முடக்கு (aosd இல்)"
+
+#: src/aosd/aosd_ui.c:462
+msgid "Select Skin File"
+msgstr "தோல் கோப்pinai தேர்ந்தெடுக்கவும்"
+
+#: src/aosd/aosd_ui.c:573
+msgid "Render Style"
+msgstr "வழங்கும் பாங்கு "
+
+#: src/aosd/aosd_ui.c:589
+msgid "Colors"
+msgstr "நிறங்கள் "
+
+#: src/aosd/aosd_ui.c:602
+#, c-format
+msgid "Color %i:"
+msgstr "நிறம் %i "
+
+#: src/aosd/aosd_ui.c:620
+msgid "Custom Skin"
+msgstr "விருப்ப தோல்"
+
+#: src/aosd/aosd_ui.c:626
+msgid "Skin file:"
+msgstr "தோல் கோப்பு: "
+
+#: src/aosd/aosd_ui.c:630
+msgid "Browse"
+msgstr "உலாவு "
+
+#: src/aosd/aosd_ui.c:729
+msgid "Enable trigger"
+msgstr "தூண்டுதலினை செயல்படுத்துக "
+
+#: src/aosd/aosd_ui.c:756
+msgid "Event"
+msgstr "நிகழ்வு "
+
+#: src/aosd/aosd_ui.c:784
+msgid "Composite manager detected"
+msgstr "தொகுப்பு நிர்வாகி கண்டறியப்பட்டது"
+
+#: src/aosd/aosd_ui.c:791
+msgid ""
+"Composite manager not detected;\n"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"தொகுப்பு நிர்வாகி கண்டறியப்படவில்லை;⏎\n"
+"\n"
+"கட்டாயமாக தொகுப்பு நிர்வாகியொன்று செயற்படுத்தப்பட வேண்டும். இல்லையெனில் திரையில் "
+"தோன்றும் காட்சி ஒழுங்காக இயங்காது. "
+
+#: src/aosd/aosd_ui.c:799
+msgid "Composite manager not required for fake transparency"
+msgstr "போலி வெளிப்படைத்தன்மையிற்கு தொகுப்பு நிர்வாகியொன்று தேவையில்லை "
+
+#: src/aosd/aosd_ui.c:837
+msgid "Transparency"
+msgstr "வெளிப்படைத்தன்மை "
+
+#: src/aosd/aosd_ui.c:843
+msgid "Fake transparency"
+msgstr "போலி வெளிப்படைத்தன்மை "
+
+#: src/aosd/aosd_ui.c:845
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "உண்மையான வெளிப்படைத்தன்மை ( X தொகுப்பு நீடிப்பு தேவைப்படுகிறது.)"
+
+#: src/aosd/aosd_ui.c:887
+msgid "Composite extension not loaded"
+msgstr "தொகுப்பு நீட்டிப்பு ஏற்றப்படவில்லை "
+
+#: src/aosd/aosd_ui.c:895
+msgid "Composite extension not available"
+msgstr "தொகுப்பு நீட்டிப்பு காணப்படவில்லை "
+
+#: src/aosd/aosd_ui.c:914
+#, c-format
+msgid "Audacious OSD"
+msgstr "ஔடகிவஸ் திரையில் தோன்றும் காட்சி "
+
+#: src/aosd/aosd_ui.c:995
+msgid "Audacious OSD - configuration"
+msgstr "ஔடகிவஸ் திரையில் தோன்றும் காட்சி - உள்ளமைவு"
+
+#: src/aosd/aosd_ui.c:1016
+msgid "Test"
+msgstr "பரீட்சிக்க "
+
+#: src/aosd/aosd_ui.c:1031
+msgid "Position"
+msgstr "இடம் "
+
+#: src/aosd/aosd_ui.c:1036
+msgid "Animation"
+msgstr "உயிரூட்டுதல் "
+
+#: src/aosd/aosd_ui.c:1041
+msgid "Text"
+msgstr "எழுத்து "
+
+#: src/aosd/aosd_ui.c:1046
+msgid "Decoration"
+msgstr "அலங்காரம் "
+
+#: src/aosd/aosd_ui.c:1051
+msgid "Trigger"
+msgstr "தூண்டுதல் "
+
+#: src/aosd/aosd_ui.c:1056
+msgid "Misc"
+msgstr "மற்றவை"
+
+#: src/asx/asx.c:96
+msgid "ASXv1/ASXv2 Playlists"
+msgstr "ASXv1/ASXv2 பாடல் பட்டியல் "
+
+#: src/audpl/audpl.c:222
+msgid "Audacious Playlists (audpl)"
+msgstr "ஔடகிவஸ் பாடல் பட்டியல்கள் "
+
+#: src/blur_scope/blur_scope.c:47
+msgid "Color"
+msgstr "நிறம்"
+
+#: src/blur_scope/blur_scope.c:56
+msgid "Blur Scope"
+msgstr "மங்கலான குறியிலக்கம்"
+
+#: src/bs2b/plugin.c:136
+msgid "Bauer Stereophonic-to-Binaural Preferences"
+msgstr "பார் இசைப்பிரிப்பு முதல் இருசெவிக்குரிய விருப்பங்கள்"
+
+#: src/bs2b/plugin.c:147
+msgid "Feed level:"
+msgstr "நிலை ஊட்டல்:"
+
+#: src/bs2b/plugin.c:161
+msgid "Cut frequency:"
+msgstr "குறை அதிர்வெண்:"
+
+#: src/bs2b/plugin.c:175
+msgid "Presets:"
+msgstr "முன்னமைப்புகள்:"
+
+#: src/bs2b/plugin.c:197
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr "பார் இசைப்பிரிப்பு முதல் இருசெவிக்குரியது (BS2B)"
+
+#: src/cairo-spectrum/cairo-spectrum.c:297
+msgid "Spectrum Analyzer"
+msgstr "நிறமாலை பகுப்பாய்வி "
+
+#: src/cdaudio-ng/cdaudio-ng.c:103
+msgid ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"and to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you to Tony Vroon for mentoring and guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:121
+msgid "Device"
+msgstr "சாதனம்"
+
+#: src/cdaudio-ng/cdaudio-ng.c:122
+msgid "Read speed:"
+msgstr "வாசிக்கும் வேகம் :"
+
+#: src/cdaudio-ng/cdaudio-ng.c:125
+msgid "Override device:"
+msgstr "சாதனம் மேலெழுது:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:127
+msgid "Metadata"
+msgstr "மீத்தரவு "
+
+#: src/cdaudio-ng/cdaudio-ng.c:128
+msgid "Use CD-Text"
+msgstr "இறுவட்டு எழுத்துகளை உபயோகிக்க"
+
+#: src/cdaudio-ng/cdaudio-ng.c:130
+msgid "Use CDDB"
+msgstr "CDDB இனை உபயோகிக்க"
+
+#: src/cdaudio-ng/cdaudio-ng.c:132
+msgid "Use HTTP instead of CDDBP"
+msgstr "CDDBP இற்கு பதிலாக HTTP இனை பயன்படுத்துக "
+
+#: src/cdaudio-ng/cdaudio-ng.c:134
+msgid "Server:"
+msgstr "சேவையகம்:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:136
+msgid "Path:"
+msgstr "வழி :"
+
+#: src/cdaudio-ng/cdaudio-ng.c:138
+msgid "Port:"
+msgstr "போர்ட் :"
+
+#: src/cdaudio-ng/cdaudio-ng.c:148
+msgid "Audio CD Plugin"
+msgstr "ஒலி இறுவட்டு சொருகி"
+
+#: src/cdaudio-ng/cdaudio-ng.c:249
+msgid "Failed to initialize cdio subsystem."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:306
+#, c-format
+msgid "Invalid URI %s."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:308
+#, c-format
+msgid "Track %d not found."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:310
+#, c-format
+msgid "Track %d is a data track."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:312
+msgid "Failed to open audio output."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:395
+msgid "Error reading audio CD."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:505
+msgid "Audio CD"
+msgstr "ஒலி இறுவட்டு"
+
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:547
+msgid "No audio capable CD drive found."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:574
+msgid "Failed to finish initializing opened CD drive."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:587
+msgid "Failed to retrieve first/last track number."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:612
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:702
+msgid "Failed to create the cddb connection."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:777
+msgid "Failed to query the CDDB server"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:779
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:803
+#, c-format
+msgid "Failed to read the cddb info: %s"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:876
+msgid "Drive is empty."
+msgstr "வட்டு வெறுமையாக உள்ளது."
+
+#: src/cdaudio-ng/cdaudio-ng.c:878
+msgid "Unsupported disk type."
+msgstr "ஆதரவற்ற வட்டு வகை."
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Play CD"
+msgstr "இறுவட்டினை இயக்குக "
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Add CD"
+msgstr "இறுவட்டினை சேர்க்குக "
+
+#: src/cd-menu-items/cd-menu-items.c:57
+msgid "Audio CD Menu Items"
+msgstr "ஒலி இறுவட்டு பட்டியல் உருப்படிகள்"
+
+#: src/compressor/plugin.c:35
+msgid "Compression"
+msgstr "சுருக்கம்"
+
+#: src/compressor/plugin.c:36
+msgid "Center volume:"
+msgstr "மைய சத்தம்: "
+
+#: src/compressor/plugin.c:39
+msgid "Dynamic range:"
+msgstr "நிலைமாறும் வரம்பாக: "
+
+#: src/compressor/plugin.c:53
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/compressor/plugin.c:58
+msgid "Dynamic Range Compressor"
+msgstr "நிலைமாறும் வரம்பு சுருக்கி "
+
+#: src/console/configure.c:134 src/console/plugin.c:42
+msgid "Game Console Music Decoder"
+msgstr "விளையாட்டு பணியக இசை குறிவிலக்கி"
+
+#: src/console/configure.c:151
+msgid "General"
+msgstr "பொதுவான"
+
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
+msgid "Playback"
+msgstr "மீள் இயக்கு"
+
+#: src/console/configure.c:168
+msgid "Bass:"
+msgstr "அடித்தொனி:"
+
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
+msgid "secs"
+msgstr "வினாடிகள் "
+
+#: src/console/configure.c:179
+msgid "Treble:"
+msgstr "உயர் இறுதி அதிர்வெண்:"
+
+#: src/console/configure.c:200
+msgid "Default song length:"
+msgstr "இயல்புநிலை பாடல் நீளம்:"
+
+#: src/console/configure.c:206
+msgid "Resampling"
+msgstr "புதுப்பிக்கிறது"
+
+#: src/console/configure.c:212
+msgid "Enable audio resampling"
+msgstr "ஒலி புதுப்பித்தலை செயல்படுத்தக "
+
+#: src/console/configure.c:227
+msgid "Resampling rate:"
+msgstr "புதுப்பித்தல் வீதம்: "
+
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
+msgid "Hz"
+msgstr "Hz"
+
+#: src/console/configure.c:242
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/configure.c:243
+msgid "Ignore length from SPC tags"
+msgstr "SPC குறிச்சொற்களின் நீளத்தை புறக்கணிக்ககுக "
+
+#: src/console/configure.c:244
+msgid "Increase reverb"
+msgstr "எதிர்முழக்கத்தை அதிகரிக்குக "
+
+#: src/console/configure.c:269
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"இயல்புநிலை பாடல் நீளம், வினாடிகளில், இவை பாடல் நீள தகவல் கிடைக்கப்பெறாத பாடல்களில் "
+"பயன்படுத்த (அதாவது மீள இயக்கப்படும் பாடல்களுக்காக ) "
+
+#: src/console/plugin.c:27
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+msgstr ""
+
+#: src/crossfade/crossfade.c:81
+msgid ""
+"Crossfading failed because the songs had a different number of channels. "
+"You can use the Channel Mixer to convert the songs to the same number of "
+"channels."
+msgstr ""
+"பாடல்கள் வித்தியாசமான தல இலக்கங்களை கொண்டதால் குறுக்குமங்குதல் செயலிழந்தது. செயல்ப்படுத்த "
+"ஒரு தட கலவையினை உபயோகித்து ஒre தட இலக்கங்களுக்கு மாற்றவும்."
+
+#: src/crossfade/crossfade.c:88
+msgid ""
+"Crossfading failed because the songs had different sample rates. You can "
+"use the Sample Rate Converter to convert the songs to the same sample rate."
+msgstr ""
+"பாடல்கள் வித்தியாசமான மாதிரி வீதங்களை கொண்டதால் குறுக்குமங்குதல் செயலிழந்தது. "
+"செயல்ப்படுத்த ஒரு மாதிரி வீத கலவையினை உபயோகித்து ஒரே மாதிரி வீதங்களுக்கு மாற்றவும்."
+
+#: src/crossfade/crossfade.c:254
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/crossfade/crossfade.c:258
+msgid "Crossfade"
+msgstr "குறுக்கு மங்கல்"
+
+#: src/crossfade/crossfade.c:259
+msgid "Overlap:"
+msgstr "மேற்பொருந்தல்:"
+
+#: src/crossfade/crossfade.c:269
+msgid "Crossfade"
+msgstr "குறுக்கு மங்கல்"
+
+#: src/crystalizer/crystalizer.c:40
+msgid "Crystalizer"
+msgstr "பளிங்குருவாக்கl"
+
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
+msgid "Intensity:"
+msgstr "அடர்த்தி:"
+
+#: src/crystalizer/crystalizer.c:51
+msgid "Crystalizer"
+msgstr "palinguruvaathal"
+
+#: src/cue/cue.c:158
+msgid "Cue Sheet Plugin"
+msgstr "கோல் தாள் செருகுநிரல்"
+
+#: src/echo_plugin/echo.c:24
+msgid "Echo"
+msgstr "ethiroli"
+
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
+msgid "Delay:"
+msgstr "தாமதம் :"
+
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
+msgid "ms"
+msgstr "ms"
+
+#: src/echo_plugin/echo.c:28
+msgid "Feedback:"
+msgstr "பின்னூட்டு :"
+
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
+msgid "Volume:"
+msgstr "ஒலி அளவு "
+
+#: src/echo_plugin/echo.c:114
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"\n"
+"Surround echo by Carl van Schaik, 1999"
+msgstr ""
+
+#: src/echo_plugin/echo.c:120
+msgid "Echo"
+msgstr "எதிரொலி "
+
+#: src/ffaudio/ffaudio-core.c:648
+msgid ""
+"Multi-format audio decoding plugin for Audacious using\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+
+#: src/ffaudio/ffaudio-core.c:695
+msgid "FFmpeg Plugin"
+msgstr "FFmpeg நீட்சி"
+
+#: src/filewriter/filewriter.c:409
+msgid "FileWriter Configuration"
+msgstr "FileWriter கட்டமைப்பு"
+
+#: src/filewriter/filewriter.c:421
+msgid "Output file format:"
+msgstr "வெளியீட்டு கோப்பு வடிவம்:"
+
+#: src/filewriter/filewriter.c:439
+msgid "Configure"
+msgstr "கட்டமைக்குக "
+
+#: src/filewriter/filewriter.c:449
+msgid "Save into original directory"
+msgstr "அசல் கோப்பகத்தில் சேமிக்கவும்"
+
+#: src/filewriter/filewriter.c:454
+msgid "Save into custom directory"
+msgstr "விருப்ப கோப்பகத்தில் சேமிக்கவும்"
+
+#: src/filewriter/filewriter.c:464
+msgid "Output file folder:"
+msgstr "வெளியீட்டு கோப்பு கோப்பகம்: "
+
+#: src/filewriter/filewriter.c:468
+msgid "Pick a folder"
+msgstr "ஒரு கோப்புறையை தேர்ந்தெடுக்கவும்"
+
+#: src/filewriter/filewriter.c:481
+msgid "Get filename from:"
+msgstr "இருந்து கோப்பு கிடைக்கும்:"
+
+#: src/filewriter/filewriter.c:484
+msgid "original file tags"
+msgstr "அசல் கோப்பு குறிச்சொற்கl"
+
+#: src/filewriter/filewriter.c:490
+msgid "original filename"
+msgstr "அசல் கோப்புறை "
+
+#: src/filewriter/filewriter.c:497
+msgid "Don't strip file name extension"
+msgstr "கோப்பு நீட்டிப்பினை அகற்ற வேண்டாம்"
+
+#: src/filewriter/filewriter.c:506
+msgid "Prepend track number to filename"
+msgstr "கோப்பு பெயரையும் பாடல் எண்ணையும் வரைக"
+
+#: src/filewriter/filewriter.c:515
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+
+#: src/filewriter/filewriter.c:532
+msgid "FileWriter Plugin"
+msgstr "FileWriter நீட்சி "
+
+#: src/filewriter/mp3.c:37 src/filewriter/mp3.c:748
+msgid "Auto"
+msgstr "தானியங்கு"
+
+#: src/filewriter/mp3.c:37
+msgid "Joint Stereo"
+msgstr "கூட்டு பேரொலி"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
+msgid "Stereo"
+msgstr "பேரொலி"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
+msgid "Mono"
+msgstr "ஒற்றை"
+
+#: src/filewriter/mp3.c:688
+msgid "MP3 Configuration"
+msgstr "MP3 கட்டமைப்பு "
+
+#: src/filewriter/mp3.c:712
+msgid "Algorithm Quality:"
+msgstr "படிமுறை தரம்:"
+
+#: src/filewriter/mp3.c:737
+msgid "Output Samplerate:"
+msgstr "வெளியீtடு மாதிரி வீதம்:"
+
+#: src/filewriter/mp3.c:765
+msgid "(Hz)"
+msgstr "(Hz)"
+
+#: src/filewriter/mp3.c:772
+msgid "Bitrate / Compression ratio:"
+msgstr "பிட்வீதm / அழுத்த விகிதம்:"
+
+#: src/filewriter/mp3.c:796
+msgid "Bitrate (kbps):"
+msgstr "பிட்வீதம் (kbps):"
+
+#: src/filewriter/mp3.c:829
+msgid "Compression ratio:"
+msgstr "அழுத்த விகிதம்:"
+
+#: src/filewriter/mp3.c:853
+msgid "Audio Mode:"
+msgstr "ஒலி முறைமை:"
+
+#: src/filewriter/mp3.c:878
+msgid "Misc:"
+msgstr "மற்றவை"
+
+#: src/filewriter/mp3.c:889
+msgid "Enforce strict ISO complience"
+msgstr "கடுமையான ISO இணக்கத்தை செயல்படுத்தக "
+
+#: src/filewriter/mp3.c:900
+msgid "Error protection"
+msgstr "தவறு பாதுகாப்பு"
+
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
+msgid "Quality"
+msgstr "தரம் "
+
+#: src/filewriter/mp3.c:921
+msgid "Enable VBR/ABR"
+msgstr "VBR/ABR இனை செயல்படுத்துக "
+
+#: src/filewriter/mp3.c:931
+msgid "Type:"
+msgstr "வகை:"
+
+#: src/filewriter/mp3.c:964
+msgid "VBR Options:"
+msgstr "VBR தேர்வுகள்:"
+
+#: src/filewriter/mp3.c:980
+msgid "Minimum bitrate (kbps):"
+msgstr "அதிகுறைந்த பிட்வீதம் (kbps):"
+
+#: src/filewriter/mp3.c:1007
+msgid "Maximum bitrate (kbps):"
+msgstr "அதிகூடிய பிட்வீதம் (kbps):"
+
+#: src/filewriter/mp3.c:1030
+msgid "Strictly enforce minimum bitrate"
+msgstr "கண்டிப்பாக குறைந்த பிட்வீதத்தை செயல்படுத்துக "
+
+#: src/filewriter/mp3.c:1042
+msgid "ABR Options:"
+msgstr "ABR தேர்வுகள்:"
+
+#: src/filewriter/mp3.c:1052
+msgid "Average bitrate (kbps):"
+msgstr "சராசரி பிட்வீதம் (kbps):"
+
+#: src/filewriter/mp3.c:1080
+msgid "VBR quality level:"
+msgstr "VBR தர நிலை:"
+
+#: src/filewriter/mp3.c:1099
+msgid "Don't write Xing VBR header"
+msgstr "Xing VBR தலைப்பை எழுத வேண்டாம் "
+
+#: src/filewriter/mp3.c:1112
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1121
+msgid "Frame parameters:"
+msgstr "அளவுருக்களை சட்டப்படுத்துக :"
+
+#: src/filewriter/mp3.c:1133
+msgid "Mark as copyright"
+msgstr "பதிப்புரிமை என குறிக்குக "
+
+#: src/filewriter/mp3.c:1144
+msgid "Mark as original"
+msgstr "அசலென குriக்குக"
+
+#: src/filewriter/mp3.c:1156
+msgid "ID3 params:"
+msgstr "ID3 அளபுரு:"
+
+#: src/filewriter/mp3.c:1167
+msgid "Force addition of version 2 tag"
+msgstr "பதிப்பு 2 குறியை பலமாக உள்ளடக்குக "
+
+#: src/filewriter/mp3.c:1177
+msgid "Only add v1 tag"
+msgstr "பதிப்பு 1 குறியை மாத்திரம் உள்ளடக்குக "
+
+#: src/filewriter/mp3.c:1184
+msgid "Only add v2 tag"
+msgstr "பதிப்பு 2 குறியை மாத்திரம் உள்ளடக்குக "
+
+#: src/filewriter/mp3.c:1205
+msgid "Tags"
+msgstr "குறி "
+
+#: src/filewriter/vorbis.c:209
+msgid "Vorbis Encoder Configuration"
+msgstr "Vorbis குறிமுறையாக்கி கட்டமைப்பு"
+
+#: src/filewriter/vorbis.c:232
+msgid "Quality level (0 - 10):"
+msgstr "தரம் (0 - 10):"
+
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
+msgid "lossless"
+msgstr ""
+
+#: src/flacng/plugin.c:269
+msgid ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+
+#: src/flacng/plugin.c:277
+msgid "FLAC Decoder"
+msgstr "FLAC குறிவிலக்கி "
+
+#: src/gio/gio.c:300
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+
+#: src/gio/gio.c:322
+msgid "GIO Plugin"
+msgstr "GIO நீட்சி"
+
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL நிறமாலை பகுப்பாய்வி"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Lets you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
+msgid "Gnome Shortcuts"
+msgstr "Gnome குறுக்குவழிகள் "
+
+#: src/gtkui/columns.c:32
+msgid "Entry number"
+msgstr "பதிவு எண்"
+
+#: src/gtkui/columns.c:32
+msgid "Title"
+msgstr "தலைப்பு"
+
+#: src/gtkui/columns.c:33
+msgid "Artist"
+msgstr "பாடகர்"
+
+#: src/gtkui/columns.c:33
+msgid "Year"
+msgstr "வருடம்"
+
+#: src/gtkui/columns.c:33
+msgid "Album"
+msgstr "குறுவட்டு"
+
+#: src/gtkui/columns.c:33
+msgid "Track"
+msgstr "பாடல் "
+
+#: src/gtkui/columns.c:33
+msgid "Genre"
+msgstr "இலக்கியநடை"
+
+#: src/gtkui/columns.c:34
+msgid "Queue position"
+msgstr "வரிசையில் இடம் "
+
+#: src/gtkui/columns.c:34
+msgid "Length"
+msgstr "நீளம்"
+
+#: src/gtkui/columns.c:34
+msgid "File path"
+msgstr "கோப்பு vali"
+
+#: src/gtkui/columns.c:34
+msgid "File name"
+msgstr "கோப்பின் பெயர் "
+
+#: src/gtkui/columns.c:35
+msgid "Custom title"
+msgstr "விருப்ப தலைப்பு "
+
+#: src/gtkui/columns.c:35
+msgid "Bitrate"
+msgstr "பிட்வீதம்"
+
+#: src/gtkui/columns.c:277
+msgid "Choose Columns"
+msgstr "நெடுவரிசைகளை தேர்க "
+
+#: src/gtkui/columns.c:293
+msgid "Available:"
+msgstr "கிடைக்கும்:"
+
+#: src/gtkui/columns.c:327
+msgid "Chosen:"
+msgstr "தேர்ந்தெடுக்கப்பட்டது:"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Left"
+msgstr "இடது பக்கம் தரையிறக்குக "
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Right"
+msgstr "வலது பக்கம் தரையிறக்குக"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Top"
+msgstr "மேல் பக்கம் தரையிறக்குக"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Bottom"
+msgstr "கீழ் பக்கம் தரையிறக்குக"
+
+#: src/gtkui/layout.c:120
+msgid "Undock"
+msgstr "தரையிறக்க வேண்டாம் "
+
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
+msgid "Disable"
+msgstr "முடக்குக "
+
+#: src/gtkui/menus.c:170
+msgid "_Open Files ..."
+msgstr "_கோப்புக்களைத் திற ..."
+
+#: src/gtkui/menus.c:171
+msgid "Open _URL ..."
+msgstr "முகவரியை_திற ..."
+
+#: src/gtkui/menus.c:172
+msgid "_Add Files ..."
+msgstr "கோப்புக்களை _சேர் ..."
+
+#: src/gtkui/menus.c:173
+msgid "Add U_RL ..."
+msgstr "முகவரியை சேர் ..."
+
+#: src/gtkui/menus.c:175
+msgid "_Search Library"
+msgstr "நூலகத்தில் _தேடுக: "
+
+#: src/gtkui/menus.c:177
+msgid "A_bout ..."
+msgstr "பற்றி ..."
+
+#: src/gtkui/menus.c:178
+msgid "_Preferences ..."
+msgstr "_தேர்வுகள் ..."
+
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
+msgid "_Quit"
+msgstr "_விலகு "
+
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
+msgid "_Play"
+msgstr "_இயக்குக "
+
+#: src/gtkui/menus.c:183
+msgid "Paus_e"
+msgstr "_இடைநிறுத்து"
+
+#: src/gtkui/menus.c:184
+msgid "_Stop"
+msgstr "_நிறுத்துga"
+
+#: src/gtkui/menus.c:185
+msgid "Pre_vious"
+msgstr "_முந்தைய"
+
+#: src/gtkui/menus.c:186
+msgid "_Next"
+msgstr "_அடுத்து "
+
+#: src/gtkui/menus.c:188
+msgid "_Repeat"
+msgstr "_மறுபடியும்"
+
+#: src/gtkui/menus.c:189
+msgid "S_huffle"
+msgstr "குலுக்குக "
+
+#: src/gtkui/menus.c:190
+msgid "N_o Playlist Advance"
+msgstr "முன்னோக்கிய பாடல் பட்டியல் alla"
+
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr ""
+
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
+msgid "Song _Info ..."
+msgstr "பாடல் தகவல் "
+
+#: src/gtkui/menus.c:194
+msgid "Jump to _Time ..."
+msgstr "_நேரத்திற்கு தாவவும் "
+
+#: src/gtkui/menus.c:195
+msgid "_Jump to Song ..."
+msgstr "பாடலுக்கு _தாவவும்"
+
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
+msgid "By _Title"
+msgstr "_தலைப்பு அடிப்படையில்"
+
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "பாடல் _இலக்க அடிப்படையில் "
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
+msgid "By _Artist"
+msgstr "_பாடகர் அடிப்படையில்"
+
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
+
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
+msgid "By Release _Date"
+msgstr "வெளியிட்ட திகதி அடிப்படையில்"
+
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
+msgid "By _File Path"
+msgstr "_கோப்பு வழி அடிப்படையில்"
+
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
+msgid "By _Custom Title"
+msgstr "_விருப்ப தலைப்பு அடிப்படையில்"
+
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
+msgid "R_everse Order"
+msgstr "தலைகீழ் ஒழுங்கு"
+
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
+msgid "_Random Order"
+msgstr "_தற்போக்கு ஒழுங்கு"
+
+#: src/gtkui/menus.c:233
+msgid "_Play This Playlist"
+msgstr ""
+
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
+msgid "_Refresh"
+msgstr "_புதுப்பிக்குக "
+
+#: src/gtkui/menus.c:236
+msgid "_Sort"
+msgstr "_வரிசைப்படுத்துக "
+
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "வரிசையானவற்றை தெரிக."
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "_கிடைக்கப்பெறாத கோப்புகளை அகற்றுக"
+
+#: src/gtkui/menus.c:241
+msgid "_New"
+msgstr "_புதிய "
+
+#: src/gtkui/menus.c:242
+msgid "Ren_ame ..."
+msgstr ""
+
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
+msgid "_Close"
+msgstr "_மூடவும்"
+
+#: src/gtkui/menus.c:245
+msgid "_Import ..."
+msgstr "_இறக்குமதி ..."
+
+#: src/gtkui/menus.c:246
+msgid "_Export ..."
+msgstr "_ஏற்றுமதி ..."
+
+#: src/gtkui/menus.c:248
+msgid "Playlist _Manager ..."
+msgstr ""
+
+#: src/gtkui/menus.c:249
+msgid "_Queue Manager ..."
+msgstr "_வரிசை நிர்வாகி ..."
+
+#: src/gtkui/menus.c:252
+msgid "Volume _Up"
+msgstr "ஒலிஉரப்பான் _அதிகரிக்குக "
+
+#: src/gtkui/menus.c:253
+msgid "Volume _Down"
+msgstr "ஒலிஉரப்பான் _குறைக்குக "
+
+#: src/gtkui/menus.c:255
+msgid "_Equalizer"
+msgstr "_சமமாக்கி"
+
+#: src/gtkui/menus.c:257
+msgid "E_ffects"
+msgstr "விளைவுகள்"
+
+#: src/gtkui/menus.c:260
+msgid "_Interface"
+msgstr "_இடைமுகம் "
+
+#: src/gtkui/menus.c:261
+msgid "_Visualizations"
+msgstr "_காட்சிப்படுத்தல்கl"
+
+#: src/gtkui/menus.c:263
+msgid "Show _Menu Bar"
+msgstr "_பட்டியல் பட்டியை காண்பிக்குக "
+
+#: src/gtkui/menus.c:264
+msgid "Show I_nfo Bar"
+msgstr "தகவல் பட்டியை காண்பிக்குக "
+
+#: src/gtkui/menus.c:265
+msgid "Show Info Bar Vis_ualization"
+msgstr "தகவல் பட்டி காட்சியாக்கத்தை காண்பிக்குக "
+
+#: src/gtkui/menus.c:266
+msgid "Show _Status Bar"
+msgstr "_நிலைமை பட்டியை காண்பிக்குக"
+
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
+msgid "Show Close _Buttons"
+msgstr ""
+
+#: src/gtkui/menus.c:271
+msgid "Show Column _Headers"
+msgstr "நெடுவரிசை _தலைப்புக்களை காண்பிக்குக"
+
+#: src/gtkui/menus.c:272
+msgid "Choose _Columns ..."
+msgstr "_நெடுவரிசைகளை தேர்க "
+
+#: src/gtkui/menus.c:273
+msgid "Scrol_l on Song Change"
+msgstr "பாடல் மாற்றத்தின் போது உருளவிடுக "
+
+#: src/gtkui/menus.c:276
+msgid "_File"
+msgstr "கோப்பு "
+
+#: src/gtkui/menus.c:277
+msgid "_Playback"
+msgstr "_மீள்இயக்குக "
+
+#: src/gtkui/menus.c:278
+msgid "P_laylist"
+msgstr "பாடல் பட்டியல் "
+
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
+msgid "_Services"
+msgstr "_சேவைகள் "
+
+#: src/gtkui/menus.c:280
+msgid "_Output"
+msgstr "_வெளியீடு"
+
+#: src/gtkui/menus.c:281
+msgid "_View"
+msgstr "_paarvayiduga"
+
+#: src/gtkui/menus.c:285
+msgid "_Queue/Unqueue"
+msgstr "_வரிசைப்படுத்துக/வரிசைப்படுத்தலை அகற்றுக "
+
+#: src/gtkui/menus.c:288
+msgid "Cu_t"
+msgstr "வெட்டுக "
+
+#: src/gtkui/menus.c:289
+msgid "_Copy"
+msgstr "நகலெடுக்க "
+
+#: src/gtkui/menus.c:290
+msgid "_Paste"
+msgstr "_ஒட்டவும்"
+
+#: src/gtkui/menus.c:291
+msgid "Select _All"
+msgstr "_அனைத்தையும் தேர்ந்தெடுக்குக "
+
+#: src/gtkui/menus.c:297
+msgid "_Rename ..."
+msgstr "மறுபெயர்"
+
+#: src/gtkui/ui_gtk.c:96
+msgid "GTK Interface"
+msgstr "GTK இடைமுகம் "
+
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - ஔடகிவஸ்"
+
+#: src/gtkui/ui_gtk.c:204
+msgid "Buffering ..."
+msgstr "இடைநிலைப்படுத்துகிறது ..."
+
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
+msgid "Audacious"
+msgstr "ஔடகிவஸ்"
+
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
+msgid "Error"
+msgstr "thavaruthal"
+
+#: src/gtkui/ui_statusbar.c:108
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtkui/ui_statusbar.c:123
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
+
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
+msgid "Play"
+msgstr "இயக்குக "
+
+#: src/hotkey/gui.c:72
+msgid "Pause/Resume"
+msgstr "இடைநிறுத்து / மீண்டும் இயக்கு "
+
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
+msgid "Stop"
+msgstr "நிறுத்துக "
+
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr "5 விநாடிகள் முன்னாள் செல்க "
+
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
+msgstr "5 விநாடிகள் பின்னால் செல்க "
+
+#: src/hotkey/gui.c:77
+msgid "Mute"
+msgstr "ஒலியடக்கவும்"
+
+#: src/hotkey/gui.c:78
+msgid "Volume up"
+msgstr "ஒலிஉரப்பான் அதிகரிக்குக"
+
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr "ஒலிஉரப்பான் குறைக்குக"
+
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
+msgstr "கோப்பிற்கு தாவவும்."
+
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr ""
+
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr " திரையில் தோன்றும் காட்சியினை kaattuga"
+
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
+msgstr ""
+
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
+msgstr ""
+
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr ""
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
+msgstr ""
+
+#: src/hotkey/gui.c:96
+msgid "(none)"
+msgstr "(எதுவுமல்ல)"
+
+#: src/hotkey/gui.c:233
+msgid ""
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"மாற்றங்கள் இல்லாமல் முதன்மை சுட்டி பொத்தான்கள் பிணைக்க பரிந்துரைக்கப்படவில்லை,⏎\n"
+"⏎\n"
+"நீங்கள் தொடர விரும்புகிறீர்களா?"
+
+#: src/hotkey/gui.c:235
+msgid "Binding mouse buttons"
+msgstr "சுட்டி பொத்தான்களை பிணைத்தல்"
+
+#: src/hotkey/gui.c:385
+msgid "Global Hotkey Plugin Configuration"
+msgstr "உலகளாவிய முக்கியசாவி நீட்சி கட்டமைப்பு"
+
+#: src/hotkey/gui.c:401
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+"எழுத்து புலத்தில் ஒரு விசை சேர்க்கையை அழுத்தவும்.⏎\n"
+"உங்களுக்கு சுட்டி பொத்தான்களை பிணைக்கவும் முடியும்."
+
+#: src/hotkey/gui.c:406
+msgid "Hotkeys:"
+msgstr "குறுக்குவிசைகள்:"
+
+#: src/hotkey/gui.c:423
+msgid "Action:"
+msgstr "நடவடிக்கை: "
+
+#: src/hotkey/gui.c:430
+msgid "Key Binding:"
+msgstr "சாவி பிணைத்தல்:"
+
+#: src/hotkey/plugin.c:66
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+
+#: src/hotkey/plugin.c:78
+msgid "Global Hotkeys"
+msgstr "உலகளாவிய குறுக்குவிசைகள்:"
+
+#: src/jack/jack.c:410
+msgid ""
+"Based on xmms-jack, by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Ported to Audacious by Giacomo Lozito"
+msgstr ""
+
+#: src/jack/jack.c:416
+msgid "JACK Output"
+msgstr "JACK வெளியீடு "
+
+#: src/ladspa/plugin.c:493
+#, c-format
+msgid "%s Settings"
+msgstr "%s அமைப்புகள்"
+
+#: src/ladspa/plugin.c:561
+msgid "LADSPA Host Settings"
+msgstr "LADSPA புரவலன் அமைப்புகள்"
+
+#: src/ladspa/plugin.c:570
+msgid "Module paths:"
+msgstr "தொகுதிக்கூறு பாதைகள்:"
+
+#: src/ladspa/plugin.c:575
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+"பல பாதைகளினை ஒரு முக்காட்புள்ளி மூலம் வேறுபடுத்துக.⏎\n"
+"இவை LADSPA_PATH இனை விடவும் தேடப்படும், ⏎\n"
+"புதிய பாதைகள் சேர்த்ததன் பின்னர், புதிய செருகுநிரல்கள் வருட உள்ளிடுகவினை அழுத்தக.</"
+"small>"
+
+#: src/ladspa/plugin.c:591
+msgid "Available plugins:"
+msgstr "இருப்பிலுள்ள செருகுநிரல்கள்:"
+
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
+msgid "Enable"
+msgstr "செயல்படுத்துக "
+
+#: src/ladspa/plugin.c:610
+msgid "Enabled plugins:"
+msgstr "செருகுநிரல்களினை செயல்ப்படுத்துக:"
+
+#: src/ladspa/plugin.c:626
+msgid "Settings"
+msgstr "அமைப்புக்கள்"
+
+#: src/ladspa/plugin.c:645
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+
+#: src/ladspa/plugin.c:650
+msgid "LADSPA Host"
+msgstr "LADSPA "
+
+#: src/lirc/lirc.c:76
+#, c-format
+msgid "%s: could not init LIRC support\n"
+msgstr "%s: LIRC உதவியை ஆரம்பிக்க mudiyavillai⏎\n"
+
+#: src/lirc/lirc.c:83
+#, c-format
+msgid ""
+"%s: could not read LIRC config file\n"
+"%s: please read the documentation of LIRC\n"
+"%s: how to create a proper config file\n"
+msgstr ""
+"%s: LIRC இன் கட்டமைப்பு கோப்பினை வாசிக்க முடியவில்லை⏎\n"
+"\n"
+"%s: LIRC இன் ஆவணங்களை படிக்கவும்⏎\n"
+"\n"
+"%s: எப்படி ஒரு சரியான கட்டமைப்பு கோப்பினை உருவாக்குவது⏎\n"
+
+#: src/lirc/lirc.c:114
+#, c-format
+msgid "%s: trying to reconnect...\n"
+msgstr "%s: மீள் இணைப்பிற்கு முனைகிறது ...⏎\n"
+
+#: src/lirc/lirc.c:354
+#, c-format
+msgid "%s: unknown command \"%s\"\n"
+msgstr "%s: அறியப்படாத கட்டளை \"%s\"⏎\n"
+
+#: src/lirc/lirc.c:365
+#, c-format
+msgid "%s: disconnected from LIRC\n"
+msgstr "%s: LIRC இல் இருந்து துண்டிக்கப்பட்டு விட்டது ⏎\n"
+
+#: src/lirc/lirc.c:371
+#, c-format
+msgid "%s: will try reconnect every %d seconds...\n"
+msgstr "%s: ஒவ்வொரு %d வினாடிக்கும் மீள் இணைப்பை பெற முயலும் ...⏎\n"
+
+#: src/lirc/lirc.c:381
+msgid ""
+"A simple plugin to control Audacious using the LIRC remote control daemon\n"
+"\n"
+"Adapted for Audacious by:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Based on the XMMS LIRC plugin by:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"For more information about LIRC, see http://lirc.org."
+msgstr ""
+
+#: src/lirc/lirc.c:392
+msgid "Connection"
+msgstr " இணைப்பு "
+
+#: src/lirc/lirc.c:393
+msgid "Reconnect to LIRC server"
+msgstr "LIRC சேவைகயத்துக்கு மீள் இணைக்குக "
+
+#: src/lirc/lirc.c:395
+msgid "Wait before reconnecting:"
+msgstr "மீள் இணைக்க முன் பொறுக்க :"
+
+#: src/lirc/lirc.c:405
+msgid "LIRC Plugin"
+msgstr "LIRC "
+
+#: src/lyricwiki/lyricwiki.c:117
+msgid "No lyrics available"
+msgstr "எந்தவொரு பாடல்வரிகளும் கிடைக்கப்படவில்லை "
+
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
+#, c-format
+msgid "Unable to fetch %s"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
+#, c-format
+msgid "Unable to parse %s"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:260
+msgid "Looking for lyrics ..."
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:271
+msgid "Missing song metadata"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:284
+msgid "Connecting to lyrics.wikia.com ..."
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:411
+msgid "LyricWiki Plugin"
+msgstr "LyricWiki நீட்சி "
+
+#: src/m3u/m3u.c:121
+msgid "M3U Playlists"
+msgstr "M3U பாடல் பட்டியல்"
+
+#: src/metronom/metronom.c:127
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "திறமை பிறப்பாக்கி:% d நிமிடத்திற்கான துடிப்புகள் "
+
+#: src/metronom/metronom.c:129
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "திறமை பிறப்பாக்கி:%d நிமிடத்திற்கான துடிப்புகள் %d %d"
+
+#: src/metronom/metronom.c:246
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr ""
+
+#: src/metronom/metronom.c:255
+msgid "Tact Generator"
+msgstr "திறமை பிறப்பாக்கி"
+
+#: src/mixer/mixer.c:169
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+
+#: src/mixer/mixer.c:173
+msgid "Channel Mixer"
+msgstr "தட கலவை"
+
+#: src/mixer/mixer.c:174
+msgid "Output channels:"
+msgstr "வெளியீட்டு thadangal"
+
+#: src/mixer/mixer.c:184
+msgid "Channel Mixer"
+msgstr "தட கலவைப்பான் "
+
+#: src/mms/mms.c:224
+msgid "MMS Plugin"
+msgstr "MMS நீட்சி"
+
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
+msgid "ModPlug (Module Player)"
+msgstr "ModPlug (தொகுதி இயக்கி )"
+
+#: src/mpg123/mpg123.c:213
+msgid "Surround"
+msgstr "சூழ்ந்த"
+
+#: src/mpg123/mpg123.c:569
+msgid "MPG123 Plugin"
+msgstr "MPG123 நீட்சி"
+
+#: src/mpris2/plugin.c:403
+msgid "MPRIS 2 Server"
+msgstr "MPRIS 2 சேவையகம் "
+
+#: src/neon/neon.c:1228
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr "Neon HTTP/HTTPS நீட்சி "
+
+#: src/notify/event.c:64
+msgid "Stopped"
+msgstr "நிறுத்துப்பட்டது "
+
+#: src/notify/event.c:64
+msgid "Audacious is not playing."
+msgstr "ஔடகிவஸ் இயங்கவில்லை "
+
+#: src/notify/notify.c:33
+msgid ""
+"Desktop Notifications Plugin for Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
+msgid "Desktop Notifications"
+msgstr "பணிமேடை அறிவிப்புகள்"
+
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "காண்பிக்குக "
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "இடைநிறுத்துக "
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "அடுத்தது "
+
+#: src/oss4/plugin.c:36
+msgid "1. Default device"
+msgstr "1. இயல்புநிலை சாதனம்"
+
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
+msgid "Audio device:"
+msgstr "ஒலி சாதனம்:"
+
+#: src/oss4/plugin.c:77
+msgid "Use alternate device:"
+msgstr "மாற்று சாதனம் பயன்படுத்துக:"
+
+#: src/oss4/plugin.c:81
+msgid "Save volume between sessions."
+msgstr "அமர்வுகள் இடையே ஒலி அளவை சேமிக்குக."
+
+#: src/oss4/plugin.c:83
+msgid "Enable format conversions made by the OSS software."
+msgstr "OSS மென்பொருள் மூலம் வடிவமைப்பு மாற்றத்தை செயல்படுத்துக."
+
+#: src/oss4/plugin.c:85
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "மெய்நிகர் கலப்பினை தடுக்க பிரத்யேக முறையினை செயல்படுத்துக."
+
+#: src/oss4/plugin.c:108
+msgid ""
+"OSS4 Output Plugin for Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+
+#: src/oss4/plugin.c:115
+msgid "OSS4 Output"
+msgstr "OSS4 வெளியீடு "
+
+#: src/pls/pls.c:113
+msgid "PLS Playlists"
+msgstr "PLS பாடல் பட்டியல்"
+
+#: src/psf/plugin.c:264
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr "OpenPSF PSF1/PSF2 குறிவிலக்கி "
+
+#: src/pulse_audio/pulse_audio.c:644
+msgid ""
+"Audacious PulseAudio Output Plugin\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+
+#: src/pulse_audio/pulse_audio.c:662
+msgid "PulseAudio Output"
+msgstr "PulseAudio வெளியீடு "
+
+#: src/resample/resample.c:161
+msgid ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/resample/resample.c:165
+msgid "Skip/repeat samples"
+msgstr "மாதிரிகளை தவிர்க்கவும் / மீlavum"
+
+#: src/resample/resample.c:166
+msgid "Linear interpolation"
+msgstr "நேர்கோட்டு இடைக்கணிப்பு"
+
+#: src/resample/resample.c:167
+msgid "Fast sinc interpolation"
+msgstr "வேகமாக sinc இடைச்செருகல்"
+
+#: src/resample/resample.c:168
+msgid "Medium sinc interpolation"
+msgstr "மத்திமமான sinc இடைச்செருகல்"
+
+#: src/resample/resample.c:169
+msgid "Best sinc interpolation"
+msgstr "சிறந்த sinc இடைச்செருகல்"
+
+#: src/resample/resample.c:172
+msgid "Conversion"
+msgstr " பரிமாற்றம் "
+
+#: src/resample/resample.c:173
+msgid "Method:"
+msgstr "முறைமை "
+
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
+msgid "Rate:"
+msgstr "வீதம்:"
+
+#: src/resample/resample.c:179
+msgid "Rate Mappings"
+msgstr "வீத வரைபடங்கள் "
+
+#: src/resample/resample.c:180
+msgid "Use rate mappings"
+msgstr "வீத வரைபடங்களினை உபயோகிக்குக "
+
+#: src/resample/resample.c:182
+msgid "8 kHz:"
+msgstr "8 kHz: "
+
+#: src/resample/resample.c:185
+msgid "16 kHz:"
+msgstr "16 kHz"
+
+#: src/resample/resample.c:188
+msgid "22.05 kHz:"
+msgstr "22.05 kHz: "
+
+#: src/resample/resample.c:191
+msgid "44.1 kHz:"
+msgstr "44.1 kHz: "
+
+#: src/resample/resample.c:194
+msgid "48 kHz:"
+msgstr "48 kHz: "
+
+#: src/resample/resample.c:197
+msgid "96 kHz:"
+msgstr "96 kHz: "
+
+#: src/resample/resample.c:200
+msgid "192 kHz:"
+msgstr "192 kHz: "
+
+#: src/resample/resample.c:210
+msgid "Sample Rate Converter"
+msgstr "மாதிரி விகிதம் பரிமாற்றி "
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "வலையமைப்பு சிக்கல் "
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "சரிபார்க்கப்படுகிறது "
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr ""
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+
+#: src/sdlout/plugin.c:26
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+
+#: src/sdlout/plugin.c:31
+msgid "SDL Output"
+msgstr "SDL வெளியீடு "
+
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
+msgid "Library"
+msgstr "நூலகம்"
+
+#: src/search-tool/search-tool.c:219
+msgid "Unknown Artist"
+msgstr "தெரியாத பாடகர்"
+
+#: src/search-tool/search-tool.c:221
+msgid "Unknown Album"
+msgstr "தெரியாத குறுவட்டு"
+
+#: src/search-tool/search-tool.c:632
+#, c-format
+msgid ""
+"%s\n"
+" on %s by %s"
+msgstr ""
+
+#: src/search-tool/search-tool.c:638
+#, c-format
+msgid "%d album"
+msgid_plural "%d albums"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/search-tool/search-tool.c:640
+#, c-format
+msgid ""
+"%s\n"
+" %s, %d song"
+msgid_plural ""
+"%s\n"
+" %s, %d songs"
+msgstr[0] ""
+"%s\n"
+"%s, %d பாடல் "
+msgstr[1] ""
+"%s\n"
+" %s, %d songs"
+
+#: src/search-tool/search-tool.c:646
+#, c-format
+msgid ""
+"%s\n"
+" %d song by %s"
+msgid_plural ""
+"%s\n"
+" %d songs by %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/search-tool/search-tool.c:687
+msgid "_Create Playlist"
+msgstr "பாடல் பட்டியலொன்றை _உருவாக்குக "
+
+#: src/search-tool/search-tool.c:694
+msgid "_Add to Playlist"
+msgstr "பாடல் பட்டியலிற்கு _சேர்க்க "
+
+#: src/search-tool/search-tool.c:734
+msgid "Search library"
+msgstr "நூலகத்தில் தேடுக "
+
+#: src/search-tool/search-tool.c:739
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"ஔடகிவஸ் இல் இசை நூகலமொன்றை இறக்குமதி செய்ய கோப்பகமொன்றை தெரிவு செய்து புதுப்பிப்பு "
+"பொத்தானை அழுத்துக. "
+
+#: src/search-tool/search-tool.c:747
+msgid "Please wait ..."
+msgstr "தயவு செய்து பொருத்திருக்குக ..."
+
+#: src/search-tool/search-tool.c:769
+msgid "Choose Folder"
+msgstr "கோப்பகமொன்றை தேர்க "
+
+#: src/search-tool/search-tool.c:808
+msgid "Search Tool"
+msgstr "தேடல் கருவி"
+
+#: src/skins/plugin.c:49
+msgid "Winamp Classic Interface"
+msgstr "Winamp பாரம்பரிய இடைமுகம்"
+
+#: src/skins/skins_cfg.c:204
+msgid "_Player:"
+msgstr "_iyakkai"
+
+#: src/skins/skins_cfg.c:205
+msgid "Select main player window font:"
+msgstr "பிரதான இயக்கி சாளரத்தின் எழுத்துருவை தெரிவு செய்க :"
+
+#: src/skins/skins_cfg.c:207
+msgid "_Playlist:"
+msgstr "_பாடல் பட்டியல்:"
+
+#: src/skins/skins_cfg.c:208
+msgid "Select playlist font:"
+msgstr "பாடல் பட்டியலின் எழுத்துருவை தெரிவு செய்க :"
+
+#: src/skins/skins_cfg.c:212
+msgid "_Fonts"
+msgstr "_எழுத்துரு"
+
+#: src/skins/skins_cfg.c:215
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "பிட்மாப் பட எழுத்துருக்களை உபயோகிக்க (ASCII இணை மட்டும் ஆதரிக்கிறது)"
+
+#: src/skins/skins_cfg.c:217
+msgid "Scroll song title in both directions"
+msgstr "இரு திசைகளிலும் பாடல் தலைப்பை ururavaikkuga "
+
+#: src/skins/skins_cfg.c:295
+msgid "_Skin"
+msgstr "_தோல் "
+
+#: src/skins/skins_cfg.c:342
+msgid "Interface Preferences"
+msgstr "இடைமுக விருப்பத்தேர்வுகள் "
+
+#: src/skins/ui_equalizer.c:328
+msgid "Preamp"
+msgstr "முன் விரிவாக்கி "
+
+#: src/skins/ui_equalizer.c:332
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "4 kHz"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:334
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/ui_equalizer.c:334
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/ui_equalizer.c:375
+msgid "Audacious Equalizer"
+msgstr "ஔடகிவஸ் சமமாக்கி "
+
+#: src/skins/ui_equalizer.c:890
+msgid "Presets"
+msgstr "முன்னமைப்புகள்"
+
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
+msgid "Load preset"
+msgstr "முன்னமைப்புகளினை ஏற்றுக "
+
+#: src/skins/ui_equalizer.c:988
+msgid "Load auto-preset"
+msgstr "தானியங்கு முன்னமைப்புகளை ஏற்றுக "
+
+#: src/skins/ui_equalizer.c:1018 src/skins/ui_equalizer.c:1036
+#: src/skins/ui_equalizer.c:1052
+msgid "Load equalizer preset"
+msgstr "சமமாக்கி முன்னமைப்புகளை ஏற்றுக "
+
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
+msgid "Save preset"
+msgstr "முன்னமைப்புகளை சேமிக்க"
+
+#: src/skins/ui_equalizer.c:1087
+msgid "Save auto-preset"
+msgstr "தானியங்கு முன்னமைப்புகளை சேமிக்குக"
+
+#: src/skins/ui_equalizer.c:1118 src/skins/ui_equalizer.c:1154
+msgid "Save equalizer preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
+msgid "Delete preset"
+msgstr "முன்னமைப்பினை அழிக்குக "
+
+#: src/skins/ui_equalizer.c:1190
+msgid "Delete auto-preset"
+msgstr "தானியங்கு முன்னமைப்புகளை அழிக்குக"
+
+#: src/skins/ui_main.c:414
+msgid "kbps"
+msgstr "kbps"
+
+#: src/skins/ui_main.c:422
+msgid "kHz"
+msgstr "kHz"
+
+#: src/skins/ui_main.c:770
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "%d:%-2.2d / %d:%-2.2d இனை நாடுக"
+
+#: src/skins/ui_main.c:791
+#, c-format
+msgid "Volume: %d%%"
+msgstr "ஒலி அளவு: %d%%"
+
+#: src/skins/ui_main.c:814
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "சமநிலை:% d%% இடது"
+
+#: src/skins/ui_main.c:816
+msgid "Balance: center"
+msgstr "சமநிலை:மத்தி "
+
+#: src/skins/ui_main.c:818
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "சமநிலை:% d%% வலது "
+
+#: src/skins/ui_main.c:942
+msgid "Options Menu"
+msgstr "தேர்வு பட்டியல்"
+
+#: src/skins/ui_main.c:946
+msgid "Disable 'Always On Top'"
+msgstr "'எப்போதும் மேலே' என்பதை முடக்குக "
+
+#: src/skins/ui_main.c:948
+msgid "Enable 'Always On Top'"
+msgstr "'எப்போதும் மேலே' என்பதை செயற்படுத்துக "
+
+#: src/skins/ui_main.c:951
+msgid "File Info Box"
+msgstr "கோப்பு தகவல் பெட்டி"
+
+#: src/skins/ui_main.c:956
+msgid "Visualization Menu"
+msgstr "காட்சிப்படுத்தல் பட்டியல்"
+
+#: src/skins/ui_main.c:1591
+msgid "Single mode."
+msgstr "ஒற்றை முறை."
+
+#: src/skins/ui_main.c:1593
+msgid "Playlist mode."
+msgstr "பாடல் பட்டியல் murai"
+
+#: src/skins/ui_main.c:1615
+msgid "Stopping after song."
+msgstr "பாடலின் பின்னர் நிறுத்துக."
+
+#: src/skins/ui_main.c:1617
+msgid "Not stopping after song."
+msgstr "பாடலின் பின்னர் நிறுத்த வேண்டாம்."
+
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
+msgid "Autoscroll Song Name"
+msgstr "பாடல் பெயரின் போது தானாக உருள செய்யவும்."
+
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
+msgid "Stop after Current Song"
+msgstr "தற்போதைய பாடலின் பின்னர் நிறுத்துக."
+
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
+msgid "Peaks"
+msgstr "உச்சங்கள் "
+
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
+msgid "Repeat"
+msgstr "மறுமுறை"
+
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
+msgid "Shuffle"
+msgstr "குலுக்குக "
+
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
+msgid "No Playlist Advance"
+msgstr "முன்னோக்கிய பாடல் பட்டியலுக்கு செல்ல வேண்டாம்"
+
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
+msgid "Show Player"
+msgstr "இயக்கியை காட்டு"
+
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
+msgid "Show Playlist Editor"
+msgstr "பாடல் பட்டியல் திருத்தியை காண்பிக்க "
+
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
+msgid "Show Equalizer"
+msgstr "சமமாக்கியை காண்பிக்க "
+
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
+msgid "Always on Top"
+msgstr "எப்பொழுதும் மேலே "
+
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
+msgid "Put on All Workspaces"
+msgstr "அனைத்து வேலையிடங்கள் மீதும் இடுக "
+
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
+msgid "Roll up Player"
+msgstr "சுழrறு முறை இயக்கி "
+
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
+msgid "Roll up Playlist Editor"
+msgstr "சுழற்று முறை இயக்கி திருத்தி "
+
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
+msgid "Roll up Equalizer"
+msgstr "சுழற்று முறை சமமாக்கி"
+
+#: src/skins/ui_manager.c:114
+msgid "Analyzer"
+msgstr "பகுப்பாய்வி "
+
+#: src/skins/ui_manager.c:115
+msgid "Scope"
+msgstr "குறியிலக்கம்"
+
+#: src/skins/ui_manager.c:116
+msgid "Voiceprint"
+msgstr "குரல் அச்சு"
+
+#: src/skins/ui_manager.c:117
+msgid "Off"
+msgstr "அணைக்குக "
+
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
+msgid "Normal"
+msgstr "இயல்பான"
+
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+msgid "Fire"
+msgstr "நெருப்பு "
+
+#: src/skins/ui_manager.c:123
+msgid "Vertical Lines"
+msgstr "நிலைக்குத்து கோடுகள் "
+
+#: src/skins/ui_manager.c:127
+msgid "Lines"
+msgstr "கோடுகள் "
+
+#: src/skins/ui_manager.c:128
+msgid "Bars"
+msgstr "பட்டைகள்"
+
+#: src/skins/ui_manager.c:132
+msgid "Dot Scope"
+msgstr "புள்ளி குறியிலக்கம்"
+
+#: src/skins/ui_manager.c:133
+msgid "Line Scope"
+msgstr "கோட்டு குறியிலக்கம்"
+
+#: src/skins/ui_manager.c:134
+msgid "Solid Scope"
+msgstr "திட குறியிலக்கம்"
+
+#: src/skins/ui_manager.c:140
+msgid "Ice"
+msgstr "பனி "
+
+#: src/skins/ui_manager.c:145
+msgid "Smooth"
+msgstr "மிருதுவான "
+
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
+msgid "Slowest"
+msgstr "மெதுவான "
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slow"
+msgstr "மெதுவாய் "
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
+msgid "Medium"
+msgstr "நடுத்தரம் "
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Fast"
+msgstr "விரைவு "
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fastest"
+msgstr "மிக விரைவாக "
+
+#: src/skins/ui_manager.c:165
+msgid "Time Elapsed"
+msgstr "கடந்த நேரம் "
+
+#: src/skins/ui_manager.c:166
+msgid "Time Remaining"
+msgstr "மீதமுள்ள நேரம் "
+
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
+msgid "Previous"
+msgstr "முந்தைய"
+
+#: src/skins/ui_manager.c:195
+msgid "Visualization"
+msgstr "உருவக காட்சிப்படுத்தல் "
+
+#: src/skins/ui_manager.c:196
+msgid "Visualization Mode"
+msgstr "காட்சிப்படுத்தல் முறை "
+
+#: src/skins/ui_manager.c:197
+msgid "Analyzer Mode"
+msgstr "பகுப்பாய்வி முறை"
+
+#: src/skins/ui_manager.c:198
+msgid "Scope Mode"
+msgstr "குறியிலக்க முறை "
+
+#: src/skins/ui_manager.c:199
+msgid "Voiceprint Mode"
+msgstr "குரலச்சு முறை "
+
+#: src/skins/ui_manager.c:200
+msgid "WindowShade VU Mode"
+msgstr "சாளர நிழல் VU முறை "
+
+#: src/skins/ui_manager.c:201
+msgid "Analyzer Falloff"
+msgstr "பகுப்பாய்வி வீழச்சியுறுதல் "
+
+#: src/skins/ui_manager.c:202
+msgid "Peaks Falloff"
+msgstr "உச்சங்கள் வீழச்சியுறுதல் "
+
+#: src/skins/ui_manager.c:207
+msgid "Playlist"
+msgstr "பாடல் பட்டியல்"
+
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
+msgid "Play Playlist"
+msgstr "பாடல் பட்டியலினை ஓலி "
+
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
+msgid "New Playlist"
+msgstr "புதிய பாடல் பட்டியல்"
+
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
+msgid "Select Next Playlist"
+msgstr "அடுத்த பாடல் பட்டியலினை தெரிவு செய்க"
+
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
+msgid "Select Previous Playlist"
+msgstr "முன்னைய பாடல் பட்டியலினை தெரிவு செய்க"
+
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
+msgid "Delete Playlist"
+msgstr "பாடல் பட்டியலினை அழிக்குக "
+
+#: src/skins/ui_manager.c:224
+msgid "Import Playlist"
+msgstr "பாடல் பட்டியலை இறக்குமதி செய்க "
+
+#: src/skins/ui_manager.c:225
+msgid "Loads a playlist file into the selected playlist."
+msgstr "தெரிவு செய்யப்பட பாடல் பட்டியலுக்கு பாடல் பட்டியல் கோப்பினை ஏற்றுக "
+
+#: src/skins/ui_manager.c:228
+msgid "Export Playlist"
+msgstr "பாடல் பட்டியலை ஏற்றுமதி செய்க "
+
+#: src/skins/ui_manager.c:229
+msgid "Saves the selected playlist."
+msgstr "தெரிவு செய்த பாடல் பட்டியலினை சேமிக்குக "
+
+#: src/skins/ui_manager.c:231
+msgid "Refresh List"
+msgstr "பட்டியலை புதுப்பிக்குக "
+
+#: src/skins/ui_manager.c:232
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr "பாடல் பட்டியலுடன் தொடர்புடைய மீத்தரவினை புதுப்பிக்குக. "
+
+#: src/skins/ui_manager.c:235
+msgid "Playlist Manager"
+msgstr "பாடல் பட்டிய நிர்வாகி "
+
+#: src/skins/ui_manager.c:238
+msgid "Queue Manager"
+msgstr "வரிசை நிர்வாகி"
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "பார்வையிடுக "
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "இடைமுகம் "
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr "இடைமுக விருப்பத்தேர்வுகள் ..."
+
+#: src/skins/ui_manager.c:250
+msgid "Add Internet Address..."
+msgstr "இணைய முகவரியிnai சேர்க்குக "
+
+#: src/skins/ui_manager.c:251
+msgid "Adds a remote track to the playlist."
+msgstr "பாடல் பட்டியலுக்கு தொலைவுப்பாடல்களை சேர்க்குக."
+
+#: src/skins/ui_manager.c:254
+msgid "Add Files..."
+msgstr "கோப்புக்களை சேர்க்குக "
+
+#: src/skins/ui_manager.c:255
+msgid "Adds files to the playlist."
+msgstr "பாடல் பட்டியலுக்கு கோப்புகளை உட்செலுத்தவும்"
+
+#: src/skins/ui_manager.c:260
+msgid "Search and Select"
+msgstr "தேடி தேர்ந்தெடுக்கவும்"
+
+#: src/skins/ui_manager.c:261
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr ""
+"பாடல் பட்டியலில் தேடி ஒரு குறிப்பிட்ட வரையறையின் அடிப்படையில் பட்டியல் பதிவுகளை தெரிக."
+
+#: src/skins/ui_manager.c:264
+msgid "Invert Selection"
+msgstr "தலைகீழ் தேர்ந்தெடுப்பு"
+
+#: src/skins/ui_manager.c:265
+msgid "Inverts the selected and unselected entries."
+msgstr "தேர்ந்தெடுக்கப்பட்ட மற்றும் தேர்வுசெய்யப்படாத பதிவுகளை தலைகீழாக்குக "
+
+#: src/skins/ui_manager.c:268
+msgid "Select All"
+msgstr "அனைத்தையும் தேர்ந்தெடுக்குக "
+
+#: src/skins/ui_manager.c:269
+msgid "Selects all of the playlist entries."
+msgstr "பாடல் பட்டியலிலுள்ள அனைத்து பதிவுகளையும் தெரிக. "
+
+#: src/skins/ui_manager.c:272
+msgid "Select None"
+msgstr "எதனையும் தேர்ந்தெடுக்க வேண்டாம்."
+
+#: src/skins/ui_manager.c:273
+msgid "Deselects all of the playlist entries."
+msgstr "பாடல் பட்டியலிலுள்ள அனைத்து பதிவுகளையும் தெரிய வேண்டாம். "
+
+#: src/skins/ui_manager.c:278
+msgid "Remove All"
+msgstr "அனைத்தையும் அகற்றுக. "
+
+#: src/skins/ui_manager.c:279
+msgid "Removes all entries from the playlist."
+msgstr "பாடல் பட்டியலிலுள்ள அனைத்து பதிவுகளையும் அகற்றுக. "
+
+#: src/skins/ui_manager.c:282
+msgid "Clear Queue"
+msgstr "வரிசையினை அழிக்குக. "
+
+#: src/skins/ui_manager.c:283
+msgid "Clears the queue associated with this playlist."
+msgstr "பாடல் பட்டியலுடன் தொடர்புடைய அனைத்து வரிசைகளையும் அழிக்குக."
+
+#: src/skins/ui_manager.c:286
+msgid "Remove Unavailable Files"
+msgstr "கிடைக்கப்பெறாத கோப்புகளை அகற்றுக. "
+
+#: src/skins/ui_manager.c:287
+msgid "Removes unavailable files from the playlist."
+msgstr "கிடைக்கப்பெறாத கோப்புகளை பாடல் பட்டியலில் இருந்து அகற்றுக. "
+
+#: src/skins/ui_manager.c:290
+msgid "Remove Duplicates"
+msgstr "போலிகளை அகற்றுக "
+
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
+msgid "By Title"
+msgstr "தலைப்பின் படி "
+
+#: src/skins/ui_manager.c:293
+msgid "Removes duplicate entries from the playlist by title."
+msgstr "போலிப்பதிவுகளை பாடல் பட்டியலின் தலைப்பிட்கமைய அகற்றுக. "
+
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
+msgid "By Filename"
+msgstr "கோப்பு பெயரின் படி "
+
+#: src/skins/ui_manager.c:297
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr "போலிப்பதிவுகளை பாடல் பட்டியலின் கோப்பு பெயரிட்கமைய அகற்றுக. "
+
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
+msgid "By Path + Filename"
+msgstr "கோப்பின் பெயர் மட்டும் பாதையின் படி "
+
+#: src/skins/ui_manager.c:301
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr "போலிப்பதிவுகளை பாடல் பட்டியலின் முழு பாதைக்கேட்ப அகற்றுக."
+
+#: src/skins/ui_manager.c:304
+msgid "Remove Unselected"
+msgstr "தெரிவுசெய்யாதவற்றை அகற்றுக. "
+
+#: src/skins/ui_manager.c:305
+msgid "Remove unselected entries from the playlist."
+msgstr "தெரிவுசெய்யாத பதிவுகளை பாடல் பட்டியலில் இருந்து அகற்றுக. "
+
+#: src/skins/ui_manager.c:308
+msgid "Remove Selected"
+msgstr "தெரிவுசெய்தவற்றை அகற்றுக"
+
+#: src/skins/ui_manager.c:309
+msgid "Remove selected entries from the playlist."
+msgstr "தெரிவுசெய்த பதிவுகளை பாடல் பட்டியலில் இருந்து அகற்றுக. "
+
+#: src/skins/ui_manager.c:314
+msgid "Randomize List"
+msgstr "பட்டியலினை தற்போக்காக தோன்றச்செய்க "
+
+#: src/skins/ui_manager.c:315
+msgid "Randomizes the playlist."
+msgstr "பாடல் பட்டியலினை தற்போக்காக தோன்றச்செய்க "
+
+#: src/skins/ui_manager.c:318
+msgid "Reverse List"
+msgstr "பட்டியலினை தலைகீழாக்குக"
+
+#: src/skins/ui_manager.c:319
+msgid "Reverses the playlist."
+msgstr "பாடல் பட்டியலினை தலைகீழாக்குக."
+
+#: src/skins/ui_manager.c:322
+msgid "Sort List"
+msgstr "பட்டியலை வரிசையாக்குக "
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "Sorts the list by title."
+msgstr "பட்டியலை தலைப்பிட்கமைய வரிசையாக்குக "
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+msgid "By Album"
+msgstr "குறுவட்டின் படி "
+
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+msgid "Sorts the list by album."
+msgstr "பட்டியலை குறுவட்டின் அடிப்படையில் வரிசையாக்குக "
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+msgid "By Artist"
+msgstr "பாடகர்களின் படி "
+
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+msgid "Sorts the list by artist."
+msgstr "பட்டியலை பாடகர் பெயர் அடிப்படையில் வரிசையாக்குக "
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "Sorts the list by filename."
+msgstr "பட்டியலை கோப்பு பெயர் அடிப்படையில் வரிசையாக்குக "
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "Sorts the list by full pathname."
+msgstr "பட்டியலை கோப்பு வழிப்பெயர் அடிப்படையில் வரிசையாக்குக "
+
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+msgid "By Date"
+msgstr "திகதியின் படி "
+
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+msgid "Sorts the list by modification time."
+msgstr "பட்டியலை மாற்ற நேரத்தின் அடிப்படையில் வரிசையாக்குக "
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+msgid "By Track Number"
+msgstr "பாடல் இலக்க அடிப்படையில் "
+
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+msgid "Sorts the list by track number."
+msgstr "பட்டியலை பாடல் எண் அடிப்படையில் வரிசையாக்குக "
+
+#: src/skins/ui_manager.c:352
+msgid "Sort Selected"
+msgstr "வரிசையானவற்றை தெரிக."
+
+#: src/skins/ui_manager.c:388
+msgid "File"
+msgstr "கோப்பு"
+
+#: src/skins/ui_manager.c:391
+msgid "Plugin Services"
+msgstr "நீட்சி சேவைகள் "
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View Track Details"
+msgstr "பாடல் தகவல்களை பார்வையிடுக "
+
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+msgid "View track details"
+msgstr "பாடல் தகவல்களை பார்வையிடுக "
+
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
+msgid "About Audacious"
+msgstr "ஔடகிவஸ் பற்றி"
+
+#: src/skins/ui_manager.c:402
+msgid "Play File"
+msgstr "கோப்பினை இயக்குக "
+
+#: src/skins/ui_manager.c:403
+msgid "Load and play a file"
+msgstr "ஏற்றி பின் கோப்பினை இயக்குக "
+
+#: src/skins/ui_manager.c:405
+msgid "Play Location"
+msgstr "பாடல் வழியினை இயக்குக "
+
+#: src/skins/ui_manager.c:406
+msgid "Play media from the selected location"
+msgstr "தெரிவு செய்யப்பட்ட பிரதேசத்திலுள்ள பல்லூடக கோப்பினை இயக்குக "
+
+#: src/skins/ui_manager.c:408
+msgid "Plugin services"
+msgstr "நீட்சி சேவைகள் "
+
+#: src/skins/ui_manager.c:410
+msgid "Preferences"
+msgstr "விருப்பத்தேர்வுகள் "
+
+#: src/skins/ui_manager.c:411
+msgid "Open preferences window"
+msgstr "விருப்பத்தேர்வுகள் சாரளத்தை திறக்குக "
+
+#: src/skins/ui_manager.c:414
+msgid "Quit Audacious"
+msgstr "ஔடகிவஸ் இனை மூடுக "
+
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
+msgid "Set A-B"
+msgstr "A-B இனை அமைக்குக "
+
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
+msgid "Clear A-B"
+msgstr "A-B இனை அழிக்குக"
+
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "கோப்பிற்கு தாவவும்."
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
+msgid "Jump to Time"
+msgstr "நேரத்திற்கு செல்லவும் "
+
+#: src/skins/ui_manager.c:428
+msgid "Queue Toggle"
+msgstr "வரிசையினை நிலைமாற்றுக"
+
+#: src/skins/ui_manager.c:429
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr "பாடல் பட்டியல் வரிசை பதிவினை செயல்படுத்துக / செயலிழக்க செய்க "
+
+#: src/skins/ui_manager.c:432
+msgid "Copy"
+msgstr "நகleடுக்குக"
+
+#: src/skins/ui_manager.c:435
+msgid "Cut"
+msgstr "வெட்டுக "
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "ஒட்டுக "
+
+#: src/skins/ui_manager.c:445
+msgid "Load"
+msgstr "ஏற்றுக "
+
+#: src/skins/ui_manager.c:446
+msgid "Import"
+msgstr "இறக்குமதி செய்க"
+
+#: src/skins/ui_manager.c:447
+msgid "Save"
+msgstr "சேமிக்குக "
+
+#: src/skins/ui_manager.c:448
+msgid "Delete"
+msgstr "அழிக்குக "
+
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
+msgid "Preset"
+msgstr "முன்னமைப்புகள்"
+
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
+msgid "Auto-load preset"
+msgstr "முன்னமைப்பினை தானாக ஏற்று"
+
+#: src/skins/ui_manager.c:454
+msgid "Load auto-load preset"
+msgstr "முன்னமைப்பினை ஏற்றி தானாக ஏற்று"
+
+#: src/skins/ui_manager.c:457
+msgid "Load default preset into equalizer"
+msgstr "இயல்புநிலை முன்னமைப்பினை சமமாக்கியினுள் ஏற்றுக "
+
+#: src/skins/ui_manager.c:459
+msgid "Zero"
+msgstr "சுழியம் "
+
+#: src/skins/ui_manager.c:460
+msgid "Set equalizer preset levels to zero"
+msgstr "சமமாக்கியின் முன்னமைக்கப்பட்ட அளவுகளை சுழியத்திற்கு மாற்றி அமைக்குக."
+
+#: src/skins/ui_manager.c:462
+msgid "From file"
+msgstr "கோப்பில் இருந்து "
+
+#: src/skins/ui_manager.c:463
+msgid "Load preset from file"
+msgstr "முன்னமைப்புகளை கோப்பிலிருந்து ஏற்றுக "
+
+#: src/skins/ui_manager.c:465
+msgid "From WinAMP EQF file"
+msgstr "WinAMP EQF கோப்பில் இருந்து "
+
+#: src/skins/ui_manager.c:466
+msgid "Load preset from WinAMP EQF file"
+msgstr "WinAMP EQF கோப்பில் இருந்து முன்னமைப்புகளை ஏற்றுக "
+
+#: src/skins/ui_manager.c:468
+msgid "WinAMP Presets"
+msgstr "WinAMP முன்னமைப்புகள் "
+
+#: src/skins/ui_manager.c:469
+msgid "Import WinAMP presets"
+msgstr "WinAMP முன்னமைப்புகளினை இறக்குமதி செய்க"
+
+#: src/skins/ui_manager.c:475
+msgid "Save auto-load preset"
+msgstr "தானியங்கு முன்னமைப்பினை சேமிக்குக "
+
+#: src/skins/ui_manager.c:478
+msgid "Save default preset"
+msgstr "இயல்புநிலை முன்னமைப்பினை சேமிக்குக "
+
+#: src/skins/ui_manager.c:480
+msgid "To file"
+msgstr "கோப்பிற்கு "
+
+#: src/skins/ui_manager.c:481
+msgid "Save preset to file"
+msgstr "முன்னமைப்பினை கோப்பினுள் சேமிக்குக "
+
+#: src/skins/ui_manager.c:483
+msgid "To WinAMP EQF file"
+msgstr "WinAMP EQF கோப்பிற்கு "
+
+#: src/skins/ui_manager.c:484
+msgid "Save preset to WinAMP EQF file"
+msgstr "முன்னமைப்பினை WinAMP EQF கோப்பினுள் சேமிக்குக "
+
+#: src/skins/ui_manager.c:490
+msgid "Delete auto-load preset"
+msgstr "தானியங்கு முன்னமைப்பினை அழிக்குக"
+
+#: src/skins/ui_playlist.c:244
+msgid "Search entries in active playlist"
+msgstr "செய்வினை பாடல் பட்டியலிலுள்ள பதிவுகளை தேடுக "
+
+#: src/skins/ui_playlist.c:251
+msgid ""
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr ""
+"ஒன்று அல்லது மேற்பட்ட வெற்றிடங்களை நிரப்புவதன் மூலம் பட்டியல் பதிவுகளை தெரிக. வெற்றிடங்கள் "
+"வழக்கமான வெளிப்பாடுகள் தொடரியலை கொண்டவை. வழக்கமான வெளிப்பாடுகள் எவ்வாறு இயங்கும் என "
+"தெரியாவிடின் நீங்கள் தேடுவதின் துல்லியமான பகுதியினை உள்ளிடுக. "
+
+#: src/skins/ui_playlist.c:259
+msgid "Title: "
+msgstr "தலைப்பு:"
+
+#: src/skins/ui_playlist.c:267
+msgid "Album: "
+msgstr "குறுவட்டு:"
+
+#: src/skins/ui_playlist.c:275
+msgid "Artist: "
+msgstr "பாடகர்:"
+
+#: src/skins/ui_playlist.c:283
+msgid "Filename: "
+msgstr "கோப்பின் பெயர்:"
+
+#: src/skins/ui_playlist.c:292
+msgid "Clear previous selection before searching"
+msgstr "தேட முன் முன்னைய தெரிவுகளை துடைத்தழிக்குக "
+
+#: src/skins/ui_playlist.c:295
+msgid "Automatically toggle queue for matching entries"
+msgstr "தேர்வடையும் பதிவுகளை தானாக நிலைமாற்று வரிசையாக்குக"
+
+#: src/skins/ui_playlist.c:298
+msgid "Create a new playlist with matching entries"
+msgstr "தேர்வடையும் பதிவுகளுக்கு புதிய பாடல் பட்டியலொன்றை உருவாக்குக."
+
+#: src/skins/ui_playlist.c:738
+msgid "Audacious Playlist Editor"
+msgstr "ஔடகிவஸ் பாடல் பட்டியல் திருத்தி"
+
+#: src/skins/ui_playlist.c:772
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d இன் %d)"
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr "ஆவணப்படுத்தப்பட்ட Winamp 2.x தோல் "
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr "ஆவணப்படுத்தப்படாத Winamp 2.x தோல் "
+
+#: src/skins/util.c:773
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr "கோப்பகமொன்றை உருவாக்க முடியவில்லை (%s): %s⏎\n"
+
+#: src/sndfile/plugin.c:416
+msgid ""
+"Based on the xmms_sndfile plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+
+#: src/sndfile/plugin.c:435
+msgid "Sndfile Plugin"
+msgstr ""
+
+#: src/sndio/sndio.c:172
+msgid "About Sndio Output Plugin"
+msgstr "Sndio வெளியீட்டு நீட்சிகள் பற்றி"
+
+#: src/sndio/sndio.c:173
+msgid ""
+"Sndio Output Plugin\n"
+"\n"
+"Written by Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+
+#: src/sndio/sndio.c:248
+msgid "Unsupported format"
+msgstr "ஆதரிக்கப்படாத வடிவமைப்பு "
+
+#: src/sndio/sndio.c:249
+msgid ""
+"A format not supported by the audio device was requested.\n"
+"\n"
+"Please try again with the sndiod(1) server running."
+msgstr ""
+
+#: src/sndio/sndio.c:384
+msgid "sndio device"
+msgstr ""
+
+#: src/sndio/sndio.c:400
+msgid "(empty means default)"
+msgstr ""
+
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "சரி "
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "ரத்து செய்க "
+
+#: src/song_change/song_change.c:54
+msgid "Song Change"
+msgstr "பாடல் மாற்றம் "
+
+#: src/song_change/song_change.c:436
+msgid "Command to run when Audacious starts a new song."
+msgstr "ஔடகிவஸ் புதிய பாடலொன்றை இயக்க கட்டளையிடுக. "
+
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
+msgid "Command:"
+msgstr "கட்டளை:"
+
+#: src/song_change/song_change.c:442
+msgid "Command to run toward the end of a song."
+msgstr "ஔடகிவஸ் பாடலொன்றை நிறுத்த கட்டளையிடுக. "
+
+#: src/song_change/song_change.c:448
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr "ஔடகிவஸ் பாடல் பட்டியலொன்று முடிவடையும் போது இயக்க கட்டளையிடுக. "
+
+#: src/song_change/song_change.c:454
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr ""
+"பாடலொன்றின் தலைப்பு மாறும் போது இயக்க கட்டளையிடுக. (அதாவது பிணைய நீரோடைகளின் போது )"
+
+#: src/song_change/song_change.c:460
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command):\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%l: Length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr ""
+
+#: src/song_change/song_change.c:487
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr ""
+"அளவுருக்கள் ஓட்டுக்குள் மேற்கோள் குறிகளால் உட்பொதிந்திருக்க வேண்டும்."
+"இல்லையெனில் பாதுகாப்பு ஆபத்து இருக்கிறது"
+
+#: src/song_change/song_change.c:498
+msgid "Commands"
+msgstr "கட்டளைகள் "
+
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "விரைவு "
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "குறைவு "
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "உயர்"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "மிக உயர் "
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "தரம்:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
+msgid "Speed and Pitch"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:226
+msgid "Speed:"
+msgstr "வேகம்:"
+
+#: src/speed-pitch/speed-pitch.c:229
+msgid "Pitch:"
+msgstr "சுருதி:"
+
+#: src/speed-pitch/speed-pitch.c:264
+msgid "Speed and Pitch"
+msgstr ""
+
+#: src/statusicon/statusicon.c:390
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+
+#: src/statusicon/statusicon.c:397
+msgid "Mouse Scroll Action"
+msgstr ""
+
+#: src/statusicon/statusicon.c:398
+msgid "Change volume"
+msgstr "சப்த அளவை மாற்றுக "
+
+#: src/statusicon/statusicon.c:401
+msgid "Change playing song"
+msgstr "இயங்கும் பாடலை மாற்றுக "
+
+#: src/statusicon/statusicon.c:404
+msgid "Other Settings"
+msgstr ""
+
+#: src/statusicon/statusicon.c:405
+msgid "Disable the popup window"
+msgstr "திடீர் சாளரத்தை செயலிழக்க செய்க."
+
+#: src/statusicon/statusicon.c:407
+msgid "Close to the system tray"
+msgstr ""
+
+#: src/statusicon/statusicon.c:409
+msgid "Advance in playlist when scrolling upward"
+msgstr "பாடல் பட்டியலினை உருட்டும் போது முன்னோக்கி செல்லவும் "
+
+#: src/statusicon/statusicon.c:418
+msgid "Status Icon"
+msgstr ""
+
+#: src/stereo_plugin/stereo.c:17
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+
+#: src/stereo_plugin/stereo.c:25
+msgid "Extra Stereo"
+msgstr "கூடுதல் பேரொலி "
+
+#: src/stereo_plugin/stereo.c:36
+msgid "Extra Stereo"
+msgstr ""
+
+#: src/tonegen/tonegen.c:84
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.c:84
+msgid "Tone Generator: "
+msgstr "தொனி பிறப்பாக்கி:"
+
+#: src/tonegen/tonegen.c:197
+msgid ""
+"Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
+msgstr ""
+
+#: src/tonegen/tonegen.c:206
+msgid "Tone Generator"
+msgstr "ஒலி உருவாக்கி "
+
+#: src/unix-io/unix-io.c:243
+msgid ""
+"File I/O Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
+msgstr ""
+
+#: src/unix-io/unix-io.c:266
+msgid "File I/O Plugin"
+msgstr "கோப்பு உள் /வெளி சொருகி"
+
+#: src/voice_removal/voice_removal.c:58
+msgid "Voice Removal"
+msgstr "குரல் நீக்கம்"
+
+#: src/vorbis/vorbis.c:562
+msgid ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Based on the Xiph.org Foundation's Ogg Vorbis Plugin:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Original code by:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contributions from:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+
+#: src/vorbis/vorbis.c:582
+msgid "Ogg Vorbis Decoder"
+msgstr ""
+
+#: src/vtx/vtx.c:242
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+
+#: src/vtx/vtx.c:248
+msgid "VTX Decoder"
+msgstr ""
+
+#: src/wavpack/wavpack.c:282
+msgid "lossy (hybrid)"
+msgstr ""
+
+#: src/wavpack/wavpack.c:284
+msgid "lossy"
+msgstr ""
+
+#: src/wavpack/wavpack.c:334
+msgid ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
+msgstr ""
+
+#: src/wavpack/wavpack.c:341
+msgid "WavPack Decoder"
+msgstr ""
+
+#: src/xsf/plugin.c:274
+msgid "2SF Decoder"
+msgstr ""
+
+#: src/xspf/xspf.c:440
+msgid "XML Shareable Playlists (XSPF)"
+msgstr ""
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-சொருகி - கோப்பினை தெரிவு செய்க "

audacious-plugins-3.4.2.tar.bz2/po/tr.po Added

@@ -0,0 +1,3999 @@
+# Turkish translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# aamet <aaydin159@gmail.com>, 2012
+# aamet <aaydin159@gmail.com>, 2012
+# elma sevmem <drmxmyt@gmail.com>, 2013
+# elma sevmem <drmxmyt@gmail.com>, 2013
+# emfi <emrefirat93@gmail.com>, 2013
+# emfi <emrefirat93@gmail.com>, 2013
+# ferhatelmas <elmas.ferhat@gmail.com>, 2013
+# ferhatelmas <elmas.ferhat@gmail.com>, 2013
+# Murat Senel <muratasenel@gmail.com>, 2007
+# Murat Şenel <muratasenel@gmail.com>, 2007
+# Onur Küçük <onur@pardus.org.tr>, 2007
+# seckyn <seckyn@windowslive.com>, 2013
+# seckyn <seckyn@windowslive.com>, 2013
+# tarkan255 <t.oguzman@hotmail.com>, 2012
+# tarkan255 <t.oguzman@hotmail.com>, 2012
+# volkangezer <volkangezer@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-10-30 21:22+0000\n"
+"Last-Translator: volkangezer <volkangezer@gmail.com>\n"
+"Language-Team: Turkish (http://www.transifex.com/projects/p/audacious/"
+"language/tr/)\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
+msgid "mono"
+msgstr "mono"
+
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
+msgid "stereo"
+msgstr "stereo"
+
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
+msgid "surround"
+msgstr ""
+
+#: src/aac/libmp4.c:930
+msgid "AAC Decoder"
+msgstr "AAC Çözücü"
+
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
+msgid "sequenced"
+msgstr ""
+
+#: src/adplug/plugin.c:14
+msgid "AdPlug (AdLib Player)"
+msgstr ""
+
+#: src/alarm/alarm.c:809
+msgid ""
+"A plugin that can be used to start playing at a certain time.\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
+msgstr ""
+
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
+msgid "Alarm"
+msgstr "Alarm"
+
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Bu uyandırma çağrısıdır."
+
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
+
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Hatırlatıcı"
+
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Pazartesi"
+
+#: src/alarm/interface.c:140
+msgid "Tuesday"
+msgstr "Salı"
+
+#: src/alarm/interface.c:140
+msgid "Wednesday"
+msgstr "Çarşamba"
+
+#: src/alarm/interface.c:141
+msgid "Thursday"
+msgstr "Perşembe"
+
+#: src/alarm/interface.c:141
+msgid "Friday"
+msgstr "Cuma"
+
+#: src/alarm/interface.c:141
+msgid "Saturday"
+msgstr "Cumartesi"
+
+#: src/alarm/interface.c:141
+msgid "Sunday"
+msgstr "Pazar"
+
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Alarm Ayarları"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Zaman"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Alarm (Varsayılan)"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Sonra sessiz:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "saat"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "dakika"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Sonraki alarm için günleri seçiniz"
+
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "Gün"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Öntanımlı"
+
+#: src/alarm/interface.c:310
+msgid "Days"
+msgstr "Günler"
+
+#: src/alarm/interface.c:319
+msgid "Fading"
+msgstr "Bozulma"
+
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
+msgid "seconds"
+msgstr "saniye"
+
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
+msgid "Volume"
+msgstr "Ses"
+
+#: src/alarm/interface.c:339
+msgid "Start at"
+msgstr "İle başla"
+
+#: src/alarm/interface.c:357
+msgid "Final"
+msgstr "Son"
+
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Şu anda"
+
+#: src/alarm/interface.c:387
+msgid "Additional Command"
+msgstr "Ek Komut"
+
+#: src/alarm/interface.c:393
+msgid "enable"
+msgstr "izin ver"
+
+#: src/alarm/interface.c:400
+msgid "Playlist (optional)"
+msgstr "Çalma Listesi(isteğe bağlı)"
+
+#: src/alarm/interface.c:407
+msgid "Select a playlist"
+msgstr ""
+
+#: src/alarm/interface.c:419
+msgid "Use reminder"
+msgstr "Hatırlatıcıyı kullanı"
+
+#: src/alarm/interface.c:428
+msgid "Options"
+msgstr "Seçenekler"
+
+#: src/alarm/interface.c:433
+msgid "What do these options mean?"
+msgstr "Bu ayarlar ne anlama geliyor?"
+
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
+msgid "Help"
+msgstr "Yardım"
+
+#: src/albumart/albumart.c:143
+msgid "Album Art"
+msgstr ""
+
+#: src/alsa/config.c:212
+msgid "Default PCM device"
+msgstr "Varsayılan PCM aygıtı"
+
+#: src/alsa/config.c:241
+msgid "Default mixer device"
+msgstr "Varsayılan karıştırma aygıtı"
+
+#: src/alsa/config.c:428
+msgid "ALSA Output Plugin Preferences"
+msgstr "ALSA Çıkış Eklentisi Ayarları"
+
+#: src/alsa/config.c:434
+msgid "PCM device:"
+msgstr "PCM aygıtı:"
+
+#: src/alsa/config.c:436
+msgid "Mixer device:"
+msgstr "Karıştırıcı aygıt:"
+
+#: src/alsa/config.c:438
+msgid "Mixer element:"
+msgstr "Karıştırıcı öğesi:"
+
+#: src/alsa/config.c:441
+msgid "Work around drain hangup"
+msgstr ""
+
+#: src/alsa/plugin.c:25
+msgid ""
+"ALSA Output Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+
+#: src/alsa/plugin.c:32
+msgid "ALSA Output"
+msgstr ""
+
+#: src/amidi-plug/amidi-plug.c:248
+msgid ""
+"You have not selected any sequencer ports for MIDI playback. You can do so "
+"in the MIDI plugin preferences."
+msgstr ""
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr ""
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
+msgid "ALSA Backend "
+msgstr "ALSA Arkayüzü"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
+msgid ""
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+"Bu eklenti istenilen ALSA portunu kullanarak MIDI leri sıralamaya yarar.ALSA "
+"sıralama arayüzü istikrarlı çalışır ve ses kartlarının sağladığı(bkz. "
+"emu10k1) donanımsal ve yazılımsal sentezleyicileri kullanabilir.\n"
+"Bu eklenti MIDI dosyalarını işlemez, MIDI eklentilerini direkt olarakALSA "
+"sürücülerinden veya programlardan almak için kullanılır.Örneğin hazırda "
+"bulunan bir MIDI sesini donanımsal olarak elde etmekiçin kullanılır.\n"
+"Arkayüzü yazan, Giacomo Lozito"
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
+msgid "FluidSynth Backend "
+msgstr "FluidSynth Arkayüzü "
+
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
+msgid ""
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
+"Backend written by Giacomo Lozito."
+msgstr ""
+
+#: src/amidi-plug/i_configure-alsa.c:353
+msgid "Port"
+msgstr "Port"
+
+#: src/amidi-plug/i_configure-alsa.c:355
+msgid "Client name"
+msgstr "İstemci adı"
+
+#: src/amidi-plug/i_configure-alsa.c:357
+msgid "Port name"
+msgstr "Port adı"
+
+#: src/amidi-plug/i_configure-alsa.c:371
+msgid "ALSA output ports"
+msgstr "ALSA çıkış portları"
+
+#: src/amidi-plug/i_configure-alsa.c:432
+msgid "Soundcard: "
+msgstr "Ses kartı: "
+
+#: src/amidi-plug/i_configure-alsa.c:434
+msgid "Mixer control: "
+msgstr "Karıştırıcı kontrolü: "
+
+#: src/amidi-plug/i_configure-alsa.c:444
+msgid "Mixer settings"
+msgstr "Karıştırıcı ayarları"
+
+#: src/amidi-plug/i_configure-alsa.c:472
+msgid ""
+"ALSA\n"
+"backend"
+msgstr ""
+"ALSA\n"
+"arkayüzü"
+
+#: src/amidi-plug/i_configure-ap.c:63
+msgid "AMIDI-Plug - backend information"
+msgstr "AMIDI-Plug - arkayüz bilgisi"
+
+#: src/amidi-plug/i_configure-ap.c:221
+msgid "Backend selection"
+msgstr "Arkayüz seçimi"
+
+#: src/amidi-plug/i_configure-ap.c:261
+msgid "Playback settings"
+msgstr "Oynatma ayarları"
+
+#: src/amidi-plug/i_configure-ap.c:266
+msgid "Transpose: "
+msgstr "Transpose: "
+
+#: src/amidi-plug/i_configure-ap.c:275
+msgid "Drum shift: "
+msgstr "Davul tonlaması:"
+
+#: src/amidi-plug/i_configure-ap.c:293
+msgid "Advanced settings"
+msgstr "Gelişmiş ayarlar"
+
+#: src/amidi-plug/i_configure-ap.c:297
+msgid "pre-calculate length of MIDI files in playlist"
+msgstr "parça listesindeki MIDI dosyalarının uzunluklarının ön hesaplaması"
+
+#: src/amidi-plug/i_configure-ap.c:304
+msgid "extract comments from MIDI file (if available)"
+msgstr "MIDI dosyalarından yorumları aktar (eğer varsa)"
+
+#: src/amidi-plug/i_configure-ap.c:311
+msgid "extract lyrics from MIDI file (if available)"
+msgstr "MIDI dosyalarından şarkı sözlerini aktar (eğer varsa)"
+
+#: src/amidi-plug/i_configure-ap.c:344
+msgid ""
+"AMIDI\n"
+"Plug"
+msgstr ""
+"AMIDI\n"
+"Eklentisi"
+
+#: src/amidi-plug/i_configure.c:76
+msgid "AMIDI-Plug Settings"
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:63
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Plug - SoundFont dosyası seç"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:321
+msgid "SoundFont settings"
+msgstr "SoundFont ayarları"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:359
+msgid "Filename"
+msgstr "Dosya adı"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:363
+msgid "Size (bytes)"
+msgstr "Boyut (bayt)"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:412
+msgid "Load SF on player start"
+msgstr "Çalıcı başladığında SF'yi yükle"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:416
+msgid "Load SF on first MIDI file play"
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:431
+msgid "Synthesizer settings"
+msgstr "Sentezleyici ayarları"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:440
+msgid "gain"
+msgstr "kazanç"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
+msgid "use default"
+msgstr "öntanımlıyı kullan"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
+msgid "value:"
+msgstr "değer:"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:470
+msgid "polyphony"
+msgstr ""
+
+#: src/amidi-plug/i_configure-fluidsynth.c:500
+msgid "reverb"
+msgstr "derinlik"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
+msgid "yes"
+msgstr "evet"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
+msgid "no"
+msgstr "hayır"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:534
+msgid "chorus"
+msgstr "koro"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:568
+msgid "sample rate"
+msgstr "örnekleme oranı"
+
+#: src/amidi-plug/i_configure-fluidsynth.c:574
+msgid "22050 Hz "
+msgstr "22050 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:577
+msgid "44100 Hz "
+msgstr "44100 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:580
+msgid "96000 Hz "
+msgstr "96000 Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:583
+msgid "custom "
+msgstr "custom "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:592
+msgid "Hz "
+msgstr "Hz "
+
+#: src/amidi-plug/i_configure-fluidsynth.c:662
+msgid ""
+"FluidSynth\n"
+"backend"
+msgstr ""
+"FluidSynth\n"
+"arkayüzü"
+
+#: src/amidi-plug/i_fileinfo.c:175
+msgid "Name:"
+msgstr "İsim:"
+
+#: src/amidi-plug/i_fileinfo.c:200
+msgid " MIDI Info "
+msgstr " MIDI Bilgisi "
+
+#: src/amidi-plug/i_fileinfo.c:214
+msgid "Format:"
+msgstr "Biçim:"
+
+#: src/amidi-plug/i_fileinfo.c:217
+msgid "Length (msec):"
+msgstr "Uzunluk (ms):"
+
+#: src/amidi-plug/i_fileinfo.c:220
+msgid "No. of Tracks:"
+msgstr ""
+
+#: src/amidi-plug/i_fileinfo.c:226
+msgid "variable"
+msgstr "değişken"
+
+#: src/amidi-plug/i_fileinfo.c:228
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidi-plug/i_fileinfo.c:236
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidi-plug/i_fileinfo.c:239
+msgid "Time Div:"
+msgstr "Zamanı Böl:"
+
+#: src/amidi-plug/i_fileinfo.c:250
+msgid " MIDI Comments and Lyrics "
+msgstr " MIDI Yorumları ve Sözleri "
+
+#: src/amidi-plug/i_fileinfo.c:301
+msgid "* no comments available in this MIDI file *"
+msgstr "* bu midi dosyasında yorum bulunamadı *"
+
+#: src/amidi-plug/i_fileinfo.c:314
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* bu midi dosyasında şarkı sözü bulunamadı *"
+
+#: src/amidi-plug/i_fileinfo.c:367
+msgid " (invalid UTF-8)"
+msgstr " (geçersiz UTF-8)"
+
+#: src/amidi-plug/i_utils.c:39
+msgid "About AMIDI-Plug"
+msgstr ""
+
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr ""
+
+#: src/amidi-plug/i_utils.c:54
+msgid ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing"
+msgstr ""
+
+#: src/aosd/aosd.c:29
+msgid "Audacious OSD "
+msgstr ""
+
+#: src/aosd/aosd.c:37
+msgid "AOSD (On-Screen Display)"
+msgstr ""
+
+#: src/aosd/aosd_style.c:75
+msgid "Rectangle"
+msgstr "Dikdörtgen"
+
+#: src/aosd/aosd_style.c:79
+msgid "Rounded Rectangle"
+msgstr "Dairesel Dikdörtgen"
+
+#: src/aosd/aosd_style.c:83
+msgid "Concave Rectangle"
+msgstr "İçbükey Dikdörtgen"
+
+#: src/aosd/aosd_style.c:87
+msgid "None"
+msgstr "Hiçbiri"
+
+#: src/aosd/aosd_trigger.c:74
+msgid "Playback Start"
+msgstr "Çalmayı Başlat"
+
+#: src/aosd/aosd_trigger.c:75
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Parça listesindeki girdi oynatıldığında OSD'yi başlatır."
+
+#: src/aosd/aosd_trigger.c:79
+msgid "Title Change"
+msgstr "Başlık Değiştirme"
+
+#: src/aosd/aosd_trigger.c:80
+msgid ""
+"Triggers OSD when, during playback, the song title changes but the filename "
+"is the same. This is mostly useful to display title changes in internet "
+"streams."
+msgstr ""
+"Şarkı başladığında görünen şarkı başlığı değişir, fakat dosya adı aynı kalır "
+"ise OSD'yi tetikler. Bu yetenek özellikle İnternet üzerinden dinlenen "
+"yayınlarda başlık değişikliği olduğunda bu ayar faydalı oluyor."
+
+#: src/aosd/aosd_trigger.c:86
+msgid "Pause On"
+msgstr "Bekletme Açık"
+
+#: src/aosd/aosd_trigger.c:87
+msgid "Triggers OSD when playback is paused."
+msgstr "Çalma bekletildiğinde OSD'yi başlatır."
+
+#: src/aosd/aosd_trigger.c:91
+msgid "Pause Off"
+msgstr "Bekletme Kapalı"
+
+#: src/aosd/aosd_trigger.c:92
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Çalmaya yeniden başladığında OSD'yi başlatır."
+
+#: src/aosd/aosd_ui.c:168
+msgid "Placement"
+msgstr "Yerleştirme"
+
+#: src/aosd/aosd_ui.c:200
+msgid "Relative X offset:"
+msgstr "Değişken X değeri:"
+
+#: src/aosd/aosd_ui.c:207
+msgid "Relative Y offset:"
+msgstr "Değişken Y değeri:"
+
+#: src/aosd/aosd_ui.c:214
+msgid "Max OSD width:"
+msgstr "Maksimum OSD genişliği:"
+
+#: src/aosd/aosd_ui.c:225
+msgid "Multi-Monitor options"
+msgstr "Çoklu Ekran seçenekleri"
+
+#: src/aosd/aosd_ui.c:229
+msgid "Display OSD using:"
+msgstr "OSD kullanımını göster:"
+
+#: src/aosd/aosd_ui.c:231
+msgid "all monitors"
+msgstr "tüm ekranlar"
+
+#: src/aosd/aosd_ui.c:234
+#, c-format
+msgid "monitor %i"
+msgstr "ekran %i"
+
+#: src/aosd/aosd_ui.c:287
+msgid "Timing (ms)"
+msgstr "Zamanlama (ms)"
+
+#: src/aosd/aosd_ui.c:292
+msgid "Display:"
+msgstr "Görüntü:"
+
+#: src/aosd/aosd_ui.c:297
+msgid "Fade in:"
+msgstr "Gecikme:"
+
+#: src/aosd/aosd_ui.c:302
+msgid "Fade out:"
+msgstr "Kaybolma:"
+
+#: src/aosd/aosd_ui.c:383
+msgid "Fonts"
+msgstr "Yazı Tipleri"
+
+#: src/aosd/aosd_ui.c:391
+#, c-format
+msgid "Font %i:"
+msgstr "Yazı tipi %i:"
+
+#: src/aosd/aosd_ui.c:409
+msgid "Shadow"
+msgstr "Gölge"
+
+#: src/aosd/aosd_ui.c:439
+msgid "Internationalization"
+msgstr "Uluslararasılaştırma"
+
+#: src/aosd/aosd_ui.c:445
+msgid "Disable UTF-8 conversion of text (in aosd)"
+msgstr "Metnin UTF-8 dönüşümünü iptal et (aosd)"
+
+#: src/aosd/aosd_ui.c:462
+msgid "Select Skin File"
+msgstr "Deri Dosyasını Seçin"
+
+#: src/aosd/aosd_ui.c:573
+msgid "Render Style"
+msgstr "Tarama Biçemi"
+
+#: src/aosd/aosd_ui.c:589
+msgid "Colors"
+msgstr "Renkler"
+
+#: src/aosd/aosd_ui.c:602
+#, c-format
+msgid "Color %i:"
+msgstr "Renkler %i:"
+
+#: src/aosd/aosd_ui.c:620
+msgid "Custom Skin"
+msgstr "Özel Deri"
+
+#: src/aosd/aosd_ui.c:626
+msgid "Skin file:"
+msgstr "Deri dosyası:"
+
+#: src/aosd/aosd_ui.c:630
+msgid "Browse"
+msgstr "Gözat"
+
+#: src/aosd/aosd_ui.c:729
+msgid "Enable trigger"
+msgstr "Tetikleyiciyi etkinleştir"
+
+#: src/aosd/aosd_ui.c:756
+msgid "Event"
+msgstr "Olay"
+
+#: src/aosd/aosd_ui.c:784
+msgid "Composite manager detected"
+msgstr "Composite yöneticisi tespit edildi"
+
+#: src/aosd/aosd_ui.c:791
+msgid ""
+"Composite manager not detected;\n"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Composite yöneticisi tespit edilemedi;\n"
+"Çalışan bir Composite yöneticisinin olduğundan emin değilseniz lütfen "
+"OSD'nin düzgün çalışması için bir Composite yöneticisi çalıştırınız"
+
+#: src/aosd/aosd_ui.c:799
+msgid "Composite manager not required for fake transparency"
+msgstr "Sahte şeffaflık için composite yöneticisi gerekli değil"
+
+#: src/aosd/aosd_ui.c:837
+msgid "Transparency"
+msgstr "Şeffaflık"
+
+#: src/aosd/aosd_ui.c:843
+msgid "Fake transparency"
+msgstr "Sahte şeffaflık"
+
+#: src/aosd/aosd_ui.c:845
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Gerçek Şeffaflık (X Composite Eklentisi gerekli)"
+
+#: src/aosd/aosd_ui.c:887
+msgid "Composite extension not loaded"
+msgstr "Composite eklentisi yüklü değil"
+
+#: src/aosd/aosd_ui.c:895
+msgid "Composite extension not available"
+msgstr "Composite eklentisi erişilebilir değil"
+
+#: src/aosd/aosd_ui.c:914
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd_ui.c:995
+msgid "Audacious OSD - configuration"
+msgstr "Audacious OSD - yapılandırması"
+
+#: src/aosd/aosd_ui.c:1016
+msgid "Test"
+msgstr "Test"
+
+#: src/aosd/aosd_ui.c:1031
+msgid "Position"
+msgstr "Konum"
+
+#: src/aosd/aosd_ui.c:1036
+msgid "Animation"
+msgstr "Canlandırma"
+
+#: src/aosd/aosd_ui.c:1041
+msgid "Text"
+msgstr "Metin"
+
+#: src/aosd/aosd_ui.c:1046
+msgid "Decoration"
+msgstr "Dekorasyon"
+
+#: src/aosd/aosd_ui.c:1051
+msgid "Trigger"
+msgstr "Başlat"
+
+#: src/aosd/aosd_ui.c:1056
+msgid "Misc"
+msgstr "Çeşitli"
+
+#: src/asx/asx.c:96
+msgid "ASXv1/ASXv2 Playlists"
+msgstr ""
+
+#: src/audpl/audpl.c:222
+msgid "Audacious Playlists (audpl)"
+msgstr ""
+
+#: src/blur_scope/blur_scope.c:47
+msgid "Color"
+msgstr ""
+
+#: src/blur_scope/blur_scope.c:56
+msgid "Blur Scope"
+msgstr ""
+
+#: src/bs2b/plugin.c:136
+msgid "Bauer Stereophonic-to-Binaural Preferences"
+msgstr ""
+
+#: src/bs2b/plugin.c:147
+msgid "Feed level:"
+msgstr ""
+
+#: src/bs2b/plugin.c:161
+msgid "Cut frequency:"
+msgstr ""
+
+#: src/bs2b/plugin.c:175
+msgid "Presets:"
+msgstr ""
+
+#: src/bs2b/plugin.c:197
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr ""
+
+#: src/cairo-spectrum/cairo-spectrum.c:297
+msgid "Spectrum Analyzer"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:103
+msgid ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"and to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you to Tony Vroon for mentoring and guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:121
+msgid "Device"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:122
+msgid "Read speed:"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:125
+msgid "Override device:"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:127
+msgid "Metadata"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:128
+msgid "Use CD-Text"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:130
+msgid "Use CDDB"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:132
+msgid "Use HTTP instead of CDDBP"
+msgstr "CDDBP yerine HTTP kullan"
+
+#: src/cdaudio-ng/cdaudio-ng.c:134
+msgid "Server:"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:136
+msgid "Path:"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:138
+msgid "Port:"
+msgstr "Bağlantı Noktası:"
+
+#: src/cdaudio-ng/cdaudio-ng.c:148
+msgid "Audio CD Plugin"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:249
+msgid "Failed to initialize cdio subsystem."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:306
+#, c-format
+msgid "Invalid URI %s."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:308
+#, c-format
+msgid "Track %d not found."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:310
+#, c-format
+msgid "Track %d is a data track."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:312
+msgid "Failed to open audio output."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:395
+msgid "Error reading audio CD."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:505
+msgid "Audio CD"
+msgstr "Ses CD'si"
+
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:547
+msgid "No audio capable CD drive found."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:574
+msgid "Failed to finish initializing opened CD drive."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:587
+msgid "Failed to retrieve first/last track number."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:612
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:702
+msgid "Failed to create the cddb connection."
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:777
+msgid "Failed to query the CDDB server"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:779
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:803
+#, c-format
+msgid "Failed to read the cddb info: %s"
+msgstr ""
+
+#: src/cdaudio-ng/cdaudio-ng.c:876
+msgid "Drive is empty."
+msgstr "Sürücü boş."
+
+#: src/cdaudio-ng/cdaudio-ng.c:878
+msgid "Unsupported disk type."
+msgstr "Desteklenmeyen disk türü."
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Play CD"
+msgstr "CD çal"
+
+#: src/cd-menu-items/cd-menu-items.c:30
+msgid "Add CD"
+msgstr "CD Ekle"
+
+#: src/cd-menu-items/cd-menu-items.c:57
+msgid "Audio CD Menu Items"
+msgstr ""
+
+#: src/compressor/plugin.c:35
+msgid "Compression"
+msgstr ""
+
+#: src/compressor/plugin.c:36
+msgid "Center volume:"
+msgstr ""
+
+#: src/compressor/plugin.c:39
+msgid "Dynamic range:"
+msgstr "Dinamik alan:"
+
+#: src/compressor/plugin.c:53
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/compressor/plugin.c:58
+msgid "Dynamic Range Compressor"
+msgstr ""
+
+#: src/console/configure.c:134 src/console/plugin.c:42
+msgid "Game Console Music Decoder"
+msgstr "Oyun Konsolu Müzik Çözümleyicisi"
+
+#: src/console/configure.c:151
+msgid "General"
+msgstr "Genel"
+
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
+msgid "Playback"
+msgstr "Çal"
+
+#: src/console/configure.c:168
+msgid "Bass:"
+msgstr "Bas:"
+
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
+msgid "secs"
+msgstr "saniye"
+
+#: src/console/configure.c:179
+msgid "Treble:"
+msgstr "Tiz:"
+
+#: src/console/configure.c:200
+msgid "Default song length:"
+msgstr "Varsayılan şarkı uzunluğu:"
+
+#: src/console/configure.c:206
+msgid "Resampling"
+msgstr "Yeniden örnekleme"
+
+#: src/console/configure.c:212
+msgid "Enable audio resampling"
+msgstr "Ses örneklemesini etkinleştir"
+
+#: src/console/configure.c:227
+msgid "Resampling rate:"
+msgstr "Örnekleme oranı:"
+
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
+msgid "Hz"
+msgstr "Hz"
+
+#: src/console/configure.c:242
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/configure.c:243
+msgid "Ignore length from SPC tags"
+msgstr "SPC etiketlerindeki uzunluğu gözardı et"
+
+#: src/console/configure.c:244
+msgid "Increase reverb"
+msgstr "Derinliği artır"
+
+#: src/console/configure.c:269
+msgid ""
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Saniyelerle belirtilen varsayılan şarkı uzunluğu, uzunluk bilgisi bulunmayan "
+"parçalar için kullanılır (örneğin özyinelenen izler)."
+
+#: src/console/plugin.c:27
+msgid ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+msgstr ""
+
+#: src/crossfade/crossfade.c:81
+msgid ""
+"Crossfading failed because the songs had a different number of channels. "
+"You can use the Channel Mixer to convert the songs to the same number of "
+"channels."
+msgstr ""
+
+#: src/crossfade/crossfade.c:88
+msgid ""
+"Crossfading failed because the songs had different sample rates. You can "
+"use the Sample Rate Converter to convert the songs to the same sample rate."
+msgstr ""
+
+#: src/crossfade/crossfade.c:254
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/crossfade/crossfade.c:258
+msgid "Crossfade"
+msgstr ""
+
+#: src/crossfade/crossfade.c:259
+msgid "Overlap:"
+msgstr ""
+
+#: src/crossfade/crossfade.c:269
+msgid "Crossfade"
+msgstr ""
+
+#: src/crystalizer/crystalizer.c:40
+msgid "Crystalizer"
+msgstr ""
+
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
+msgid "Intensity:"
+msgstr ""
+
+#: src/crystalizer/crystalizer.c:51
+msgid "Crystalizer"
+msgstr ""
+
+#: src/cue/cue.c:158
+msgid "Cue Sheet Plugin"
+msgstr ""
+
+#: src/echo_plugin/echo.c:24
+msgid "Echo"
+msgstr ""
+
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
+msgid "Delay:"
+msgstr ""
+
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
+msgid "ms"
+msgstr ""
+
+#: src/echo_plugin/echo.c:28
+msgid "Feedback:"
+msgstr ""
+
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
+msgid "Volume:"
+msgstr ""
+
+#: src/echo_plugin/echo.c:114
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"\n"
+"Surround echo by Carl van Schaik, 1999"
+msgstr ""
+
+#: src/echo_plugin/echo.c:120
+msgid "Echo"
+msgstr ""
+
+#: src/ffaudio/ffaudio-core.c:648
+msgid ""
+"Multi-format audio decoding plugin for Audacious using\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+
+#: src/ffaudio/ffaudio-core.c:695
+msgid "FFmpeg Plugin"
+msgstr ""
+
+#: src/filewriter/filewriter.c:409
+msgid "FileWriter Configuration"
+msgstr ""
+
+#: src/filewriter/filewriter.c:421
+msgid "Output file format:"
+msgstr "Çıktı dosya biçimi:"
+
+#: src/filewriter/filewriter.c:439
+msgid "Configure"
+msgstr "Yapılandır"
+
+#: src/filewriter/filewriter.c:449
+msgid "Save into original directory"
+msgstr "Orjinal dizine kaydet"
+
+#: src/filewriter/filewriter.c:454
+msgid "Save into custom directory"
+msgstr "Özel dizine kaydet"
+
+#: src/filewriter/filewriter.c:464
+msgid "Output file folder:"
+msgstr "Çıktı dosya klasörü:"
+
+#: src/filewriter/filewriter.c:468
+msgid "Pick a folder"
+msgstr "Dizin seçimi"
+
+#: src/filewriter/filewriter.c:481
+msgid "Get filename from:"
+msgstr "Dosya adı kaynağı:"
+
+#: src/filewriter/filewriter.c:484
+msgid "original file tags"
+msgstr "orijinal dosya işaretleri"
+
+#: src/filewriter/filewriter.c:490
+msgid "original filename"
+msgstr "özgün dosya adı"
+
+#: src/filewriter/filewriter.c:497
+msgid "Don't strip file name extension"
+msgstr "Dosya ismi uzantılarını daraltma"
+
+#: src/filewriter/filewriter.c:506
+msgid "Prepend track number to filename"
+msgstr "Parça numarısını dosya adına ekle"
+
+#: src/filewriter/filewriter.c:515
+msgid ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+
+#: src/filewriter/filewriter.c:532
+msgid "FileWriter Plugin"
+msgstr ""
+
+#: src/filewriter/mp3.c:37 src/filewriter/mp3.c:748
+msgid "Auto"
+msgstr "Otomatik"
+
+#: src/filewriter/mp3.c:37
+msgid "Joint Stereo"
+msgstr "Birleşik Stereo"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/mp3.c:688
+msgid "MP3 Configuration"
+msgstr "MP3 Yapılandırması"
+
+#: src/filewriter/mp3.c:712
+msgid "Algorithm Quality:"
+msgstr "Algoritma Kalitesi:"
+
+#: src/filewriter/mp3.c:737
+msgid "Output Samplerate:"
+msgstr "Çıktı Örnekleme Oranı:"
+
+#: src/filewriter/mp3.c:765
+msgid "(Hz)"
+msgstr "(Hz)"
+
+#: src/filewriter/mp3.c:772
+msgid "Bitrate / Compression ratio:"
+msgstr "Bit oranı / Sıkıştırma oranı:"
+
+#: src/filewriter/mp3.c:796
+msgid "Bitrate (kbps):"
+msgstr "Bit oranı (kbps):"
+
+#: src/filewriter/mp3.c:829
+msgid "Compression ratio:"
+msgstr "Sıkıştırma oranı:"
+
+#: src/filewriter/mp3.c:853
+msgid "Audio Mode:"
+msgstr "Ses Kipi:"
+
+#: src/filewriter/mp3.c:878
+msgid "Misc:"
+msgstr "Çeşitli"
+
+#: src/filewriter/mp3.c:889
+msgid "Enforce strict ISO complience"
+msgstr "ISO standartlarına mutlak uyum gözetmeye zorla"
+
+#: src/filewriter/mp3.c:900
+msgid "Error protection"
+msgstr "Hata koruması"
+
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
+msgid "Quality"
+msgstr "Kalite"
+
+#: src/filewriter/mp3.c:921
+msgid "Enable VBR/ABR"
+msgstr "VBR/ABR etkinleştir"
+
+#: src/filewriter/mp3.c:931
+msgid "Type:"
+msgstr "Tür:"
+
+#: src/filewriter/mp3.c:964
+msgid "VBR Options:"
+msgstr "VBR Seçenekleri:"
+
+#: src/filewriter/mp3.c:980
+msgid "Minimum bitrate (kbps):"
+msgstr "En düşük bit oranı (kbps):"
+
+#: src/filewriter/mp3.c:1007
+msgid "Maximum bitrate (kbps):"
+msgstr "En yüksek bit oranı (kbps):"
+
+#: src/filewriter/mp3.c:1030
+msgid "Strictly enforce minimum bitrate"
+msgstr "En düşük bit oranını tam olarak zorla"
+
+#: src/filewriter/mp3.c:1042
+msgid "ABR Options:"
+msgstr "ABR Seçenekleri:"
+
+#: src/filewriter/mp3.c:1052
+msgid "Average bitrate (kbps):"
+msgstr "Ortalama bit oranı (kbps):"
+
+#: src/filewriter/mp3.c:1080
+msgid "VBR quality level:"
+msgstr "VBR kalite seviyesi:"
+
+#: src/filewriter/mp3.c:1099
+msgid "Don't write Xing VBR header"
+msgstr "Xing VBR başlığını yazma"
+
+#: src/filewriter/mp3.c:1112
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/mp3.c:1121
+msgid "Frame parameters:"
+msgstr ""
+
+#: src/filewriter/mp3.c:1133
+msgid "Mark as copyright"
+msgstr "Telif hakkı olarak işaretle"
+
+#: src/filewriter/mp3.c:1144
+msgid "Mark as original"
+msgstr "Orijinal olarak işaretle"
+
+#: src/filewriter/mp3.c:1156
+msgid "ID3 params:"
+msgstr "ID3 parametreleri:"
+
+#: src/filewriter/mp3.c:1167
+msgid "Force addition of version 2 tag"
+msgstr "sürüm 2 etkiketin eklenmesini zorla"
+
+#: src/filewriter/mp3.c:1177
+msgid "Only add v1 tag"
+msgstr "Sadece v1 etiketini ekle"
+
+#: src/filewriter/mp3.c:1184
+msgid "Only add v2 tag"
+msgstr "Sadece v2 etiketini ekle"
+
+#: src/filewriter/mp3.c:1205
+msgid "Tags"
+msgstr "Etiketler:"
+
+#: src/filewriter/vorbis.c:209
+msgid "Vorbis Encoder Configuration"
+msgstr "Vorbis Kodlayıcı Ayarları"
+
+#: src/filewriter/vorbis.c:232
+msgid "Quality level (0 - 10):"
+msgstr "Kalite seviyesi (0 - 10):"
+
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
+msgid "lossless"
+msgstr ""
+
+#: src/flacng/plugin.c:269
+msgid ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+
+#: src/flacng/plugin.c:277
+msgid "FLAC Decoder"
+msgstr ""
+
+#: src/gio/gio.c:300
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+
+#: src/gio/gio.c:322
+msgid "GIO Plugin"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
+msgid ""
+"Gnome Shortcut Plugin\n"
+"Lets you control the player with Gnome's shortcuts.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
+msgid "Gnome Shortcuts"
+msgstr ""
+
+#: src/gtkui/columns.c:32
+msgid "Entry number"
+msgstr "Sayı girin"
+
+#: src/gtkui/columns.c:32
+msgid "Title"
+msgstr "Başlık"
+
+#: src/gtkui/columns.c:33
+msgid "Artist"
+msgstr "Sanatçı"
+
+#: src/gtkui/columns.c:33
+msgid "Year"
+msgstr "Yıl"
+
+#: src/gtkui/columns.c:33
+msgid "Album"
+msgstr "Albüm"
+
+#: src/gtkui/columns.c:33
+msgid "Track"
+msgstr "Parça"
+
+#: src/gtkui/columns.c:33
+msgid "Genre"
+msgstr ""
+
+#: src/gtkui/columns.c:34
+msgid "Queue position"
+msgstr "Liste sırası"
+
+#: src/gtkui/columns.c:34
+msgid "Length"
+msgstr "Uzunluk"
+
+#: src/gtkui/columns.c:34
+msgid "File path"
+msgstr "Dosya yolu"
+
+#: src/gtkui/columns.c:34
+msgid "File name"
+msgstr "Dosya adı"
+
+#: src/gtkui/columns.c:35
+msgid "Custom title"
+msgstr "Özel başlık"
+
+#: src/gtkui/columns.c:35
+msgid "Bitrate"
+msgstr "Bit oranı"
+
+#: src/gtkui/columns.c:277
+msgid "Choose Columns"
+msgstr "Sütunları Seçin"
+
+#: src/gtkui/columns.c:293
+msgid "Available:"
+msgstr "Mevcut:"
+
+#: src/gtkui/columns.c:327
+msgid "Chosen:"
+msgstr "Seçilen:"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Left"
+msgstr "Sola kenetle"
+
+#: src/gtkui/layout.c:119
+msgid "Dock at Right"
+msgstr "Sağa kenetle"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Top"
+msgstr "Üste kenetle"
+
+#: src/gtkui/layout.c:120
+msgid "Dock at Bottom"
+msgstr "Aşağıya kenetle"
+
+#: src/gtkui/layout.c:120
+msgid "Undock"
+msgstr "Çıkar"
+
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
+msgid "Disable"
+msgstr "Devre Dışı"
+
+#: src/gtkui/menus.c:170
+msgid "_Open Files ..."
+msgstr "_Dosya Aç ..."
+
+#: src/gtkui/menus.c:171
+msgid "Open _URL ..."
+msgstr "URL _Aç ..."
+
+#: src/gtkui/menus.c:172
+msgid "_Add Files ..."
+msgstr ""
+
+#: src/gtkui/menus.c:173
+msgid "Add U_RL ..."
+msgstr "U_RL Ekle ..."
+
+#: src/gtkui/menus.c:175
+msgid "_Search Library"
+msgstr ""
+
+#: src/gtkui/menus.c:177
+msgid "A_bout ..."
+msgstr "H_akkında"
+
+#: src/gtkui/menus.c:178
+msgid "_Preferences ..."
+msgstr "_Ayarlar ..."
+
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
+msgid "_Quit"
+msgstr "_Çık"
+
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
+msgid "_Play"
+msgstr "_Oynat"
+
+#: src/gtkui/menus.c:183
+msgid "Paus_e"
+msgstr "_Duraklat"
+
+#: src/gtkui/menus.c:184
+msgid "_Stop"
+msgstr "D_urdur"
+
+#: src/gtkui/menus.c:185
+msgid "Pre_vious"
+msgstr "_Önceki"
+
+#: src/gtkui/menus.c:186
+msgid "_Next"
+msgstr "_Sonraki"
+
+#: src/gtkui/menus.c:188
+msgid "_Repeat"
+msgstr "_Tekrarla"
+
+#: src/gtkui/menus.c:189
+msgid "S_huffle"
+msgstr "_Karıştır"
+
+#: src/gtkui/menus.c:190
+msgid "N_o Playlist Advance"
+msgstr ""
+
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr ""
+
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
+msgid "Song _Info ..."
+msgstr "_Şarkı Bilgisi ..."
+
+#: src/gtkui/menus.c:194
+msgid "Jump to _Time ..."
+msgstr "Süre Atla"
+
+#: src/gtkui/menus.c:195
+msgid "_Jump to Song ..."
+msgstr "Şarkı Atla"
+
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
+msgid "By _Title"
+msgstr "_Başlığa Göre"
+
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "Parça Numarası"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
+msgid "By _Artist"
+msgstr "Sanatçı"
+
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
+
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
+msgid "By Release _Date"
+msgstr "Yayın Tarihi"
+
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
+msgid "By _File Path"
+msgstr ""
+
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
+msgid "By _Custom Title"
+msgstr "Özel Başlık"
+
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
+msgid "R_everse Order"
+msgstr ""
+
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
+msgid "_Random Order"
+msgstr "_Rastgele Sipariş"
+
+#: src/gtkui/menus.c:233
+msgid "_Play This Playlist"
+msgstr ""
+
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
+msgid "_Refresh"
+msgstr "_Yenile"
+
+#: src/gtkui/menus.c:236
+msgid "_Sort"
+msgstr "_Tür"
+
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Seçilenleri Kaldır"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr ""
+
+#: src/gtkui/menus.c:241
+msgid "_New"
+msgstr "_Yeni"
+
+#: src/gtkui/menus.c:242
+msgid "Ren_ame ..."
+msgstr ""
+
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
+msgid "_Close"
+msgstr "_Kapat"
+
+#: src/gtkui/menus.c:245
+msgid "_Import ..."
+msgstr "_Yükle ..."
+
+#: src/gtkui/menus.c:246
+msgid "_Export ..."
+msgstr "_Çıkart ..."
+
+#: src/gtkui/menus.c:248
+msgid "Playlist _Manager ..."
+msgstr ""
+
+#: src/gtkui/menus.c:249
+msgid "_Queue Manager ..."
+msgstr "Sıra Yöneticisi ..."
+
+#: src/gtkui/menus.c:252
+msgid "Volume _Up"
+msgstr "Sesi_Arttır"
+
+#: src/gtkui/menus.c:253
+msgid "Volume _Down"
+msgstr "Sesi_Azalt"
+
+#: src/gtkui/menus.c:255
+msgid "_Equalizer"
+msgstr "_Ekolayzır"
+
+#: src/gtkui/menus.c:257
+msgid "E_ffects"
+msgstr "E_fektler"
+
+#: src/gtkui/menus.c:260
+msgid "_Interface"
+msgstr "_Arayüz"
+
+#: src/gtkui/menus.c:261
+msgid "_Visualizations"
+msgstr ""
+
+#: src/gtkui/menus.c:263
+msgid "Show _Menu Bar"
+msgstr "Menü_Çubuğunu Göster"
+
+#: src/gtkui/menus.c:264
+msgid "Show I_nfo Bar"
+msgstr "Bilgi Çubuğunu Göster"
+
+#: src/gtkui/menus.c:265
+msgid "Show Info Bar Vis_ualization"
+msgstr ""
+
+#: src/gtkui/menus.c:266
+msgid "Show _Status Bar"
+msgstr "Durum Çubuğunu Göster"
+
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
+msgid "Show Close _Buttons"
+msgstr ""
+
+#: src/gtkui/menus.c:271
+msgid "Show Column _Headers"
+msgstr "Kolon _Başlıklarını Göster"
+
+#: src/gtkui/menus.c:272
+msgid "Choose _Columns ..."
+msgstr "Sütunları Seçin"
+
+#: src/gtkui/menus.c:273
+msgid "Scrol_l on Song Change"
+msgstr ""
+
+#: src/gtkui/menus.c:276
+msgid "_File"
+msgstr "_Dosya"
+
+#: src/gtkui/menus.c:277
+msgid "_Playback"
+msgstr "_Oynatma"
+
+#: src/gtkui/menus.c:278
+msgid "P_laylist"
+msgstr "Çalma Listesi"
+
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
+msgid "_Services"
+msgstr "Servisler"
+
+#: src/gtkui/menus.c:280
+msgid "_Output"
+msgstr "Çıktı"
+
+#: src/gtkui/menus.c:281
+msgid "_View"
+msgstr "_Görünüm"
+
+#: src/gtkui/menus.c:285
+msgid "_Queue/Unqueue"
+msgstr ""
+
+#: src/gtkui/menus.c:288
+msgid "Cu_t"
+msgstr "Ke_s"
+
+#: src/gtkui/menus.c:289
+msgid "_Copy"
+msgstr "_Kopyala"
+
+#: src/gtkui/menus.c:290
+msgid "_Paste"
+msgstr "_Yapıştır"
+
+#: src/gtkui/menus.c:291
+msgid "Select _All"
+msgstr "Tümünü_Seç"
+
+#: src/gtkui/menus.c:297
+msgid "_Rename ..."
+msgstr ""
+
+#: src/gtkui/ui_gtk.c:96
+msgid "GTK Interface"
+msgstr "GTK Arayüzü"
+
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.c:204
+msgid "Buffering ..."
+msgstr ""
+
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
+msgid "Error"
+msgstr "Hata"
+
+#: src/gtkui/ui_statusbar.c:108
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/gtkui/ui_statusbar.c:123
+#, c-format
+msgid "%d kbps"
+msgstr "%d kbps"
+
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
+
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
+msgid "Play"
+msgstr "Çal"
+
+#: src/hotkey/gui.c:72
+msgid "Pause/Resume"
+msgstr "Ara ver/Devam et"
+
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
+msgid "Stop"
+msgstr "Dur"
+
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
+msgstr ""
+
+#: src/hotkey/gui.c:77
+msgid "Mute"
+msgstr "Sessiz"
+
+#: src/hotkey/gui.c:78
+msgid "Volume up"
+msgstr ""
+
+#: src/hotkey/gui.c:79
+msgid "Volume down"
+msgstr ""
+
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
+msgstr ""
+
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr ""
+
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr ""
+
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
+msgstr ""
+
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
+msgstr ""
+
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr ""
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
+msgstr ""
+
+#: src/hotkey/gui.c:96
+msgid "(none)"
+msgstr "(hiçbiri)"
+
+#: src/hotkey/gui.c:233
+msgid ""
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+
+#: src/hotkey/gui.c:235
+msgid "Binding mouse buttons"
+msgstr ""
+
+#: src/hotkey/gui.c:385
+msgid "Global Hotkey Plugin Configuration"
+msgstr "Genel Kısayol Eklentisi Ayarları"
+
+#: src/hotkey/gui.c:401
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+
+#: src/hotkey/gui.c:406
+msgid "Hotkeys:"
+msgstr "Kısayollar:"
+
+#: src/hotkey/gui.c:423
+msgid "Action:"
+msgstr ""
+
+#: src/hotkey/gui.c:430
+msgid "Key Binding:"
+msgstr ""
+
+#: src/hotkey/plugin.c:66
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
+msgstr ""
+
+#: src/hotkey/plugin.c:78
+msgid "Global Hotkeys"
+msgstr ""
+
+#: src/jack/jack.c:410
+msgid ""
+"Based on xmms-jack, by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Ported to Audacious by Giacomo Lozito"
+msgstr ""
+
+#: src/jack/jack.c:416
+msgid "JACK Output"
+msgstr ""
+
+#: src/ladspa/plugin.c:493
+#, c-format
+msgid "%s Settings"
+msgstr "%s Ayarlar"
+
+#: src/ladspa/plugin.c:561
+msgid "LADSPA Host Settings"
+msgstr "LADSPA Makine Ayarlari"
+
+#: src/ladspa/plugin.c:570
+msgid "Module paths:"
+msgstr ""
+
+#: src/ladspa/plugin.c:575
+msgid ""
+"Separate multiple paths with a colon.\n"
+"These paths are searched in addition to LADSPA_PATH.\n"
+"After adding new paths, press Enter to scan for new plugins."
+msgstr ""
+
+#: src/ladspa/plugin.c:591
+msgid "Available plugins:"
+msgstr "Kullanılabilir Eklentiler:"
+
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
+msgid "Enable"
+msgstr "İzin ver"
+
+#: src/ladspa/plugin.c:610
+msgid "Enabled plugins:"
+msgstr "Eklentilere İzin ver:"
+
+#: src/ladspa/plugin.c:626
+msgid "Settings"
+msgstr "Ayarlar"
+
+#: src/ladspa/plugin.c:645
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+
+#: src/ladspa/plugin.c:650
+msgid "LADSPA Host"
+msgstr ""
+
+#: src/lirc/lirc.c:76
+#, c-format
+msgid "%s: could not init LIRC support\n"
+msgstr "%s: LIRC desteği başlatılamıyor\n"
+
+#: src/lirc/lirc.c:83
+#, c-format
+msgid ""
+"%s: could not read LIRC config file\n"
+"%s: please read the documentation of LIRC\n"
+"%s: how to create a proper config file\n"
+msgstr ""
+"%s: LIRC config dosyası okunamıyor\n"
+"%s: Lütfen LIRC dökümanlarını okuyunuz\n"
+"%s: uygun bir config dosyası nasıl yaratılır\n"
+
+#: src/lirc/lirc.c:114
+#, c-format
+msgid "%s: trying to reconnect...\n"
+msgstr ""
+
+#: src/lirc/lirc.c:354
+#, c-format
+msgid "%s: unknown command \"%s\"\n"
+msgstr "%s: bilinmeyen komut \"%s\"\n"
+
+#: src/lirc/lirc.c:365
+#, c-format
+msgid "%s: disconnected from LIRC\n"
+msgstr "%s: LIRC bağlantısını kes\n"
+
+#: src/lirc/lirc.c:371
+#, c-format
+msgid "%s: will try reconnect every %d seconds...\n"
+msgstr ""
+
+#: src/lirc/lirc.c:381
+msgid ""
+"A simple plugin to control Audacious using the LIRC remote control daemon\n"
+"\n"
+"Adapted for Audacious by:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Based on the XMMS LIRC plugin by:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"For more information about LIRC, see http://lirc.org."
+msgstr ""
+
+#: src/lirc/lirc.c:392
+msgid "Connection"
+msgstr ""
+
+#: src/lirc/lirc.c:393
+msgid "Reconnect to LIRC server"
+msgstr ""
+
+#: src/lirc/lirc.c:395
+msgid "Wait before reconnecting:"
+msgstr ""
+
+#: src/lirc/lirc.c:405
+msgid "LIRC Plugin"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:117
+msgid "No lyrics available"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
+#, c-format
+msgid "Unable to fetch %s"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
+#, c-format
+msgid "Unable to parse %s"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:260
+msgid "Looking for lyrics ..."
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:271
+msgid "Missing song metadata"
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:284
+msgid "Connecting to lyrics.wikia.com ..."
+msgstr ""
+
+#: src/lyricwiki/lyricwiki.c:411
+msgid "LyricWiki Plugin"
+msgstr ""
+
+#: src/m3u/m3u.c:121
+msgid "M3U Playlists"
+msgstr ""
+
+#: src/metronom/metronom.c:127
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Takt oluşturucu: %d bpm"
+
+#: src/metronom/metronom.c:129
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Takt oluşturucu: %d bpm %d/%d"
+
+#: src/metronom/metronom.c:246
+msgid ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"To use it, add a URL: tact://beats*num/den\n"
+"e.g. tact://77 to play 77 beats per minute\n"
+"or tact://60*3/4 to play 60 bpm in 3/4 tacts"
+msgstr ""
+
+#: src/metronom/metronom.c:255
+msgid "Tact Generator"
+msgstr ""
+
+#: src/mixer/mixer.c:169
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+
+#: src/mixer/mixer.c:173
+msgid "Channel Mixer"
+msgstr ""
+
+#: src/mixer/mixer.c:174
+msgid "Output channels:"
+msgstr "Çıkış kanalları:"
+
+#: src/mixer/mixer.c:184
+msgid "Channel Mixer"
+msgstr ""
+
+#: src/mms/mms.c:224
+msgid "MMS Plugin"
+msgstr ""
+
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bit"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bit"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "En Yakın (en hızlı)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Lineer (hızlı)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
+msgid "ModPlug (Module Player)"
+msgstr ""
+
+#: src/mpg123/mpg123.c:213
+msgid "Surround"
+msgstr "Surround"
+
+#: src/mpg123/mpg123.c:569
+msgid "MPG123 Plugin"
+msgstr ""
+
+#: src/mpris2/plugin.c:403
+msgid "MPRIS 2 Server"
+msgstr ""
+
+#: src/neon/neon.c:1228
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr ""
+
+#: src/notify/event.c:64
+msgid "Stopped"
+msgstr "Durdu"
+
+#: src/notify/event.c:64
+msgid "Audacious is not playing."
+msgstr "Audacious oynatmıyor."
+
+#: src/notify/notify.c:33
+msgid ""
+"Desktop Notifications Plugin for Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr ""
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
+msgid "Desktop Notifications"
+msgstr ""
+
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Duraklat"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Sonraki Parça"
+
+#: src/oss4/plugin.c:36
+msgid "1. Default device"
+msgstr "1. Varsayılan cihaz"
+
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
+msgid "Audio device:"
+msgstr "Ses aygıtı:"
+
+#: src/oss4/plugin.c:77
+msgid "Use alternate device:"
+msgstr "Farklı aygıt kullan:"
+
+#: src/oss4/plugin.c:81
+msgid "Save volume between sessions."
+msgstr ""
+
+#: src/oss4/plugin.c:83
+msgid "Enable format conversions made by the OSS software."
+msgstr ""
+
+#: src/oss4/plugin.c:85
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr ""
+
+#: src/oss4/plugin.c:108
+msgid ""
+"OSS4 Output Plugin for Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+
+#: src/oss4/plugin.c:115
+msgid "OSS4 Output"
+msgstr ""
+
+#: src/pls/pls.c:113
+msgid "PLS Playlists"
+msgstr ""
+
+#: src/psf/plugin.c:264
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr ""
+
+#: src/pulse_audio/pulse_audio.c:644
+msgid ""
+"Audacious PulseAudio Output Plugin\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+msgstr ""
+
+#: src/pulse_audio/pulse_audio.c:662
+msgid "PulseAudio Output"
+msgstr ""
+
+#: src/resample/resample.c:161
+msgid ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/resample/resample.c:165
+msgid "Skip/repeat samples"
+msgstr ""
+
+#: src/resample/resample.c:166
+msgid "Linear interpolation"
+msgstr "Lineer interpolasyon"
+
+#: src/resample/resample.c:167
+msgid "Fast sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.c:168
+msgid "Medium sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.c:169
+msgid "Best sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.c:172
+msgid "Conversion"
+msgstr "Çeviri"
+
+#: src/resample/resample.c:173
+msgid "Method:"
+msgstr "Metot:"
+
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
+msgid "Rate:"
+msgstr "Derece:"
+
+#: src/resample/resample.c:179
+msgid "Rate Mappings"
+msgstr ""
+
+#: src/resample/resample.c:180
+msgid "Use rate mappings"
+msgstr ""
+
+#: src/resample/resample.c:182
+msgid "8 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:185
+msgid "16 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:188
+msgid "22.05 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:191
+msgid "44.1 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:194
+msgid "48 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:197
+msgid "96 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:200
+msgid "192 kHz:"
+msgstr ""
+
+#: src/resample/resample.c:210
+msgid "Sample Rate Converter"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr ""
+
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr ""
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+
+#: src/sdlout/plugin.c:26
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+
+#: src/sdlout/plugin.c:31
+msgid "SDL Output"
+msgstr ""
+
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
+msgid "Library"
+msgstr ""
+
+#: src/search-tool/search-tool.c:219
+msgid "Unknown Artist"
+msgstr ""
+
+#: src/search-tool/search-tool.c:221
+msgid "Unknown Album"
+msgstr ""
+
+#: src/search-tool/search-tool.c:632
+#, c-format
+msgid ""
+"%s\n"
+" on %s by %s"
+msgstr ""
+
+#: src/search-tool/search-tool.c:638
+#, c-format
+msgid "%d album"
+msgid_plural "%d albums"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/search-tool/search-tool.c:640
+#, c-format
+msgid ""
+"%s\n"
+" %s, %d song"
+msgid_plural ""
+"%s\n"
+" %s, %d songs"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/search-tool/search-tool.c:646
+#, c-format
+msgid ""
+"%s\n"
+" %d song by %s"
+msgid_plural ""
+"%s\n"
+" %d songs by %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: src/search-tool/search-tool.c:687
+msgid "_Create Playlist"
+msgstr ""
+
+#: src/search-tool/search-tool.c:694
+msgid "_Add to Playlist"
+msgstr ""
+
+#: src/search-tool/search-tool.c:734
+msgid "Search library"
+msgstr ""
+
+#: src/search-tool/search-tool.c:739
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+
+#: src/search-tool/search-tool.c:747
+msgid "Please wait ..."
+msgstr ""
+
+#: src/search-tool/search-tool.c:769
+msgid "Choose Folder"
+msgstr ""
+
+#: src/search-tool/search-tool.c:808
+msgid "Search Tool"
+msgstr ""
+
+#: src/skins/plugin.c:49
+msgid "Winamp Classic Interface"
+msgstr ""
+
+#: src/skins/skins_cfg.c:204
+msgid "_Player:"
+msgstr "_Oynatıcı"
+
+#: src/skins/skins_cfg.c:205
+msgid "Select main player window font:"
+msgstr "Arayüz yazı tipini seçiniz:"
+
+#: src/skins/skins_cfg.c:207
+msgid "_Playlist:"
+msgstr ""
+
+#: src/skins/skins_cfg.c:208
+msgid "Select playlist font:"
+msgstr ""
+
+#: src/skins/skins_cfg.c:212
+msgid "_Fonts"
+msgstr "_Yazı Tipi"
+
+#: src/skins/skins_cfg.c:215
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr ""
+
+#: src/skins/skins_cfg.c:217
+msgid "Scroll song title in both directions"
+msgstr ""
+
+#: src/skins/skins_cfg.c:295
+msgid "_Skin"
+msgstr ""
+
+#: src/skins/skins_cfg.c:342
+msgid "Interface Preferences"
+msgstr "Arayüz Ayarları"
+
+#: src/skins/ui_equalizer.c:328
+msgid "Preamp"
+msgstr "Preamp"
+
+#: src/skins/ui_equalizer.c:332
+msgid "31 Hz"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:333
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "125 Hz"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:333
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/ui_equalizer.c:333
+msgid "500 Hz"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:333
+msgid "1 kHz"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:334
+msgid "2 kHz"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:334
+msgid "4 kHz"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:334
+msgid "8 kHz"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:334
+msgid "16 kHz"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:375
+msgid "Audacious Equalizer"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:890
+msgid "Presets"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
+msgid "Load preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:988
+msgid "Load auto-preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1018 src/skins/ui_equalizer.c:1036
+#: src/skins/ui_equalizer.c:1052
+msgid "Load equalizer preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
+msgid "Save preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1087
+msgid "Save auto-preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1118 src/skins/ui_equalizer.c:1154
+msgid "Save equalizer preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
+msgid "Delete preset"
+msgstr ""
+
+#: src/skins/ui_equalizer.c:1190
+msgid "Delete auto-preset"
+msgstr ""
+
+#: src/skins/ui_main.c:414
+msgid "kbps"
+msgstr "kbps"
+
+#: src/skins/ui_main.c:422
+msgid "kHz"
+msgstr "kHz"
+
+#: src/skins/ui_main.c:770
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Zıpla %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/ui_main.c:791
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Ses: %d%%"
+
+#: src/skins/ui_main.c:814
+#, c-format
+msgid "Balance: %d%% left"
+msgstr ""
+
+#: src/skins/ui_main.c:816
+msgid "Balance: center"
+msgstr ""
+
+#: src/skins/ui_main.c:818
+#, c-format
+msgid "Balance: %d%% right"
+msgstr ""
+
+#: src/skins/ui_main.c:942
+msgid "Options Menu"
+msgstr "Seçenekler Menüsü"
+
+#: src/skins/ui_main.c:946
+msgid "Disable 'Always On Top'"
+msgstr "Devre dışı bırak 'Her Zaman Görünür' "
+
+#: src/skins/ui_main.c:948
+msgid "Enable 'Always On Top'"
+msgstr "Etkinleştir 'Her Zaman Görünür' "
+
+#: src/skins/ui_main.c:951
+msgid "File Info Box"
+msgstr ""
+
+#: src/skins/ui_main.c:956
+msgid "Visualization Menu"
+msgstr ""
+
+#: src/skins/ui_main.c:1591
+msgid "Single mode."
+msgstr ""
+
+#: src/skins/ui_main.c:1593
+msgid "Playlist mode."
+msgstr ""
+
+#: src/skins/ui_main.c:1615
+msgid "Stopping after song."
+msgstr "Şarkıdan sonra duruyor."
+
+#: src/skins/ui_main.c:1617
+msgid "Not stopping after song."
+msgstr "Şarkıdan sonra durmuyor."
+
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
+msgid "Autoscroll Song Name"
+msgstr ""
+
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
+msgid "Stop after Current Song"
+msgstr "Bu Şarkıdan Sonra Durdur"
+
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
+msgid "Peaks"
+msgstr ""
+
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
+msgid "Repeat"
+msgstr "Tekrar et"
+
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
+msgid "Shuffle"
+msgstr "Karıştır"
+
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
+msgid "No Playlist Advance"
+msgstr ""
+
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
+msgid "Show Player"
+msgstr "Oynatıcıyı Göster"
+
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
+msgid "Show Playlist Editor"
+msgstr ""
+
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
+msgid "Show Equalizer"
+msgstr ""
+
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
+msgid "Always on Top"
+msgstr "Her Zaman Üstte"
+
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
+msgid "Put on All Workspaces"
+msgstr ""
+
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
+msgid "Roll up Player"
+msgstr ""
+
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
+msgid "Roll up Playlist Editor"
+msgstr ""
+
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
+msgid "Roll up Equalizer"
+msgstr ""
+
+#: src/skins/ui_manager.c:114
+msgid "Analyzer"
+msgstr "Analiz Et"
+
+#: src/skins/ui_manager.c:115
+msgid "Scope"
+msgstr ""
+
+#: src/skins/ui_manager.c:116
+msgid "Voiceprint"
+msgstr "Ses İzi"
+
+#: src/skins/ui_manager.c:117
+msgid "Off"
+msgstr "Kapalı"
+
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
+msgid "Normal"
+msgstr "Normal"
+
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
+msgid "Fire"
+msgstr "Ateş"
+
+#: src/skins/ui_manager.c:123
+msgid "Vertical Lines"
+msgstr "Dikey Çizgiler"
+
+#: src/skins/ui_manager.c:127
+msgid "Lines"
+msgstr "Çizgiler"
+
+#: src/skins/ui_manager.c:128
+msgid "Bars"
+msgstr "Çubuk"
+
+#: src/skins/ui_manager.c:132
+msgid "Dot Scope"
+msgstr ""
+
+#: src/skins/ui_manager.c:133
+msgid "Line Scope"
+msgstr ""
+
+#: src/skins/ui_manager.c:134
+msgid "Solid Scope"
+msgstr ""
+
+#: src/skins/ui_manager.c:140
+msgid "Ice"
+msgstr ""
+
+#: src/skins/ui_manager.c:145
+msgid "Smooth"
+msgstr ""
+
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
+msgid "Slowest"
+msgstr ""
+
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+msgid "Slow"
+msgstr "Yavaş"
+
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
+msgid "Medium"
+msgstr "Orta"
+
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+msgid "Fast"
+msgstr "Hızlı"
+
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+msgid "Fastest"
+msgstr ""
+
+#: src/skins/ui_manager.c:165
+msgid "Time Elapsed"
+msgstr ""
+
+#: src/skins/ui_manager.c:166
+msgid "Time Remaining"
+msgstr ""
+
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
+msgid "Previous"
+msgstr "Önceki Parça"
+
+#: src/skins/ui_manager.c:195
+msgid "Visualization"
+msgstr "Görselleştirme"
+
+#: src/skins/ui_manager.c:196
+msgid "Visualization Mode"
+msgstr "Görselleştirme Modu"
+
+#: src/skins/ui_manager.c:197
+msgid "Analyzer Mode"
+msgstr ""
+
+#: src/skins/ui_manager.c:198
+msgid "Scope Mode"
+msgstr ""
+
+#: src/skins/ui_manager.c:199
+msgid "Voiceprint Mode"
+msgstr "Ses İzi Modu"
+
+#: src/skins/ui_manager.c:200
+msgid "WindowShade VU Mode"
+msgstr ""
+
+#: src/skins/ui_manager.c:201
+msgid "Analyzer Falloff"
+msgstr ""
+
+#: src/skins/ui_manager.c:202
+msgid "Peaks Falloff"
+msgstr ""
+
+#: src/skins/ui_manager.c:207
+msgid "Playlist"
+msgstr "Parça Listesi"
+
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
+msgid "Play Playlist"
+msgstr ""
+
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
+msgid "New Playlist"
+msgstr "Yeni Çalma Listesi"
+
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
+msgid "Select Next Playlist"
+msgstr "Sonraki Oynatma Listesini Seç"
+
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
+msgid "Select Previous Playlist"
+msgstr "Önceki Parça Listesi"
+
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
+msgid "Delete Playlist"
+msgstr "Çalma Listesini Sil"
+
+#: src/skins/ui_manager.c:224
+msgid "Import Playlist"
+msgstr "Çalma Listesini İçe Aktar"
+
+#: src/skins/ui_manager.c:225
+msgid "Loads a playlist file into the selected playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:228
+msgid "Export Playlist"
+msgstr "Çalma Listesini Dışa Aktar"
+
+#: src/skins/ui_manager.c:229
+msgid "Saves the selected playlist."
+msgstr "Seçili Çalma Listesini kaydet"
+
+#: src/skins/ui_manager.c:231
+msgid "Refresh List"
+msgstr "Listeyi Yenile"
+
+#: src/skins/ui_manager.c:232
+msgid "Refreshes metadata associated with a playlist entry."
+msgstr ""
+
+#: src/skins/ui_manager.c:235
+msgid "Playlist Manager"
+msgstr "Parça Listesi Yöneticisi"
+
+#: src/skins/ui_manager.c:238
+msgid "Queue Manager"
+msgstr "Kuyruk Yöneticisi"
+
+#: src/skins/ui_manager.c:243
+msgid "View"
+msgstr "Görünüm"
+
+#: src/skins/ui_manager.c:244
+msgid "Interface"
+msgstr "Arayüz"
+
+#: src/skins/ui_manager.c:245
+msgid "Interface Preferences ..."
+msgstr "Arayüz Seçenekleri"
+
+#: src/skins/ui_manager.c:250
+msgid "Add Internet Address..."
+msgstr "İnternet Adresi Ekle..."
+
+#: src/skins/ui_manager.c:251
+msgid "Adds a remote track to the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:254
+msgid "Add Files..."
+msgstr "Dosya Ekle"
+
+#: src/skins/ui_manager.c:255
+msgid "Adds files to the playlist."
+msgstr "Çalma listesine dosya ekle"
+
+#: src/skins/ui_manager.c:260
+msgid "Search and Select"
+msgstr "Ara ve Seç"
+
+#: src/skins/ui_manager.c:261
+msgid ""
+"Searches the playlist and selects playlist entries based on specific "
+"criteria."
+msgstr ""
+
+#: src/skins/ui_manager.c:264
+msgid "Invert Selection"
+msgstr ""
+
+#: src/skins/ui_manager.c:265
+msgid "Inverts the selected and unselected entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:268
+msgid "Select All"
+msgstr "Tümünü_Seç"
+
+#: src/skins/ui_manager.c:269
+msgid "Selects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:272
+msgid "Select None"
+msgstr "Hiçbiri Seçilmedi"
+
+#: src/skins/ui_manager.c:273
+msgid "Deselects all of the playlist entries."
+msgstr ""
+
+#: src/skins/ui_manager.c:278
+msgid "Remove All"
+msgstr "Tümünü Sil"
+
+#: src/skins/ui_manager.c:279
+msgid "Removes all entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:282
+msgid "Clear Queue"
+msgstr ""
+
+#: src/skins/ui_manager.c:283
+msgid "Clears the queue associated with this playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:286
+msgid "Remove Unavailable Files"
+msgstr "Bulunamayan Dosyaları Sil"
+
+#: src/skins/ui_manager.c:287
+msgid "Removes unavailable files from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:290
+msgid "Remove Duplicates"
+msgstr "Birden Fazla Olanı Sil"
+
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
+msgid "By Title"
+msgstr ""
+
+#: src/skins/ui_manager.c:293
+msgid "Removes duplicate entries from the playlist by title."
+msgstr "Aynı başlıklı çalma listelerini kaldır."
+
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
+msgid "By Filename"
+msgstr ""
+
+#: src/skins/ui_manager.c:297
+msgid "Removes duplicate entries from the playlist by filename."
+msgstr ""
+
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
+msgid "By Path + Filename"
+msgstr ""
+
+#: src/skins/ui_manager.c:301
+msgid "Removes duplicate entries from the playlist by their full path."
+msgstr ""
+
+#: src/skins/ui_manager.c:304
+msgid "Remove Unselected"
+msgstr ""
+
+#: src/skins/ui_manager.c:305
+msgid "Remove unselected entries from the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:308
+msgid "Remove Selected"
+msgstr "Seçilenleri Kaldır"
+
+#: src/skins/ui_manager.c:309
+msgid "Remove selected entries from the playlist."
+msgstr "Seçilen parçaları çalma listesinden kaldır."
+
+#: src/skins/ui_manager.c:314
+msgid "Randomize List"
+msgstr "Rastgele Listele"
+
+#: src/skins/ui_manager.c:315
+msgid "Randomizes the playlist."
+msgstr "Parça listesini karıştır."
+
+#: src/skins/ui_manager.c:318
+msgid "Reverse List"
+msgstr ""
+
+#: src/skins/ui_manager.c:319
+msgid "Reverses the playlist."
+msgstr ""
+
+#: src/skins/ui_manager.c:322
+msgid "Sort List"
+msgstr "Kısa Liste"
+
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
+msgid "Sorts the list by title."
+msgstr ""
+
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
+msgid "By Album"
+msgstr ""
+
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+msgid "Sorts the list by album."
+msgstr ""
+
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
+msgid "By Artist"
+msgstr ""
+
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+msgid "Sorts the list by artist."
+msgstr ""
+
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
+msgid "Sorts the list by filename."
+msgstr ""
+
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
+msgid "Sorts the list by full pathname."
+msgstr ""
+
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
+msgid "By Date"
+msgstr "Tarih"
+
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+msgid "Sorts the list by modification time."
+msgstr ""
+
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
+msgid "By Track Number"
+msgstr ""
+
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+msgid "Sorts the list by track number."
+msgstr ""
+
+#: src/skins/ui_manager.c:352
+msgid "Sort Selected"
+msgstr ""
+
+#: src/skins/ui_manager.c:388
+msgid "File"
+msgstr "Dosya"
+
+#: src/skins/ui_manager.c:391
+msgid "Plugin Services"
+msgstr "Eklenti Servisi"
+
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
+msgid "View Track Details"
+msgstr "Parça Detayı"
+
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+msgid "View track details"
+msgstr "Parça detayı"
+
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
+msgid "About Audacious"
+msgstr "Audacious Hakkında"
+
+#: src/skins/ui_manager.c:402
+msgid "Play File"
+msgstr "Dosyayı çal"
+
+#: src/skins/ui_manager.c:403
+msgid "Load and play a file"
+msgstr ""
+
+#: src/skins/ui_manager.c:405
+msgid "Play Location"
+msgstr ""
+
+#: src/skins/ui_manager.c:406
+msgid "Play media from the selected location"
+msgstr "Seçilen yerdekileri oynat"
+
+#: src/skins/ui_manager.c:408
+msgid "Plugin services"
+msgstr "Eklenti servisi"
+
+#: src/skins/ui_manager.c:410
+msgid "Preferences"
+msgstr "Tercihler"
+
+#: src/skins/ui_manager.c:411
+msgid "Open preferences window"
+msgstr "Tercih penceresini aç"
+
+#: src/skins/ui_manager.c:414
+msgid "Quit Audacious"
+msgstr "Audacious'dan çıkış"
+
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
+msgid "Set A-B"
+msgstr "A-B'yi ayarla"
+
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
+msgid "Clear A-B"
+msgstr "A-B'yi temizle"
+
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Doyaya Atla"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
+msgid "Jump to Time"
+msgstr "Zamana atla"
+
+#: src/skins/ui_manager.c:428
+msgid "Queue Toggle"
+msgstr ""
+
+#: src/skins/ui_manager.c:429
+msgid "Enables/disables the entry in the playlist's queue."
+msgstr ""
+
+#: src/skins/ui_manager.c:432
+msgid "Copy"
+msgstr "Kopyala"
+
+#: src/skins/ui_manager.c:435
+msgid "Cut"
+msgstr "Kes"
+
+#: src/skins/ui_manager.c:438
+msgid "Paste"
+msgstr "Yapıştır"
+
+#: src/skins/ui_manager.c:445
+msgid "Load"
+msgstr "Yükle"
+
+#: src/skins/ui_manager.c:446
+msgid "Import"
+msgstr "İçe aktar"
+
+#: src/skins/ui_manager.c:447
+msgid "Save"
+msgstr "Kaydet"
+
+#: src/skins/ui_manager.c:448
+msgid "Delete"
+msgstr "Sil"
+
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
+msgid "Preset"
+msgstr ""
+
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
+msgid "Auto-load preset"
+msgstr ""
+
+#: src/skins/ui_manager.c:454
+msgid "Load auto-load preset"
+msgstr ""
+
+#: src/skins/ui_manager.c:457
+msgid "Load default preset into equalizer"
+msgstr "Varsayılan ekolayzer ayarını yükle"
+
+#: src/skins/ui_manager.c:459
+msgid "Zero"
+msgstr "Sıfır"
+
+#: src/skins/ui_manager.c:460
+msgid "Set equalizer preset levels to zero"
+msgstr ""
+
+#: src/skins/ui_manager.c:462
+msgid "From file"
+msgstr "Dosyadan"
+
+#: src/skins/ui_manager.c:463
+msgid "Load preset from file"
+msgstr ""
+
+#: src/skins/ui_manager.c:465
+msgid "From WinAMP EQF file"
+msgstr "WinAMP EQF Dosyası"
+
+#: src/skins/ui_manager.c:466
+msgid "Load preset from WinAMP EQF file"
+msgstr "WinAMP EQF dosyasını yükle"
+
+#: src/skins/ui_manager.c:468
+msgid "WinAMP Presets"
+msgstr "WinAMP Presets"
+
+#: src/skins/ui_manager.c:469
+msgid "Import WinAMP presets"
+msgstr ""
+
+#: src/skins/ui_manager.c:475
+msgid "Save auto-load preset"
+msgstr ""
+
+#: src/skins/ui_manager.c:478
+msgid "Save default preset"
+msgstr "Varsayılan preseti kaydet"
+
+#: src/skins/ui_manager.c:480
+msgid "To file"
+msgstr "Dosyaya"
+
+#: src/skins/ui_manager.c:481
+msgid "Save preset to file"
+msgstr "Preset dosyasını kaydet"
+
+#: src/skins/ui_manager.c:483
+msgid "To WinAMP EQF file"
+msgstr ""
+
+#: src/skins/ui_manager.c:484
+msgid "Save preset to WinAMP EQF file"
+msgstr ""
+
+#: src/skins/ui_manager.c:490
+msgid "Delete auto-load preset"
+msgstr ""
+
+#: src/skins/ui_playlist.c:244
+msgid "Search entries in active playlist"
+msgstr ""
+
+#: src/skins/ui_playlist.c:251
+msgid ""
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
+"expressions work, simply insert a literal portion of what you're searching "
+"for."
+msgstr ""
+
+#: src/skins/ui_playlist.c:259
+msgid "Title: "
+msgstr "Başlık: "
+
+#: src/skins/ui_playlist.c:267
+msgid "Album: "
+msgstr "Albüm: "
+
+#: src/skins/ui_playlist.c:275
+msgid "Artist: "
+msgstr "Artist: "
+
+#: src/skins/ui_playlist.c:283
+msgid "Filename: "
+msgstr "DosyaAdı:"
+
+#: src/skins/ui_playlist.c:292
+msgid "Clear previous selection before searching"
+msgstr "Önceki aramaları temizle"
+
+#: src/skins/ui_playlist.c:295
+msgid "Automatically toggle queue for matching entries"
+msgstr ""
+
+#: src/skins/ui_playlist.c:298
+msgid "Create a new playlist with matching entries"
+msgstr ""
+
+#: src/skins/ui_playlist.c:738
+msgid "Audacious Playlist Editor"
+msgstr ""
+
+#: src/skins/ui_playlist.c:772
+#, c-format
+msgid "%s (%d of %d)"
+msgstr ""
+
+#: src/skins/ui_skinselector.c:162
+msgid "Archived Winamp 2.x skin"
+msgstr ""
+
+#: src/skins/ui_skinselector.c:167
+msgid "Unarchived Winamp 2.x skin"
+msgstr ""
+
+#: src/skins/util.c:773
+#, c-format
+msgid "Could not create directory (%s): %s\n"
+msgstr ""
+
+#: src/sndfile/plugin.c:416
+msgid ""
+"Based on the xmms_sndfile plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+
+#: src/sndfile/plugin.c:435
+msgid "Sndfile Plugin"
+msgstr ""
+
+#: src/sndio/sndio.c:172
+msgid "About Sndio Output Plugin"
+msgstr ""
+
+#: src/sndio/sndio.c:173
+msgid ""
+"Sndio Output Plugin\n"
+"\n"
+"Written by Thomas Pfaff <tpfaff@tp76.info>\n"
+msgstr ""
+
+#: src/sndio/sndio.c:248
+msgid "Unsupported format"
+msgstr ""
+
+#: src/sndio/sndio.c:249
+msgid ""
+"A format not supported by the audio device was requested.\n"
+"\n"
+"Please try again with the sndiod(1) server running."
+msgstr ""
+
+#: src/sndio/sndio.c:384
+msgid "sndio device"
+msgstr ""
+
+#: src/sndio/sndio.c:400
+msgid "(empty means default)"
+msgstr ""
+
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Tamam"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "İptal"
+
+#: src/song_change/song_change.c:54
+msgid "Song Change"
+msgstr "Şarkıyı değiştir"
+
+#: src/song_change/song_change.c:436
+msgid "Command to run when Audacious starts a new song."
+msgstr "Audacious yeni bir şarkı başlattığında çalışacak komut."
+
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
+msgid "Command:"
+msgstr "Komut:"
+
+#: src/song_change/song_change.c:442
+msgid "Command to run toward the end of a song."
+msgstr "Bir şarkının sonuna doğru çalışacak komut."
+
+#: src/song_change/song_change.c:448
+msgid "Command to run when Audacious reaches the end of the playlist."
+msgstr "Audacious parça listesinin sonuna ulaştığında çalıştırılacak komut."
+
+#: src/song_change/song_change.c:454
+msgid ""
+"Command to run when title changes for a song (i.e. network streams titles)."
+msgstr ""
+"Bir şarkı için başlık değiştiğinde çalıştırılacak komut (örneğin ağ yayını "
+"başlıkları)."
+
+#: src/song_change/song_change.c:460
+msgid ""
+"You can use the following format strings which\n"
+"will be substituted before calling the command\n"
+"(not all are useful for the end-of-playlist command):\n"
+"\n"
+"%F: Frequency (in hertz)\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%l: Length (in milliseconds)\n"
+"%n or %s: Song name\n"
+"%r: Rate (in bits per second)\n"
+"%t: Playlist position (%02d)\n"
+"%p: Currently playing (1 or 0)\n"
+"%a: Artist\n"
+"%b: Album\n"
+"%T: Track title"
+msgstr ""
+
+#: src/song_change/song_change.c:487
+msgid ""
+"Parameters passed to the shell should be encapsulated in "
+"quotes. Doing otherwise is a security risk."
+msgstr ""
+"Kabuğa yollanan parametreler tırnak içinde belirtilmeli. "
+"Aksi takdirde güvenlik sorunu yaratır. "
+
+#: src/song_change/song_change.c:498
+msgid "Commands"
+msgstr "Komutlar"
+
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
+msgid "Speed and Pitch"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:226
+msgid "Speed:"
+msgstr "Hız:"
+
+#: src/speed-pitch/speed-pitch.c:229
+msgid "Pitch:"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:264
+msgid "Speed and Pitch"
+msgstr ""
+
+#: src/statusicon/statusicon.c:390
+msgid ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+
+#: src/statusicon/statusicon.c:397
+msgid "Mouse Scroll Action"
+msgstr "Mouse kaydırma hareketi"
+
+#: src/statusicon/statusicon.c:398
+msgid "Change volume"
+msgstr "Ses seviyesini değiştir"
+
+#: src/statusicon/statusicon.c:401
+msgid "Change playing song"
+msgstr "Çalan şarkıyı değiştir"
+
+#: src/statusicon/statusicon.c:404
+msgid "Other Settings"
+msgstr "Diğer Ayarlar"
+
+#: src/statusicon/statusicon.c:405
+msgid "Disable the popup window"
+msgstr "Açılır pencereleri engelle"
+
+#: src/statusicon/statusicon.c:407
+msgid "Close to the system tray"
+msgstr "Sistem tepsisinden çıkar"
+
+#: src/statusicon/statusicon.c:409
+msgid "Advance in playlist when scrolling upward"
+msgstr ""
+
+#: src/statusicon/statusicon.c:418
+msgid "Status Icon"
+msgstr "Durum iconu"
+
+#: src/stereo_plugin/stereo.c:17
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+
+#: src/stereo_plugin/stereo.c:25
+msgid "Extra Stereo"
+msgstr "Extra Stereo"
+
+#: src/stereo_plugin/stereo.c:36
+msgid "Extra Stereo"
+msgstr "Extra Stereo"
+
+#: src/tonegen/tonegen.c:84
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.c:84
+msgid "Tone Generator: "
+msgstr "Ton Oluşturucu: "
+
+#: src/tonegen/tonegen.c:197
+msgid ""
+"Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
+"e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
+msgstr ""
+
+#: src/tonegen/tonegen.c:206
+msgid "Tone Generator"
+msgstr ""
+
+#: src/unix-io/unix-io.c:243
+msgid ""
+"File I/O Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
+msgstr ""
+
+#: src/unix-io/unix-io.c:266
+msgid "File I/O Plugin"
+msgstr "I/O Dosya Eklentisi"
+
+#: src/voice_removal/voice_removal.c:58
+msgid "Voice Removal"
+msgstr "Ses yok etme"
+
+#: src/vorbis/vorbis.c:562
+msgid ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Based on the Xiph.org Foundation's Ogg Vorbis Plugin:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Original code by:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contributions from:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+
+#: src/vorbis/vorbis.c:582
+msgid "Ogg Vorbis Decoder"
+msgstr "Ogg Vorbis Çözücü"
+
+#: src/vtx/vtx.c:242
+msgid ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
+msgstr ""
+
+#: src/vtx/vtx.c:248
+msgid "VTX Decoder"
+msgstr "VTC Çözücü"
+
+#: src/wavpack/wavpack.c:282
+msgid "lossy (hybrid)"
+msgstr ""
+
+#: src/wavpack/wavpack.c:284
+msgid "lossy"
+msgstr ""
+
+#: src/wavpack/wavpack.c:334
+msgid ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
+msgstr ""
+
+#: src/wavpack/wavpack.c:341
+msgid "WavPack Decoder"
+msgstr "Wav Çözücü"
+
+#: src/xsf/plugin.c:274
+msgid "2SF Decoder"
+msgstr "2SF Çözücü"
+
+#: src/xspf/xspf.c:440
+msgid "XML Shareable Playlists (XSPF)"
+msgstr "XML Paylaşılabilir müzik listesi (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - dosya seç"

audacious-plugins-3.3.4.tar.bz2/po/uk.po -> audacious-plugins-3.4.2.tar.bz2/po/uk.po Changed

@@ -1,599 +1,674 @@
 # Ukrainian translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# fedenko <fedenko@ukr.net>, 2011.
-# Kostyantyn Fedenko <fedenko@ukr.net>, 2011.
-# <kvantarium@gmail.com>, 2012.
-# NaiLi Rootaerc <theism@mail.ru>, 2012.
-# Rax Garfield <admin@dvizho.ks.ua>, 2012.
-# Rax Garfield (http://biokillaz.com/), 2012.
-# Rax Garfield (http://biokillaz.com)/, 2012.
-# Rax Garfield <rax@rax.pp.ua>, 2012.
-# Yuri Chornoivan <yurchor@ukr.net>, 2012.
+# Kostyantyn Fedenko <fedenko@ukr.net>, 2011
+# Kostyantyn Fedenko <fedenko@ukr.net>, 2011
+# StreamThreaedr <kvantarium@gmail.com>, 2012
+# NaiLi (aka jamesjames) Rootaerc <theism@mail.ru>, 2012
+# NaiLi (aka jamesjames) Rootaerc <theism@mail.ru>, 2012
+# Rax Garfield <admin@dvizho.ks.ua>, 2012
+# Rax Garfield (http://biokillaz.com/), 2012
+# Rax Garfield (http://biokillaz.com)/, 2012
+# Rax Garfield <admin@dvizho.ks.ua>, 2012
+# rustam <rustam.tsurik@gmail.com>, 2013
+# rustam <rustam.tsurik@gmail.com>, 2013
+# StreamThreaedr <kvantarium@gmail.com>, 2012
+# Yuri Chornoivan <yurchor@ukr.net>, 2012
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-28 18:44+0000\n"
-"Last-Translator: Rax Garfield <rax@rax.pp.ua>\n"
-"Language-Team: Ukrainian\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-07-11 13:11+0000\n"
+"Last-Translator: rustam <rustam.tsurik@gmail.com>\n"
+"Language-Team: Ukrainian (http://www.transifex.com/projects/p/audacious/"
+"language/uk/)\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: uk\n"
-"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"
+"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"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "моно"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "стерео"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "об'ємний"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr "Декодер AAC"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr "послідовний"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (програвач AdLib)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
-msgstr "Відтворення в заданий час.\n\nАвтори плаґіну-оригіналу: Adam Feakin, Daniel Stodden."
+msgstr ""
+"Відтворення в заданий час.\n"
+"\n"
+"Автори плаґіну-оригіналу: Adam Feakin, Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "Будильник"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
-msgstr "Вставай, Україно! Вставай, рідна ненько! Москаль вже годину не спить!"
-
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "Гаразд"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "Налаштування будильника"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "Час"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "год"
-
-#: src/alarm/interface.c:332
-msgid "h"
-msgstr " "
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+"Час⏎\n"
+"Починати о:⏎\n"
+"Час, коли спрацьовує будильник.⏎\n"
+"⏎\n"
+"Закінчити через:⏎\n"
+"Зупинити сигнал через цей проміжок часу.⏎\n"
+"(якщо діалог будильника не було закрито)⏎\n"
+"⏎\n"
+"⏎\n"
+"Дні⏎\n"
+"День:⏎\n"
+"Виберіть дні, у які буде активовано будильник.⏎\n"
+"⏎\n"
+"Час:⏎\n"
+"Виберіть час у який спрацьовуватиме будильник для кожного дня,⏎\n"
+"або виберіть опцію для застосування часу згідно типових⏎\n"
+"налаштувань.⏎\n"
+"⏎\n"
+"⏎\n"
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "хв"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+"Гучність\n"
+"Підсилення:\n"
+"Підсилення гучності до обраного рівня\n"
+"впродовж цього періоду часу.\n"
+"\n"
+"Початок:\n"
+"Починати підсилення для цієї гучності.\n"
+"\n"
+"Кінець:\n"
+"Рівень гучності, для якого припиняти підсилення. Якщо час \n"
+"підсилення рівний 0, встановити гучність на цей рівень та \n"
+"почати відтворення.\n"
+"\n"
+"\n"
+"Опції:\n"
+"Додаткова команда:\n"
+"Запускати цю команду при старті будильника.\n"
+"\n"
 
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "Закінчити через:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+"Список відтворення:⏎\n"
+"Завантажувати список відтворення. Якщо не надано⏎\n"
+"список відтворення, то буде застосовано поточний список.⏎\n"
+"Тут також може бути наданий URL⏎\n"
+"для mp3/ogg потоку.⏎\n"
+"⏎\n"
+"Нагадування:⏎\n"
+"Показувати нагадування після того як будильник вимикається.⏎\n"
+"Введіть нагадування у полі та увімкніть⏎\n"
+"кнопку-прапорець, якщо ви хочете, щоб його було показано."
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "Починати о (типово):"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "Вставай, Україно! Вставай, рідна ненько! Москаль вже годину не спить!"
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "Налаштуйте дні тижня, в які працюватиме будильник."
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "Нагадування на сьогодні..."
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "Як типово"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "Повідомлення"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "День"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "Понеділок"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "Середа"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "Четвер"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "П’ятниця"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "Субота"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "Неділя"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "Понеділок"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "Налаштування будильника"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "Час"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "Починати о (типово):"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr " "
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "Закінчити через:"
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "год"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "хв"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "Налаштуйте дні тижня, в які працюватиме будильник."
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "День"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "Як типово"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "Дні"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "Наростання"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "сек"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "Гучність"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "Як зараз"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "На початку:"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "По закінченню:"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "Як зараз"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "Виконувати команду"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "увімкнути"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "Список відтворення (необов’язково)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr "Обрати список відтворення"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "Повідомлення"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "Використовувати:"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "Опції"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "Як це все налаштувати?"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr "\nЧас\n Починати о: \n Час початку відтворення.\n\n Закінчити через: \n Тривалість відтворення.\n (якщо діалогове вікно пробудження\n не закрито примусово)\n\n\nДні\n День:\n День тижня, в який працюватиме будильник.\n\n Час:\n Час спрацювання в обраний день.\n Якщо вибрано «Як типово», будильник спрацює\n в типовий час (вкладка «Час»).\n\n\nГучність\n Наростання: \n Період наростання гучності.\n\n На початку: \n Гучність на початку наростання.\n\n По закінченню: \n Гучність наприкінці наростання. Якщо часом\n наростання є «0», то все відтворення йтиме\n з цією гучністю.\n\n\nОпції:\n Виконувати команду:\n Команда запускатиметься при спрацьовуванні.\n\n Список відтворення (необов’язково): \n Відтворювати список відтворення (лише\n з суфіксом .m3u). Якщо не вказано, то\n відтворюватимуться останні відкриті\n доріжки.\n Можна ввести сюди URL mp3- чи ogg-потоку.\n Поки що звантаження списків відтворення\n за URL не підтримується.\n\n Повідомлення:\n Повідомлення буде показано при спрацьовуванні.\n Введіть повідомлення в поле\n й увімкніть «Використовувати».\n"
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "Як налаштувати?"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "Скасувати"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "Нагадую:"
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "Дякую"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr "Обкладинка альбому"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "Типовий PCM-прилад"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "Типовий мікшер"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "Налаштування виводу ALSA"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "PCM-пристрій:"
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "Мікшер:"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "Елемент мікшера:"
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "Не зависати через «drain»-ваду ALSA"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
-msgstr "Плаґін виводу ALSA,\nнаписаний Джоном Ліндґреном у 2010–2012 роках.\n\nДякую авторові ALSA Output Plugin NG (William Pitcock), чий код допомагав, коли документації до ALSA було недостатньо."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
+msgstr ""
+"Плаґін виводу ALSA,\n"
+"написаний Джоном Ліндґреном у 2010–2012 роках.\n"
+"\n"
+"Дякую авторові ALSA Output Plugin NG (William Pitcock), чий код допомагав, "
+"коли документації до ALSA було недостатньо."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr "ALSA-вивід"
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (MIDI-програвач)"
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "Ви не вибрали портів секвенсера для відтворення MIDI. Виберіть їх у налаштуваннях AMIDI-Plug. "
+msgstr ""
+"Ви не вибрали портів секвенсера для відтворення MIDI. Виберіть їх у "
+"налаштуваннях AMIDI-Plug. "
+
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI-програвач)"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "Постпроцесор ALSA"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Цей постпроцесор посилає MIDI-повідомлення групі портів секвенсера ALSA, обраних користувачем. Інтерфейс секвенсера ALSA дуже гнучкий, він може надавати порти для апаратних синтезаторів аудіокарт (наприклад, emu10k1), програмних синтезаторів, зовнішніх приладів тощо.\nЦей постпроцесор не генерує звук. MIDI-повідомлення керуються напряму приладами та програмами за портами ALSA. Наприклад, MIDI-повідомлення, надіслані апаратному синтезатору, будуть відтворені напряму.\nАвтор постпроцесора — Giacomo Lozito."
+msgstr ""
+"Цей постпроцесор посилає MIDI-повідомлення групі портів секвенсера ALSA, "
+"обраних користувачем. Інтерфейс секвенсера ALSA дуже гнучкий, він може "
+"надавати порти для апаратних синтезаторів аудіокарт (наприклад, emu10k1), "
+"програмних синтезаторів, зовнішніх приладів тощо.\n"
+"Цей постпроцесор не генерує звук. MIDI-повідомлення керуються напряму "
+"приладами та програмами за портами ALSA. Наприклад, MIDI-повідомлення, "
+"надіслані апаратному синтезатору, будуть відтворені напряму.\n"
+"Автор постпроцесора — Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "Постпроцесор FluidSynth"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
-msgstr "Цей модуль відтворює звукові дані, надсилаючи MIDI-події до програмного синтезатора FluidSynth, що працює в режимі реального часу й базується на специфікаціях SoundFont2 (www.fluidsynth.org).\nОтримані звукові дані обробляються плаґінами ефектів програвача й виводяться плаґіном виводу.\nАвтор модуля — Giacomo Lozito."
+msgstr ""
+"Цей модуль відтворює звукові дані, надсилаючи MIDI-події до програмного "
+"синтезатора FluidSynth, що працює в режимі реального часу й базується на "
+"специфікаціях SoundFont2 (www.fluidsynth.org).\n"
+"Отримані звукові дані обробляються плаґінами ефектів програвача й виводяться "
+"плаґіном виводу.\n"
+"Автор модуля — Giacomo Lozito."
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "Порт"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "Назва клієнта"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "Назва порта"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "Порти виводу ALSA"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "Звукова карта:"
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "Елемент мікшера:"
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "Налаштування мікшера"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "Постпроцесор\nALSA"
+msgstr ""
+"Постпроцесор\n"
+"ALSA"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - інформація про постпроцесор"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "Вибір постпроцесора"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "Налаштування відтворення"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr "Транспозиція: "
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr "Зсув ударних: "
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "Додаткові налаштування"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "Обчислювати тривалість MIDI-файлів у списку відтворення наперед"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "Витягувати коментарі (якщо є) з MIDI-файлу"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "Витягувати текст пісні (якщо є) з MIDI-файлу"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI-\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - вибір файлу"
+msgstr ""
+"AMIDI-\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
 msgstr "Налаштування плаґіну AMIDI"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - вибір файлу SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "Налаштування SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "Ім’я файлу"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "Розмір (у байтах)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "Завантажувати з програвачем"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr "Завантажувати при першому відтворенні MIDI"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "Налаштування синтезатора"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "Підсилення"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "як типово"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "значення:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr "Поліфонія"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "Реверберація"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "так"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "ні"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "Хорус"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "Частота дискретизації"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "Задана:"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Гц"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "Постпроцесор\nFluidSynth"
+msgstr ""
+"Постпроцесор\n"
+"FluidSynth"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "Назва:"
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " Інформація MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "Назва:"
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "Тривалість (мс):"
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr "Кількість доріжок:"
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "змінна"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr "Темп (BMP):"
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr "Часовий код MIDI:"
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " Коментарі й слова пісні в MIDI "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* у цьому MIDI-файлі немає коментарів *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* у цьому MIDI-файлі немає слів пісні *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (недійсний UTF-8)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr "Про плаґін AMIDI"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr "Плаґін AMIDI"
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "Плагін AMIDI"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -614,7 +689,25 @@
 "\n"
 "Tony Vroon\n"
 "for the good help with alpha testing"
-msgstr "\nПрогравач музики в форматі MIDI\nнаписаний Джакомо Лоціто.\n\n<james@develia.org>\nhttp://www.develia.org/projects.php?p=amidiplug\n\nКлеменс Ладіш та Ярослав Кисела\nнаписали класні програми «aplaymidi» та «amixer»,\nщо виявилися надзвичайно корисними\nпри вивченні ALSA API,\nяк і документація до alsa-lib.\n\nАльфредо Спадафіна\nстворив гарненький логотип MIDI-клавіатури.\n\nТоні Врун\nнадав вагому допомогу з альфа-тестуванням."
+msgstr ""
+"\n"
+"Програвач музики в форматі MIDI\n"
+"написаний Джакомо Лоціто.\n"
+"\n"
+"<james@develia.org>\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"Клеменс Ладіш та Ярослав Кисела\n"
+"написали класні програми «aplaymidi» та «amixer»,\n"
+"що виявилися надзвичайно корисними\n"
+"при вивченні ALSA API,\n"
+"як і документація до alsa-lib.\n"
+"\n"
+"Альфредо Спадафіна\n"
+"створив гарненький логотип MIDI-клавіатури.\n"
+"\n"
+"Тоні Врун\n"
+"надав вагому допомогу з альфа-тестуванням."
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
@@ -657,7 +750,9 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "Показує повідомлення, коли під час відтворення змінюється назва доріжки, а ім’я файлу залишається старим. Це корисно при відтворенні потоків."
+msgstr ""
+"Показує повідомлення, коли під час відтворення змінюється назва доріжки, а "
+"ім’я файлу залишається старим. Це корисно при відтворенні потоків."
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -789,8 +884,12 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "Композитного менеджера не знайдено.\nЯкщо він не запущений, увімкніть його, інакше екранне меню працюватиме неправильно."
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"Композитного менеджера не знайдено.\n"
+"Якщо він не запущений, увімкніть його, інакше екранне меню працюватиме "
+"неправильно."
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -853,47 +952,47 @@
 msgid "Misc"
 msgstr "Різне"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr "ASXv1/ASXv2-списки відтворення"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr "Списки відтворення Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr "Колір"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr "Осцилоскоп"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr "Налаштування перетворення стереозвуку в бінауральний за Бауером"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr "Рівень змішування каналів:"
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr "Частота зрізу:"
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "Пресети:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr "Перетворення стереозвуку в бінауральний за Бауером (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr "Стовпці (аналізатор спектру)"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -903,233 +1002,246 @@
 "Also thank you to Tony Vroon for mentoring and guiding me.\n"
 "\n"
 "This was a Google Summer of Code 2007 project."
-msgstr "Основний автор у 2007–2012 роках — Calin Crisan <ccrisan@gmail.com>.\n\nДякую розробникам libcdio <http://www.gnu.org/software/libcdio/>\nта libcddb <http://libcddb.sourceforge.net/>.\n\nТакож дякую Tony Vroon за наставництво та допомогу.\n\nЦей проект брав участь у Google Summer of Code 2007."
+msgstr ""
+"Основний автор у 2007–2012 роках — Calin Crisan <ccrisan@gmail.com>.\n"
+"\n"
+"Дякую розробникам libcdio <http://www.gnu.org/software/libcdio/>\n"
+"та libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Також дякую Tony Vroon за наставництво та допомогу.\n"
+"\n"
+"Цей проект брав участь у Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
 msgstr "Пристрій"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
 msgstr "Швидкість читання:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr "Перевизначення пристроїв:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
 msgstr "Метадані"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr "Використовувати CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
 msgstr "Використовувати CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "Використовувати HTTP замість CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
 msgstr "Шлях:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr "Плаґін аудіодисків"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr "Не вдалося задіяти підсистему cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Хибне посилання: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr "Доріжки %d не знайдено."
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Доріжка %d — не музичні дані."
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr "Не вдалося відкрити аудіовивід."
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr "Стався збій при читанні аудіодиску."
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "Аудіодиск"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Не вдалося відкрити CD-пристрій %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr "Не знайдено CD-пристрою з підтримкою аудіо."
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Не вдалося задіяти відкритий CD-привід."
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr "Не вдалося отримати номер першої/останньої доріжки."
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Не вдалося прочитати LSN початку/кінця доріжки %d."
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr "Не вдалося з’єднатися з cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr "Не вдалося запитати сервер CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Не вдалося запитати сервер CDDB: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr "Не вдалося прочитати інформацію CDDB: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "Привід порожній."
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "Непідтримуваний тип диску."
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "Відтворити диск"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "Додати диск"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr "Пункти меню для аудіодисків"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr "Стиснення"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "Гучність центру:"
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "Динамічний діапазон:"
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Компресор звукового діапазону,\nнаписаний Джоном Ліндґреном у 2010–2012 роках."
+msgstr ""
+"Компресор звукового діапазону,\n"
+"написаний Джоном Ліндґреном у 2010–2012 роках."
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr "Компресор звукового діапазону"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "Декодер ігроконсольної музики"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "Загальне"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "Відтворення"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "НЧ:"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "сек"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "ВЧ:"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "Типова тривалість пісні:"
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "Передискретизація"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "Примусова передискретизація"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "Частота дискретизації:"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Гц"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC700"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "Ігнорувати тривалість із теґів SPC"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "Посилити реверберацію"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "Типова тривалість пісні, вказана в секундах, використовується для доріжок, що не мають інформації про тривалість (наприклад, повторювані доріжки)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"Типова тривалість пісні, вказана в секундах, використовується для доріжок, "
+"що не мають інформації про тривалість (наприклад, повторювані доріжки)."
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1137,88 +1249,105 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
-msgstr "Двигун відтворення консольної музики в наступних форматах:\nAY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ.\n\nЗаснований на Game_Music_Emu 0.5.2.\nАвтори — William Pitcock <nenolod@dereferenced.org>,\nShay Green <gblargg@gmail.com>"
+msgstr ""
+"Двигун відтворення консольної музики в наступних форматах:\n"
+"AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ.\n"
+"\n"
+"Заснований на Game_Music_Emu 0.5.2.\n"
+"Автори — William Pitcock <nenolod@dereferenced.org>,\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
-msgstr "Збій при перехресному затиханні: композиції мають різну кількість каналів.\nВиправте це плаґіном-мікшером каналів."
+msgstr ""
+"Збій при перехресному затиханні: композиції мають різну кількість каналів.\n"
+"Виправте це плаґіном-мікшером каналів."
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
-msgstr "Збій при перехресному затиханні: композиції мають різну частоту дискретизації.\nВиправте це плаґіном-конвертором частоти дискретизації."
+msgstr ""
+"Збій при перехресному затиханні: композиції мають різну частоту "
+"дискретизації.\n"
+"Виправте це плаґіном-конвертором частоти дискретизації."
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Перехресне затихання,\nнаписаний Джоном Ліндґреном у 2010–2012 роках."
+msgstr ""
+"Перехресне затихання,\n"
+"написаний Джоном Ліндґреном у 2010–2012 роках."
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr "Перехресне затихання"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr "Перекриття:"
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr "Перехресне затихання"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr "Кристалізатор"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr "Інтенсивність:"
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr "Кристалізатор"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr "Плаґін cue-листів"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr "Відлуння"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr "Затримка:"
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr "мс"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr "Сила:"
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr "Гучність:"
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
-msgstr "Луна,\nплаґін написаний у 1999 році (автор — Johan Levin)."
+msgstr ""
+"Луна,\n"
+"плаґін написаний у 1999 році (автор — Johan Levin)."
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr "Відлуння"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1226,9 +1355,17 @@
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
-msgstr "Відтворення звуку в різних форматах\nза допомогою фреймворку FFmpeg\n\nhttp://www.ffmpeg.org/\n\nАвтори плаґіну:\nWilliam Pitcock <nenolod@nenolod.net>\nMatti Hämäläinen <ccr@tnsp.org>"
+msgstr ""
+"Відтворення звуку в різних форматах\n"
+"за допомогою фреймворку FFmpeg\n"
+"\n"
+"http://www.ffmpeg.org/\n"
+"\n"
+"Автори плаґіну:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr "Плаґін FFmpeg"
 
@@ -1296,7 +1433,23 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Ця програма є вільним програмним забезпеченням — ви можете розповсюджувати\nта/чи модифікувати її відповідно до умов Загальної публічної ліцензії GNU\nдругої або будь-якої новішої версії у тому вигляді, в якому її опублікував\nФонд вільного програмного забезпечення.\n\nПрограма розповсюджується зі сподіванням, що вона виявиться корисною,\nале БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ\nчи ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. \nЗверніться до Загальної публічної ліцензії GNU за подробицями.\n\nВи мали отримати копію Загальної публічної ліцензії GNU разом із цією програмою.\nЯкщо ви не отримали копії, зверніться за наступною адресою:\nFree Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
+msgstr ""
+"Ця програма є вільним програмним забезпеченням — ви можете розповсюджувати\n"
+"та/чи модифікувати її відповідно до умов Загальної публічної ліцензії GNU\n"
+"другої або будь-якої новішої версії у тому вигляді, в якому її опублікував\n"
+"Фонд вільного програмного забезпечення.\n"
+"\n"
+"Програма розповсюджується зі сподіванням, що вона виявиться корисною,\n"
+"але БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ "
+"ПРИДАТНОСТІ\n"
+"чи ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. \n"
+"Зверніться до Загальної публічної ліцензії GNU за подробицями.\n"
+"\n"
+"Ви мали отримати копію Загальної публічної ліцензії GNU разом із цією "
+"програмою.\n"
+"Якщо ви не отримали копії, зверніться за наступною адресою:\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301, USA"
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
@@ -1310,11 +1463,13 @@
 msgid "Joint Stereo"
 msgstr "Об’єднане стерео"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "Моно"
 
@@ -1356,13 +1511,14 @@
 
 #: src/filewriter/mp3.c:889
 msgid "Enforce strict ISO complience"
-msgstr "Примусова відповідність до ISO (для апаратних програвачів, більший розмір)"
+msgstr ""
+"Примусова відповідність до ISO (для апаратних програвачів, більший розмір)"
 
 #: src/filewriter/mp3.c:900
 msgid "Error protection"
 msgstr "CRC-захист від збоїв (дещо менша якість)"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "Якість"
 
@@ -1442,429 +1598,499 @@
 msgid "Tags"
 msgstr "Теґи"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Налаштування кодувальника Vorbis"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "Рівень якості (0-10, менше - краще):"
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr "без втрат"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
-msgstr "Автор початкового коду —\nRalf Ertzinger <ralf@skytale.net>\n\nhttp://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Автор початкового коду —\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr "Декодер FLAC"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
-msgstr "Плаґін GIO,\nнаписаний Джоном Ліндґреном у 2010–2012 роках."
+msgstr ""
+"Плаґін GIO,\n"
+"написаний Джоном Ліндґреном у 2010–2012 роках."
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr "Плаґін GIO"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+"OpenGL аналізатор спектру для Audacious⏎\n"
+"Авторське право 2013 Christophe Budé та John Lindgren⏎\n"
+"⏎\n"
+"Базується на коді плагіна для XMMS:⏎\n"
+"Авторське право 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson та 4Front Technologies⏎\n"
+"⏎\n"
+"Ліцензія: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL аналізатор спектру"
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr "Плаґін надає можливість керувати відтворенням\nза допомогою клавіатурних скорочень GNOME.\nАвтор у 2007–2008 роках — Sascha Hlusiak <contact@saschahlusiak.de>."
+msgstr ""
+"Плаґін надає можливість керувати відтворенням\n"
+"за допомогою клавіатурних скорочень GNOME.\n"
+"Автор у 2007–2008 роках — Sascha Hlusiak <contact@saschahlusiak.de>."
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr "Ярлики Gnome"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "Номер у списку"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "Назва"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "Виконавець"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "Рік"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "Альбом"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "Доріжка"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "Позиція у черзі"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "Тривалість"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "Шлях до файлу"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "Назва файлу"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "Назва файлу"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "Бітова швидкість"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "Вибрати стовпчики"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "Доступні:"
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "Вибрані:"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "Прикріпити зліва"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "Прикріпити справа"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "Прикріпити вгорі"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "Прикріпити внизу"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "Відкріпити"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "Вимкнути"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "Відтворити _файли..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "Відтворити файли за _посиланням..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "_Додати файли..."
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "Додати файли _за посиланням..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr "Пошук у _бібліотеці"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "П_ро Audacious..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "_Налаштування..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "_Вихід"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "_Відтворити"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "_Призупинити"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "_Зупинити"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "П_опередня"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "_Наступна"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "Повто_рювати"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "В_ипадково"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "Н_е просуватися списком"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
 msgstr "Зупинити після _цієї пісні"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "_Інформація про доріжку..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "Перейти до _часу..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "Перейти до _доріжки..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "_За номером доріжки"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "Встановити точку повтору _A"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "Встановити точку повтору _B"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "_Скинути точки повтору"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "За _назвою"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "За _назвою файлу"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "За _шляхом до файлу"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "_За номером доріжки"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "За _виконавцем"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "За _альбомом"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "За а_льбомом"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "За _датою видання"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "За _тривалістю"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "За _шляхом до файлу"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "За назвою _файлу"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "_У зворотньому порядку"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "У випадковому по_рядку"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr "Відтворити _цей список"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "_Оновити"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "Прибрати _недоступні файли"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "_Сортувати"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "Сортувати виділене"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "Видалити _дублікати"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "Прибрати _недоступні файли"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "_Новий"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr "Пере_йменувати..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "_Закрити"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "_Імпортувати..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "_Експортувати..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr "Керування списками _відтворення..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "Керування _чергою..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "З_більшити гучність"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "З_меншити гучність"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "_Еквалайзер"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "Е_фекти"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "_Інтерфейс"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "_Візуалізація"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "Показувати панель _меню"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "Показувати панель і_нформації"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr "П_оказувати візуалізацію"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "Показувати рядок _стану"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "Показати час до _завершення"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr "Показувати _кнопки закриття"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "Показувати _заголовки стовпчиків "
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "Вибрати с_товпчики..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "_Прокручувати при зміні доріжки"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "_Відтворення"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "_Список відтворення"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "С_лужби"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "В_ивід"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "Ви_гляд"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "_Елемент черги"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "_Вирізати"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "_Копіювати"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "Вст_авити"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "Виді_лити все"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr "Пере_йменувати..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "Інтерфейс GTK"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "Буферую..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "Помилка"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1872,113 +2098,125 @@
 msgstr[1] "%d канали"
 msgstr[2] "%d каналів"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d кб/с"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr "Попередня доріжка"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "Відтворити"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "Призупинити/продовжити"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "Зупинити"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "Наступна доріжка"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
 msgstr "На 5 секунд вперед"
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
 msgstr "На 5 секунд назад"
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
 msgstr "Вимкнути звук"
 
-#: src/hotkey/gui.c:80
-msgid "Volume Up"
+#: src/hotkey/gui.c:78
+msgid "Volume up"
 msgstr "Збільшити гучність"
 
-#: src/hotkey/gui.c:81
-msgid "Volume Down"
+#: src/hotkey/gui.c:79
+msgid "Volume down"
 msgstr "Зменшити гучність"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "Перейти до файлу"
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
+msgstr "Перейти до файлу"
 
-#: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
 msgstr "Перемкнути стан вікон програвача"
 
-#: src/hotkey/gui.c:84
+#: src/hotkey/gui.c:82
 msgid "Show On-Screen-Display"
 msgstr "Показати OSD-повідомлення"
 
-#: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
 msgstr "Перемкнути повтор"
 
-#: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
 msgstr "Перемкнути тасування"
 
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr "Перемкнути зупинку після поточної"
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
 msgstr "Підняти вікна програвача"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(немає)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
-msgstr "Не раджу пов’язувати головні кнопки миші без модифікаторів.\n\nПродовжувати попри це?"
+msgstr ""
+"Не раджу пов’язувати головні кнопки миші без модифікаторів.\n"
+"\n"
+"Продовжувати попри це?"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "Пов’язування кнопок миші"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "Налаштування гарячих клавіш"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "Маючи курсор на полі, натисніть необхідну клавішу чи комбінацію всередині поля.\nМожна також прив’язувати кнопки миші."
+msgstr ""
+"Маючи курсор на полі, натисніть необхідну клавішу чи комбінацію всередині "
+"поля.\n"
+"Можна також прив’язувати кнопки миші."
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "Гарячі клавіші:"
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "Дія:"
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "Прив’язка до клавіш:"
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1991,104 +2229,130 @@
 " Bryn Davies <curious@ihug.com.au>,\n"
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
-msgstr "Плаґін надає можливість керувати відтворенням\nза допомогою глобальних клавіатурних скорочень,\nщо також називаються «гарячими клавішами».\n\nАвтор у 2007–2008 роках — Sascha Hlusiak <contact@saschahlusiak.de>.\n\nVladimir Paskov <vlado.paskov@gmail.com> (у 2006–2007),\nVille Syrjälä <syrjala@sci.fi> (у 2000–2002),\nBryn Davies <curious@ihug.com.au>,\nJonathan A. Davis <davis@jdhouse.org>,\nJeremy Tan <nsx@nsx.homeip.net>\nтакож брали участь у розробці."
+msgstr ""
+"Плаґін надає можливість керувати відтворенням\n"
+"за допомогою глобальних клавіатурних скорочень,\n"
+"що також називаються «гарячими клавішами».\n"
+"\n"
+"Автор у 2007–2008 роках — Sascha Hlusiak <contact@saschahlusiak.de>.\n"
+"\n"
+"Vladimir Paskov <vlado.paskov@gmail.com> (у 2006–2007),\n"
+"Ville Syrjälä <syrjala@sci.fi> (у 2000–2002),\n"
+"Bryn Davies <curious@ihug.com.au>,\n"
+"Jonathan A. Davis <davis@jdhouse.org>,\n"
+"Jeremy Tan <nsx@nsx.homeip.net>\n"
+"також брали участь у розробці."
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr "Гарячі клавіші"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
-msgstr "На основі xmms-jack від Chris Morgan:\nhttp://xmms-jack.sourceforge.net/\n\nАвтор портування до Audacious — Giacomo Lozito."
+msgstr ""
+"На основі xmms-jack від Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Автор портування до Audacious — Giacomo Lozito."
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr "JACK-вивід"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "Налаштування %s"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "Налаштування хосту LADSPA"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "Шляхи до модулів:"
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "Якщо шляхів кілька, розділяйте їх двокрапками.\nПошук відбувається за вказаними шляхами та змінною LADSPA_PATH.\nВказавши шляхи, натисніть Enter для пошуку плаґінів."
+msgstr ""
+"Якщо шляхів кілька, розділяйте їх двокрапками.\n"
+"Пошук відбувається за вказаними шляхами та змінною LADSPA_PATH.\n"
+"Вказавши шляхи, натисніть Enter для пошуку плаґінів."
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "Наявні плаґіни:"
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "Увімкнути"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "Увімкнені плаґіни:"
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "Налаштування"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
-msgstr "Хост LADSPA,\nнаписаний Джоном Ліндґреном у 2011 році."
+msgstr ""
+"Хост LADSPA,\n"
+"написаний Джоном Ліндґреном у 2011 році."
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr "Хост LADSPA"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr "%s: не можу ініціалізувати підтримку LIRC\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
-msgstr "%s: не можу прочитати конфігураційний файл LIRC\n%s: прочитайте документацію до LIRC\n%s: як створити правильний конфигураційний файл\n"
+msgstr ""
+"%s: не можу прочитати конфігураційний файл LIRC\n"
+"%s: прочитайте документацію до LIRC\n"
+"%s: як створити правильний конфигураційний файл\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr "%s: намагаюсь перез’єднатися...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr "%s: невідома команда «%s»\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr "%s: з’єднання з LIRC розірвано\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr "%s: намагаюся перез’єднатися кожні %d секунд...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2102,155 +2366,329 @@
 "Andrew O. Shadoura <bugzilla@tut.by>\n"
 "\n"
 "For more information about LIRC, see http://lirc.org."
-msgstr "Плаґін надає можливість керувати відтворенням\nдистанційно (за допомогою LIRC).\n\nАвтори портування до Audacious:\nTony Vroon <chainsaw@gentoo.org>,\nJoonas Harjumäki <jharjuma@gmail.com>.\n\nАвтори основи — плаґіну LIRC для XMMS:\nCarl van Schaik <carl@leg.uct.ac.za>,\nChristoph Bartelmus <xmms@bartelmus.de>,\nAndrew O. Shadoura <bugzilla@tut.by>.\n\nhttp://lirc.org/"
+msgstr ""
+"Плаґін надає можливість керувати відтворенням\n"
+"дистанційно (за допомогою LIRC).\n"
+"\n"
+"Автори портування до Audacious:\n"
+"Tony Vroon <chainsaw@gentoo.org>,\n"
+"Joonas Harjumäki <jharjuma@gmail.com>.\n"
+"\n"
+"Автори основи — плаґіну LIRC для XMMS:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>,\n"
+"Christoph Bartelmus <xmms@bartelmus.de>,\n"
+"Andrew O. Shadoura <bugzilla@tut.by>.\n"
+"\n"
+"http://lirc.org/"
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr "З’еднання"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr "Переприєднатись до LIRC серверу"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr "Чекати перед перез’єднанням:"
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr "Плаґін LIRC"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr "Тексту пісні не знайдено"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Не вдалося отримати %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Не вдалося проаналізувати %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr "Шукаю текст пісні..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr "Відсутні метадані пісні"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr "З’єднуюся з lyrics.wikia.com..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr "Плаґін LyricWiki"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr "M3U-списки відтворення"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Генератор такту: %d BPM"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Генератор такту: %d BPM, %d/%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "To use it, add a URL: tact://beats*num/den\n"
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
-msgstr "Генератор такту,\nнаписаний Мартіном Штраусом <mys@faveve.uni-stuttgart.de>.\n\nВикористовується при відкритті посилання в форматі:\ntact://bpm*чисельник/знаменник\n\nНаприклад, tact://77 — 77 ударів за хвилину,\ntact://60*3/4 — 60 ударів за хвилину з тактом 3/4."
+msgstr ""
+"Генератор такту,\n"
+"написаний Мартіном Штраусом <mys@faveve.uni-stuttgart.de>.\n"
+"\n"
+"Використовується при відкритті посилання в форматі:\n"
+"tact://bpm*чисельник/знаменник\n"
+"\n"
+"Наприклад, tact://77 — 77 ударів за хвилину,\n"
+"tact://60*3/4 — 60 ударів за хвилину з тактом 3/4."
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr "Генератор такту"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr "Мікшер каналів,\nнаписаний у 2011–2012 роках Джоном Ліндґреном та Michał Lipski."
+msgstr ""
+"Мікшер каналів,\n"
+"написаний у 2011–2012 роках Джоном Ліндґреном та Michał Lipski."
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr "Мікшер каналів"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "Каналів на виході:"
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr "Мікшер каналів"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr "Плаґін MMS"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "Роздільна здатність"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-біт"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-біт"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "Канали"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "Ресемплінг"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "Найближчий (найшвидший)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "Лінійний (швидкий)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "Сплайн (якісний)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "Поліфазний (найкращий)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "Частота дискретизації"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 кГц"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 кГц"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 кГц"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 кГц"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "Рівень:"
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "Границя:"
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "Реверберація"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "Додатковий бас"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "Об’ємне звучання"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "Попереднє підсилення"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "Різне"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "Передискретизація"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "Зменшення шуму"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "Грати Amiga MOD-файли"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "Повторення"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "Кількість повторень:"
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Для безкінечного повторення, встановіть кількість повторень в -1."
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (програвач модулів)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "Об’ємний звук"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr "Плаґін MPG123"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr "Сервер MPRIS 2"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Плаґін Neon HTTP/HTTPS"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "Зупинено"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious нічого не відтворює."
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
-"\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
-msgstr "Плаґін написаний 2011 року Джоном Ліндґреном.\n\nЗа основу було взято lifnotify-aosd, написаний 2010 року Максиміліаном Боґнером: http://www.mbogner.de/projects/libnotify-aosd/\n\nЦей плаґін є вільним програмним забезпеченням — ви можете розповсюджувати та/чи модифікувати його відповідно до Загальної публічної ліцензії GNU третьої або будь-якої новішої версії у тому вигляді, в якому її опублікував Фонд вільного програмного забезпечення.\n\nПлаґін розповсюджується зі сподіванням, що він виявиться корисним, але БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ чи ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. Зверніться до Загальної публічної ліцензії GNU за подробицями.\n\nВи мали отримати копію Загальної публічної ліцензії GNU разом із цією програмою. Якщо ви не отримали копії, відвідайте <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+"Плагін сповіщень для Audacious⏎\n"
+"Авторське право (C) 2010 Maximilian Bogner⏎\n"
+"Авторське право (C) 2011-2013 John Lindgren та Jean-Alexandre Anglès "
+"d'Auriac⏎\n"
+"⏎\n"
+"Цей плагін є вільним програмним забезпеченням — ви можете розповсюджувати та/"
+"чи модифікувати його відповідно до умов Загальної публічної ліцензії GNU "
+"третьої або (на ваш розсуд) будь-якої новішої версії у тому вигляді, в якому "
+"її опублікував Фонд вільного програмного забезпечення.⏎\n"
+"⏎\n"
+"Цей плагін розповсюджується зі сподіванням, що він виявиться корисним, але "
+"БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ чи "
+"ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. Зверніться до Загальної публічної "
+"ліцензії GNU за подробицями.⏎\n"
+"⏎\n"
+"Ви мали отримати копію Загальної публічної ліцензії GNU разом із цією "
+"програмою. В іншому випадку, дивіться <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "Показати елементи керування відтворенням"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "Завжди показувати повідомлення"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr "Сповіщення"
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "Показати"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "Призупинити відтворення"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "Наступна доріжка"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. Типовий прилад"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "Аудіоприлад:"
 
@@ -2275,22 +2713,29 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
-msgstr "Плаґін виводу OSS4 для Audacious,\nза авторством Michał Lipski,\nнаписаний у 2010–2012 роках\n\nДякуємо #audacious, особливо Тоні Врунові, Джонові Ліндґрену й, звісно, авторам попереднього плаґіну OSS."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
+msgstr ""
+"Плаґін виводу OSS4 для Audacious,\n"
+"за авторством Michał Lipski,\n"
+"написаний у 2010–2012 роках\n"
+"\n"
+"Дякуємо #audacious, особливо Тоні Врунові, Джонові Ліндґрену й, звісно, "
+"авторам попереднього плаґіну OSS."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr "OSS4-вивід"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr "PLS-списки відтворення"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Декодер OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2308,155 +2753,237 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
-msgstr "Плаґін виводу PulseAudio\n\nЦя програма є вільним програмним забезпеченням — ви можете розповсюджувати\nта/чи модифікувати її відповідно до умов Загальної публічної ліцензії GNU\nдругої або будь-якої новішої версії у тому вигляді, в якому її опублікував\nФонд вільного програмного забезпечення.\n\nПрограма розповсюджується зі сподіванням, що вона виявиться корисною,\nале БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ\nчи ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. \nЗверніться до Загальної публічної ліцензії GNU за подробицями.\n\nВи мали отримати копію Загальної публічної ліцензії GNU разом із цією програмою.\nЯкщо ви не отримали копії, зверніться за наступною адресою:\nFree Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
+msgstr ""
+"Плаґін виводу PulseAudio\n"
+"\n"
+"Ця програма є вільним програмним забезпеченням — ви можете розповсюджувати\n"
+"та/чи модифікувати її відповідно до умов Загальної публічної ліцензії GNU\n"
+"другої або будь-якої новішої версії у тому вигляді, в якому її опублікував\n"
+"Фонд вільного програмного забезпечення.\n"
+"\n"
+"Програма розповсюджується зі сподіванням, що вона виявиться корисною,\n"
+"але БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ "
+"ПРИДАТНОСТІ\n"
+"чи ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. \n"
+"Зверніться до Загальної публічної ліцензії GNU за подробицями.\n"
+"\n"
+"Ви мали отримати копію Загальної публічної ліцензії GNU разом із цією "
+"програмою.\n"
+"Якщо ви не отримали копії, зверніться за наступною адресою:\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301, USA"
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr "PulseAudio-вивід"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
-msgstr "Конвертор частоти дискретизації,\nнаписаний Джоном Ліндґреном у 2010–2012 роках."
+msgstr ""
+"Конвертор частоти дискретизації,\n"
+"написаний Джоном Ліндґреном у 2010–2012 роках."
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr "Пропуск/повтор фрагментів"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr "Лінійна інтерполяція"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr "Швидка sinc-інтерполяція"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr "Звичайна sinc-інтерполяція"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr "Найкраща sinc-інтерполяція"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr "Конвертування"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr "Частота:"
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr "Схема конвертування"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr "Конвертувати за схемою:"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr "8 кГц:"
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr "16 кГц:"
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr "22.05 кГц:"
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr "44.1 кГц:"
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr "48 кГц:"
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr "96 кГц:"
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr "192 кГц:"
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr "Конвертор частоти дискретизації"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "Змінити пароль"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "Ок. Скроблінг для користувача: %s"
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "Відмовлено у доступі"
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
+"Відвідайте наступне посилання щоб дозволити Audacious скроблінг ваших "
+"доріжок:"
+
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
+"Лишіть це вікно відкритим та ще раз натисніть 'Перевірити права доступу'.\n"
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
+msgstr ""
+"Не хвилюйтесь. Дані для скроблінгу збережені на комп’ютері.\n"
+"Вони будуть відправлені, як тільки Audacious'у буде дозволено це зробити."
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "Проблема мережі."
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
+"Виникла проблема зі з’єднанням до Last.fm. Будь ласка спробуйте пізніше."
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "Служби"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "Перевірка..."
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
-msgstr "Last.fm"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "П_еревірити права доступу"
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "Ім’я користувача:"
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "_Видалити права доступу"
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "Пароль:"
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+"Вам потрібно дозволити Audacious скроблити доріжки у ваш акаунт на Last.fm.\n"
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
-msgstr "URL Scrobbler:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Модуль скроблера не може бути запущений.\n"
+"Можливо це проблема з встановленою програмою."
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+msgstr ""
+"Модуль скроблера для Audacious 2.0 від Pitxyoki,\n"
+"\n"
+"Авторське право © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Велика подяка John Lindgren за простягнуту для допомоги руку на початку "
+"цього проекту.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
-msgstr "Плаґін AudioScrobbler,\nавтори оригіналу: Audun Hove <audun@nlc.no>,\nPipian <pipian@pipian.com>."
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
-msgstr "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Скроблер 2.0"
+
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+"На даний час Audacious використовує покращену версію скробблера Last.fm.⏎\n"
+"Будь-ласка перевірте Налаштування для плаґіна Scrobbler."
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
-msgstr "Плаґін виводу в SDL,\nнаписаний Джоном Ліндґреном у 2010 році."
+msgstr ""
+"Плаґін виводу в SDL,\n"
+"написаний Джоном Ліндґреном у 2010 році."
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr "SDL-вивід"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "Бібліотека"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr "Невідомий виконавець"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr "Невідомий альбом"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
-msgstr "%s\nвід %s по %s"
+msgstr ""
+"%s\n"
+"від %s по %s"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
@@ -2464,7 +2991,7 @@
 msgstr[1] "%d альбоми"
 msgstr[2] "%d альбомів"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2472,11 +2999,17 @@
 msgid_plural ""
 "%s\n"
 " %s, %d songs"
-msgstr[0] "%s\n %s, %d пісня"
-msgstr[1] "%s\n %s, %d пісні"
-msgstr[2] "%s\n %s, %d пісень"
+msgstr[0] ""
+"%s\n"
+" %s, %d пісня"
+msgstr[1] ""
+"%s\n"
+" %s, %d пісні"
+msgstr[2] ""
+"%s\n"
+" %s, %d пісень"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2484,77 +3017,85 @@
 msgid_plural ""
 "%s\n"
 " %d songs by %s"
-msgstr[0] "%s\n %d пісня по %s"
-msgstr[1] "%s\n %d пісні по %s"
-msgstr[2] "%s\n %d пісень по %s"
+msgstr[0] ""
+"%s\n"
+" %d пісня по %s"
+msgstr[1] ""
+"%s\n"
+" %d пісні по %s"
+msgstr[2] ""
+"%s\n"
+" %d пісень по %s"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "_Створити список відтворення"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "_Додати до списку відтворення"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "Шукати в бібліотеці"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "Щоб імпортувати свою музичну бібліотеку до Audacious, виберіть теку й натисніть на значок оновлення."
+msgstr ""
+"Щоб імпортувати свою музичну бібліотеку до Audacious, виберіть теку й "
+"натисніть на значок оновлення."
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "Зачекайте..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "Вибрати теку"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr "Пошуковий інструмент"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr "Класичний інтерфейс Winamp"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "_Програвач"
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "Шрифт основного вікна програвача"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "_Список відтворення"
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "Шрифт списку відтворення:"
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "Шрифти"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Використовувати растрові шрифти (підтримується тільки ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "Прокручувати назву пісні в обох напрямках"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "Жупан"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "Налаштування інтерфейсу"
 
@@ -2610,7 +3151,7 @@
 msgid "Presets"
 msgstr "Типові налаштування"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "Вибір пресету"
 
@@ -2623,7 +3164,7 @@
 msgid "Load equalizer preset"
 msgstr "Завантажити еквалайзерний пресет"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "Збереження пресету"
 
@@ -2635,7 +3176,7 @@
 msgid "Save equalizer preset"
 msgstr "Зберегти еквалайзерний пресет"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "Видалення пресету"
 
@@ -2643,739 +3184,751 @@
 msgid "Delete auto-preset"
 msgstr "Видалити відповідний доріжці пресет"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "кб/с"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "кГц"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "Перехід до %d:%-2.2d / %d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "Гучність: %d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "Баланс: %d%% вліво"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "Баланс: центр"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "Баланс: %d%% вправо"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "Меню опцій"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "Вимкнути відображення над іншими вікнами"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "Відображати над іншими вікнами"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "Редактор інформації про доріжку"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "Меню візуалізації"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "Однодоріжковий режим."
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "Режим списка відтворення."
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "Зупинити після цієї доріжки."
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "Продовжити після цієї доріжки."
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "Точку повтору A встановлено."
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "Точку повтору B встановлено."
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "Точки повтору скинуті."
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr "Прокручувати назву доріжки"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "Зупинити після поточної доріжки"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "Затримувати піки"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "Повторювати"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "Випадково"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "Не просуватися у списку відтворення"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "Показати програвач"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "Показати редактор списків відтворення"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "Показати еквалайзер"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "Завжди згори"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "На всіх робочих областях"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "Згорнути програвач"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "Згорнути список відтворення"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "Згорнути еквалайзер"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "Аналізатор"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "Осцилограф"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "Спектрограма"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "Вимкнено"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "Звичайний"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "Вогонь"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "Монотонні лінії"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "Лінії"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "Стовпчики"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "Крапковий"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "Лінійний"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "Суцільний"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "Лід"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "Плавний"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "Дуже повільне"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "Повільне"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "Помірне"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "Швидке"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "Дуже швидке"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "Скільки часу пройшло"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "Скільки часу залишається"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "Призупинити відтворення"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "Попередня доріжка"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "Наступна доріжка"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "Візуалізація"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "Режим візуалізації"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "Тип аналізатора"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "Тип осцилографа"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "Тип спектрограми"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "Режим WindowShade VU"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "Спадання стовпчиків аналізатора"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "Спадання піків аналізатора"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "Список відтворення"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr "Відтворити список"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "Новий список відтворення"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "Виділити наступний список відтворення"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "Виділити попередній список відтворення"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "Вилучити список відтворення"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "Імпортувати список відтворення"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "Завантажити список відтворення з файлу до виділеного списку."
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "Експортувати список відтворення"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "Зберегти виділений список відтворення."
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "Оновити список"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "Оновити метадані, пов'язані з доріжками списку відтворення."
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "Керування списками відтворення"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "Керування чергою"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "Перегляд"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "Налаштування інтерфейсу ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "Додати інтернет адресу ..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "Додає віддалену доріжку до списку відтворення."
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "Додати файли ..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "Додає файли до списку відтворення."
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "Пошук і виділення"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "Виділити елементи списка за вказаними критеріями."
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "Інвертувати виділення"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "Виділити досі невиділене й зняти поточне виділення."
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "Виділити все"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "Виділити всі елементи списка."
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "Зняти виділення"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "Зняти виділення з усіх елементів списка."
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "Вилучити всі"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "Вилучає всі елементи зі списку відтворення."
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "Очистити чергу"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "Видалити з черги елементи цього списку."
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "Прибрати недоступні файли."
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "Видалити зі списку відтворення недоступні файли."
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "Видалити дублікати"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "За назвою"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "Видалити зі списку відтворення дублікати за назвою."
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "За ім’ям файлу"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "Видалити зі списку відтворення дублікати за ім’ям файла."
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "За шляхом та ім’ям файлу"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "Видалити зі списку відтворення дублікати за повним шляхом до них."
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "Вилучити невідмічені "
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "Вилучити невиділені елементи зі списку відтворення."
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "Вилучити виділені"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "Вилучити виділені елементи зі списку відтворення"
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "Порушити порядок"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "Розміщує елементи списка в довільному порядку."
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "Обернути список"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "Розмістити доріжки списка в протилежному порядку."
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "Сортувати список..."
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "Сортувати список за назвами доріжок."
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "За альбомом"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "Сортувати список за назвами альбомів."
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "За виконавцем"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "Сортувати список за іменами виконавців."
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "Сортувати список за іменами файлів."
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "Сортувати список за повним шляхом."
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "За датою"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "Сортувати список за часом останньої модифікації файлів."
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "За номером доріжки"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "Сортувати список за номерами доріжок."
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "Сортувати виділене"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "Файл"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "Можливості плаґінів"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "Інформація про доріжку"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "Інформація про доріжку"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "Про Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "Відтворити файл..."
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "Завантажити та відтворити файл"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "Відтворити за посиланням..."
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "Відтворити за обраним шляхом"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "Можливості плаґінів"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "Налаштування"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "Відчинити вікно налаштувань"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "Завершити Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "Встановити початок/кінець повтору"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "Перестати повторювати"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "Перейти до файлу"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "Перейти до часу"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "Перемкнути стан черги"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "Вмикати/вимикати елемент черги списку відтворення."
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "Копіювати"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "Вирізати"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "Вставити"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "Завантажити"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "Імпортувати"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "Зберегти"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "Вилучити"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "Пресет"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "Відповідний доріжці пресет"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "Завантажити відповідний доріжці пресет"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "Відновити типові значення"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "Нулі"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "Обнулити рівні еквалайзера"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "З файлу"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "Завантажити пресет із файлу"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "Із файлу WinAMP EQF"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "Завантажити пресет із файлу WinAMP EQF"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "Пресети WinAMP"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "Імпортувати пресети WinAMP"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "Зберегти пресет як відповідний доріжці"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "Зберегти як типові значення"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "До файлу"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "Зберегти пресет до файлу"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "До файлу WinAMP EQF"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "Зберегти пресет до файлу WinAMP EQF"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "Видалити відповідний доріжці пресет"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "Пошук в активному списку відтворення"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "Щоб шукати доріжки в списку відтворення, заповніть одне чи більше полів. Можна використовувати літери, цифри, інші знаки, регулярні вирази. Поля нечутливі до регістру."
+msgstr ""
+"Щоб шукати доріжки в списку відтворення, заповніть одне чи більше полів. "
+"Можна використовувати літери, цифри, інші знаки, регулярні вирази. Поля "
+"нечутливі до регістру."
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "Назва: "
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "Альбом: "
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "Виконавець: "
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "Ім’я файлу: "
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "Зняти попереднє виділення перед пошуком"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "Автоматично перемикати стан черги знайдених елементів"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "Виділити знайдене в новий список відтворення"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Редактор списків відтворення Audacious"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
 msgstr "%s (%d із %d)"
@@ -3393,81 +3946,121 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "Неможливо створити теку (%s): %s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Автор плаґіну — Тоні Врун <chainsaw@gentoo.org>.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"За основу взято xmms_sndfile,\n"
+"написаний у 2000–2002 роках Еріком де Кастро Лопо.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr "Автор плаґіну — Тоні Врун <chainsaw@gentoo.org>.\n\nЗа основу взято xmms_sndfile,\nнаписаний у 2000–2002 роках Еріком де Кастро Лопо.\n\nЦя програма є вільним програмним забезпеченням — ви можете розповсюджувати\nта/чи модифікувати її відповідно до умов Загальної публічної ліцензії GNU\nдругої або будь-якої новішої версії у тому вигляді, в якому її опублікував\nФонд вільного програмного забезпечення.\n\nПрограма розповсюджується зі сподіванням, що вона виявиться корисною,\nале БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ\nчи ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. \nЗверніться до Загальної публічної ліцензії GNU за подробицями.\n\nВи мали отримати копію Загальної публічної ліцензії GNU разом із цією програмою.\nЯкщо ви не отримали копії, зверніться за наступною адресою:\nFree Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"
+"Ця програма є вільним програмним забезпеченням — ви можете розповсюджувати\n"
+"та/чи модифікувати її відповідно до умов Загальної публічної ліцензії GNU\n"
+"другої або будь-якої новішої версії у тому вигляді, в якому її опублікував\n"
+"Фонд вільного програмного забезпечення.\n"
+"\n"
+"Програма розповсюджується зі сподіванням, що вона виявиться корисною,\n"
+"але БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ "
+"ПРИДАТНОСТІ\n"
+"чи ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. \n"
+"Зверніться до Загальної публічної ліцензії GNU за подробицями.\n"
+"\n"
+"Ви мали отримати копію Загальної публічної ліцензії GNU разом із цією "
+"програмою.\n"
+"Якщо ви не отримали копії, зверніться за наступною адресою:\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301, USA"
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr "Плаґін Sndfile"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr "Про плаґін виводу Sndio"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 msgstr "Плаґін виводу Sndio, за авторством Thomas Pfaff <tpfaff@tp76.info>.\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr "Непідтримуваний формат"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
-msgstr "Формат не підтримується аудіопристроєм.\n\nСпробуйте ще раз, запустивши сервер sndiod(1)."
+msgstr ""
+"Формат не підтримується аудіопристроєм.\n"
+"\n"
+"Спробуйте ще раз, запустивши сервер sndiod(1)."
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr "Пристрій Sndio"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr "(порожнє — типове)"
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "Гаразд"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "Скасувати"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "Зміна доріжки"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "Виконувати на початку відтворення доріжки:"
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr " "
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "Виконувати наприкінці відтворення доріжки:"
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "Виконувати при досягненні кінця списка відтворення:"
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr "Виконувати при зміні назви доріжки (онлайн-потоки тощо):"
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3484,35 +4077,89 @@
 "%a: Artist\n"
 "%b: Album\n"
 "%T: Track title"
-msgstr "Ви можете використовувати наступні шаблони\n(для команди на кінець списку підходять не всі)\n\n%F: Частота (Гц)\n%c: Кількість каналів\n%f: Ім’я файла (повний шлях)\n%l: Довжина (мс)\n%n чи %s: Назва композиції\n%r: Швидкість (біт/с)\n%t: Позиція в списку відтворення (%02d)\n%p: Зараз грає (1 or 0)\n%a: Виконавець\n%b: Альбом\n%T: Назва доріжки"
+msgstr ""
+"Ви можете використовувати наступні шаблони\n"
+"(для команди на кінець списку підходять не всі)\n"
+"\n"
+"%F: Частота (Гц)\n"
+"%c: Кількість каналів\n"
+"%f: Ім’я файла (повний шлях)\n"
+"%l: Довжина (мс)\n"
+"%n чи %s: Назва композиції\n"
+"%r: Швидкість (біт/с)\n"
+"%t: Позиція в списку відтворення (%02d)\n"
+"%p: Зараз грає (1 or 0)\n"
+"%a: Виконавець\n"
+"%b: Альбом\n"
+"%T: Назва доріжки"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "Параметри подавати слід у лапках. Робити інакше небезпечно для системи."
+msgstr ""
+"Параметри подавати слід у лапках. Робити інакше "
+"небезпечно для системи."
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "Команди"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Модуль ресемплера SoX для Audacious\n"
+"Авторське право 2013 Michał Lipski\n"
+"\n"
+"Базується на коді модуля Sample Rate Converter:\n"
+"Авторське право 2010-2012 John Lindgren"
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "Швидка"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "Низька"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "Висока"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "Дуже висока"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "Якість:"
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "Ресемплер SoX"
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr "Швидкість та висота"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr "Швидкість:"
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr "Висота:"
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr "Швидкість та висота"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3521,94 +4168,113 @@
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
-msgstr "Плаґін сповіщення й керування Audacious через системний лоток\n\n2005–2007 — Джакомо Лоціто <james@develia.org>\n2010 — Michał Lipski <tallica@o2.pl>"
+msgstr ""
+"Плаґін сповіщення й керування Audacious через системний лоток\n"
+"\n"
+"2005–2007 — Джакомо Лоціто <james@develia.org>\n"
+"2010 — Michał Lipski <tallica@o2.pl>"
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr "Дія коліщатка миші"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "Зміна гучності"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "Зміна поточної доріжки"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr "Інші налаштування"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "Вимкнути спливне вікно"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr "Замість закриття згортати до лотка"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "Просуватися списком відтворення при прокручуванні догори"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr "Значок у лотку"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
-msgstr "Розширене стерео,\nплаґін написаний у 1999 році (автор — Johan Levin)."
+msgstr ""
+"Розширене стерео,\n"
+"плаґін написаний у 1999 році (автор — Johan Levin)."
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr "Розширене стерео"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr "Розширене стерео"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr "Генератор тону: "
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
-msgstr "Генератор тону,\nавтори: Håvard Kvålen <mys@faveve.uni-stuttgart.de>,\nDaniel J. Peng <danielpeng@bigfoot.com>.\n\nВикористовується при відкритті посилання в форматі:\ntone://частота1;[частота2;...]\n\nНаприклад, tone://2000;2005 — послідовне відтворення тонів з частотою 2000 Гц і 2005 Гц."
+msgstr ""
+"Генератор тону,\n"
+"автори: Håvard Kvålen <mys@faveve.uni-stuttgart.de>,\n"
+"Daniel J. Peng <danielpeng@bigfoot.com>.\n"
+"\n"
+"Використовується при відкритті посилання в форматі:\n"
+"tone://частота1;[частота2;...]\n"
+"\n"
+"Наприклад, tone://2000;2005 — послідовне відтворення тонів з частотою 2000 "
+"Гц і 2005 Гц."
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr "Генератор тону"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
-msgstr "Плаґін файлового вводу-виводу,\nнаписаний Джоном Ліндґреном у 2009–2012 роках.\n\nНЕ ВИМИКАЙТЕ."
+msgstr ""
+"Плаґін файлового вводу-виводу,\n"
+"написаний Джоном Ліндґреном у 2009–2012 роках.\n"
+"\n"
+"НЕ ВИМИКАЙТЕ."
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr "Плаґін файлового вводу-виводу"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr "Видалення голосу"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3627,46 +4293,76 @@
 "Håvard Kvålen <havardk@xmms.org>\n"
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
-msgstr "Декодер Ogg Vorbis\n\nна основі плаґіну від Xiph.org Foundation:\nhttp://www.xiph.org/\n\nАвтор початкового коду —\nTony Arcieri <bascule@inferno.tusculum.edu>\n\nУ розробці брали участь:\nChris Montgomery <monty@xiph.org>\nPeter Alm <peter@xmms.org>\nMichael Smith <msmith@labyrinth.edu.au>\nJack Moffitt <jack@icecast.org>\nJorn Baayen <jorn@nl.linux.org>\nHåvard Kvålen <havardk@xmms.org>\nGian-Carlo Pascutto <gcp@sjeng.org>\nEugene Zagidullin <e.asphyx@gmail.com>"
+msgstr ""
+"Декодер Ogg Vorbis\n"
+"\n"
+"на основі плаґіну від Xiph.org Foundation:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Автор початкового коду —\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"У розробці брали участь:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr "Декодер Ogg Vorbis"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
-msgstr "Відтворювач файлів Vortex Сашнова Олександра <sashnov@ngs.ru>.\nЗа основу взято in_vtx.dll Романа Щербакова <v_soft@microfor.ru>.\n\nПлаґін для Audacious створив Павел Виметалек <pvymetalek@seznam.cz>."
+msgstr ""
+"Відтворювач файлів Vortex Сашнова Олександра <sashnov@ngs.ru>.\n"
+"За основу взято in_vtx.dll Романа Щербакова <v_soft@microfor.ru>.\n"
+"\n"
+"Плаґін для Audacious створив Павел Виметалек <pvymetalek@seznam.cz>."
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr "Декодер VTX"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr "зі втратами (гібрид)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr "зі втратами"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
-msgstr "Автор — Вільям Піткок <nenolod@nenolod.net> (2006 рік).\n\nДеякий код написав Майлс Еґан."
+msgstr ""
+"Автор — Вільям Піткок <nenolod@nenolod.net> (2006 рік).\n"
+"\n"
+"Деякий код написав Майлс Еґан."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr "Декодер WavPack"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr "Декодер 2SF"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML-списки відтворення (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - вибір файлу"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "Сортувати _вибране"

audacious-plugins-3.3.4.tar.bz2/po/zh_CN.po -> audacious-plugins-3.4.2.tar.bz2/po/zh_CN.po Changed

@@ -1,593 +1,597 @@
 # Chinese (simplified) translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Chasye <chasye@gmail.com>, 2010.
-# <ganweiliang886@gmail.com>, 2012.
-# <runningwaterpro@gmail.com>, 2012.
+# Chasye <chasye@gmail.com>, 2010
+# yinsigan <ganweiliang886@gmail.com>, 2012
+# Luke <runningwaterpro@gmail.com>, 2012
+# sd542927172 <sd542927172@live.cn>, 2013
+# zhangmin <zm1990s@gmail.com>, 2013
+# 4679kun <btchina@live.com>, 2013
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-16 23:46+0000\n"
-"Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: Chinese (simplified)\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-14 07:15+0000\n"
+"Last-Translator: 4679kun <btchina@live.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
+"audacious/language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "单声道"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "立体声"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "环绕声"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
 msgstr ""
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "闹钟"
 
-#: src/alarm/interface.c:39
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
+msgstr ""
+
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+
+#: src/alarm/interface.c:81
 msgid "This is your wakeup call."
 msgstr "此为起床闹钟"
 
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "确定"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr ""
 
-#: src/alarm/interface.c:220
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "提醒器"
+
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "星期一"
+
+#: src/alarm/interface.c:140
+msgid "Tuesday"
+msgstr "星期二"
+
+#: src/alarm/interface.c:140
+msgid "Wednesday"
+msgstr "星期三"
+
+#: src/alarm/interface.c:141
+msgid "Thursday"
+msgstr "星期四"
+
+#: src/alarm/interface.c:141
+msgid "Friday"
+msgstr "星期五"
+
+#: src/alarm/interface.c:141
+msgid "Saturday"
+msgstr "星期六"
+
+#: src/alarm/interface.c:141
+msgid "Sunday"
+msgstr "星期日"
+
+#: src/alarm/interface.c:175
 msgid "Alarm Settings"
 msgstr "闹钟设置"
 
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
 msgid "Time"
 msgstr "时间"
 
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "小时"
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "响闹钟(默认)："
 
-#: src/alarm/interface.c:332
+#: src/alarm/interface.c:216
 msgid "h"
 msgstr "点"
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "分"
-
-#: src/alarm/interface.c:376
+#: src/alarm/interface.c:220
 msgid "Quiet after:"
 msgstr "静音时间："
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "响闹钟(默认)："
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "小时"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "分"
 
-#: src/alarm/interface.c:404
+#: src/alarm/interface.c:255
 msgid "Choose the days for the alarm to come on"
 msgstr "选择响闹钟的日期"
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "默认"
-
-#: src/alarm/interface.c:745
+#: src/alarm/interface.c:262
 msgid "Day"
 msgstr "日期"
 
-#: src/alarm/interface.c:761
-msgid "Tuesday"
-msgstr "週二"
-
-#: src/alarm/interface.c:770
-msgid "Wednesday"
-msgstr "週三"
-
-#: src/alarm/interface.c:779
-msgid "Thursday"
-msgstr "週四"
-
-#: src/alarm/interface.c:788
-msgid "Friday"
-msgstr "週五"
-
-#: src/alarm/interface.c:797
-msgid "Saturday"
-msgstr "週末"
-
-#: src/alarm/interface.c:806
-msgid "Sunday"
-msgstr "週日"
-
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "週一"
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "默认"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "日期"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
-msgstr "渐退"
+msgstr "渐隐"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "秒"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "音量"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "当前"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "开始于"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "完成于"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "当前"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
-msgstr "附加指令"
+msgstr "附加命令"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "启用"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "播放列表(可选)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
 msgstr ""
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "提醒器"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
 msgstr "使用提醒器"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "选项"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
-msgstr "这些选项有什么用？"
-
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
+msgstr "这些选项代表什么？"
 
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "帮助"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "取消"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "你今天的提醒器是.."
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "谢谢"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
 msgstr ""
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "默认PCM设备"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "默认混音设备"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA输出插件首选项"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
 msgstr "PCM设备："
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
 msgstr "混音设备"
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
 msgstr "混音单元："
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr ""
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
-
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
 msgstr "未选择MIDI回放用的音序器，你可在MIDI插件首选项中设置。"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr ""
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "ALSA后端"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "此后端将发送MIDI事件到用户选中的ALSA合成器端口。ALSA合成器接口是相当多用途的，它可以使用声卡上的硬件合成器(如：emu10k1)，同时亦可以使用软合成器，外置设备等。\n此后端并不生成音频，MIDI事件会直接由ALSA端口后面的设备或程序处理。假如，MIDI事件发送到硬件合成器会被直接播放。\n作者：Giacomo Lozito."
+msgstr ""
+"此后端将发送MIDI事件到用户选中的ALSA合成器端口。ALSA合成器接口是相当多用途"
+"的，它可以使用声卡上的硬件合成器(如：emu10k1)，同时亦可以使用软合成器，外置设"
+"备等。\n"
+"此后端并不生成音频，MIDI事件会直接由ALSA端口后面的设备或程序处理。假如，MIDI"
+"事件发送到硬件合成器会被直接播放。\n"
+"作者：Giacomo Lozito."
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "FluidSynth后端"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "端口"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "客户端名"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "端口名"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "ALSA输出端口"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
 msgstr "声卡："
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
 msgstr "混音控制器："
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "混音器设置"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
 msgstr "ALSA后端"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - 后端信息"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "选择后端"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "回放设置"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
 msgstr ""
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "高级选项"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "预先计算在播放列表中的MIDI文件长度"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "如果可用，从MIDI文件释放备注"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "如果可用，从MIDI文件释放歌词"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - 选择文件"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
-msgstr ""
+msgstr "AMIDI 插件设置"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - 选择SoundFont文件"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "SoundFont设置"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "文件名"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "大小(bytes)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "播放器启动时加载SF"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "合成器设置"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "增益"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "使用默认设置"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
 msgstr "值："
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "回音"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "是"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "否"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "合唱"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "取样率"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 赫兹"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 赫兹"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 赫兹"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "自定"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "赫兹"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
 msgstr "FluidSynth后端"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
 msgstr "名称："
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " MIDI 信息 "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
 msgstr "格式："
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
 msgstr "长度(毫秒)："
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
 msgstr "变体"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI备注与歌词"
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* MIDI文件不包含备注 *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* MIDI文件不包含歌词 *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (非法的UTF-8编码)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
 msgstr ""
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -651,7 +655,9 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "播放同一文件时，标题发生改变时触发OSD。\n播放网络媒体时会经常碰到。"
+msgstr ""
+"播放同一文件时，标题发生改变时触发OSD。\n"
+"播放网络媒体时会经常碰到。"
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -783,8 +789,11 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "未检测到混合管理器；\nOSD无法正常工作，除非你激活混合管理器。"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"未检测到混合管理器；\n"
+"OSD无法正常工作，除非你激活混合管理器。"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -847,47 +856,47 @@
 msgid "Misc"
 msgstr "其它"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
 msgstr ""
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
 msgstr ""
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
 msgstr ""
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
 msgstr ""
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
 msgstr ""
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
 msgstr ""
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "预置:"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -899,231 +908,232 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
-msgstr ""
+msgstr "设备"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
-msgstr ""
+msgstr "读取速度："
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
-msgstr ""
+msgstr "Metadata"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
-msgstr ""
+msgstr "使用 CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "使用HTTP代替CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
-msgstr ""
+msgstr "服务器："
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
-msgstr ""
+msgstr "路径："
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
-msgstr ""
+msgstr "端口："
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "音频CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "设备为空"
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "未支持光盘类型"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "播放CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "添加CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
 msgstr ""
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
 msgstr ""
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
 msgstr "中间音量："
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
 msgstr "动态范围："
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
 msgstr ""
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "游戏机音乐解码器"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "常规"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "回放"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "低音："
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "秒"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "高音："
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
 msgstr "默认歌曲长度："
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "重采样"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "启用音频重采样"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "采样率："
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
-msgstr ""
+msgstr "赫兹"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr ""
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "忽略SPC标签显示的长度"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "延长余响"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
 msgstr "默认歌曲长度（单位：秒），用于本身不提供长度信息的文件（如：循环音轨)"
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1133,74 +1143,76 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
 msgstr ""
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
 msgstr ""
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
 msgstr ""
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
 msgstr ""
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
 msgstr ""
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
 msgstr ""
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
@@ -1208,11 +1220,11 @@
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1222,7 +1234,7 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
 msgstr ""
 
@@ -1304,11 +1316,13 @@
 msgid "Joint Stereo"
 msgstr "联合立体声"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "立体声"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "单声道"
 
@@ -1326,7 +1340,7 @@
 
 #: src/filewriter/mp3.c:765
 msgid "(Hz)"
-msgstr ""
+msgstr "（赫兹）"
 
 #: src/filewriter/mp3.c:772
 msgid "Bitrate / Compression ratio:"
@@ -1356,7 +1370,7 @@
 msgid "Error protection"
 msgstr "错误保护"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "质量"
 
@@ -1436,19 +1450,19 @@
 msgid "Tags"
 msgstr "标签"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis编码器设置"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
 msgstr "质量等级(0-10)："
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1456,21 +1470,37 @@
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
 msgstr ""
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+msgstr ""
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr ""
+
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
@@ -1478,499 +1508,542 @@
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
 msgstr ""
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "序号"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "标题"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "艺术家"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "年份"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "专辑"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "音轨"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
-msgstr ""
+msgstr "流派"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "队列位置"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "长度"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "文件路径"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "文件名"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "自定标题"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "比率"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "揀选列"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
 msgstr "可用："
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
 msgstr "选项："
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "面板在左"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "面板在右"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "面板在上"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "面板在下"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "无面板"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "禁用"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "打开文件(_O) ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
 msgstr "打开URL(_U)..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "添加文件"
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
 msgstr "添加URL(_R)..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
 msgstr ""
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "关于(_b)"
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "首选项(_P)..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "暂停(_e)"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "上一首(_v)"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "下一首(_N)"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "重复(_R)"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "随机(_h)"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "禁止自动播放下一首(_o)"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "完成后停止(_A)"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr ""
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "歌曲信息(_I)..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "跳到时间(_T)..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "跳到歌曲(_J)..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "按音轨序号(_N)"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr ""
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr ""
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "按标题(_T)"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr ""
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr ""
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "按音轨序号(_N)"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "按艺术家(_A)"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "按专辑(_l)"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr ""
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "按发表日期(_D)"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr ""
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "按文件路径(_F)"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "按自定义标题(_C)"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "反转(_e)"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "随机(_R)"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
 msgstr ""
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "刷新(_R)"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "移除无效文件"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "排序已选中的"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr ""
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "移除无效文件"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "新建(_N)"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "导入(_I)..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
 msgstr "导出(_E)..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "队列管理器(_Q)..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "调高音量(_U)"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "调低音量(_D)"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "均衡器(_E)"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "音效(_f)"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "界面(_I)"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "可视化"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "显示菜单(_M)"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "显示信息区域(_n)"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "显示状态栏(_S)"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
 msgstr ""
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "显示表头(_H)"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
 msgstr "揀选列(_C)..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "歌曲改变时滚动(_l)"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "文件(_F)"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "回放(_P)"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "播放列表(_l)"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "服务(_S)"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "输出(_O)"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "外观(_V)"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
 msgstr "入队／出列(_Q)"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "剪切(_t)"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "选中全部(_A)"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "GTK界面"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
-msgstr ""
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "缓冲中..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
-msgstr ""
+msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "错误"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d声道"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
-msgstr ""
+msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
-msgstr "上一首"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
+msgstr ""
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "播放"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
 msgstr "暂停/继续"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "停止"
 
+#: src/hotkey/gui.c:74
+msgid "Next track"
+msgstr ""
+
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
+msgstr ""
+
 #: src/hotkey/gui.c:76
-msgid "Next Track"
-msgstr "下一首"
+msgid "Rewind 5 seconds"
+msgstr ""
 
 #: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
-msgstr "快进5秒"
+msgid "Mute"
+msgstr "静音"
 
 #: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
-msgstr "快退5秒"
+msgid "Volume up"
+msgstr ""
 
 #: src/hotkey/gui.c:79
-msgid "Mute"
-msgstr "静音"
+msgid "Volume down"
+msgstr ""
 
 #: src/hotkey/gui.c:80
-msgid "Volume Up"
-msgstr "调高音量"
+msgid "Jump to file"
+msgstr ""
 
 #: src/hotkey/gui.c:81
-msgid "Volume Down"
-msgstr "调低音量"
+msgid "Toggle player window(s)"
+msgstr ""
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
-msgstr "跳到文件"
+#: src/hotkey/gui.c:82
+msgid "Show On-Screen-Display"
+msgstr "显示On-Screen-Display"
 
 #: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
+msgid "Toggle repeat"
 msgstr ""
 
 #: src/hotkey/gui.c:84
-msgid "Show On-Screen-Display"
-msgstr "显示On-Screen-Display"
+msgid "Toggle shuffle"
+msgstr ""
 
 #: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
-msgstr "重复"
+msgid "Toggle stop after current"
+msgstr ""
 
 #: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
-msgstr "随机"
-
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
+msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(无)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
 msgstr "并不建议绑定鼠标主键。要继续吗？"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "绑定鼠标按键"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "全局热键插件设置"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr "请在文本区按下要绑定的组合键，你亦可以绑定鼠标键"
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
 msgstr "热键："
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
 msgstr "动作："
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
 msgstr "键位绑定："
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1985,11 +2058,11 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
@@ -1997,62 +2070,64 @@
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
 msgstr ""
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s 设置"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "LADSPA主机设置"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
 msgstr "模块路径："
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
 msgstr ""
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
 msgstr "可用插件："
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "启用"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
 msgstr "已启用插件："
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "设置"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
 msgstr ""
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
 msgstr ""
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
@@ -2060,27 +2135,27 @@
 "%s: how to create a proper config file\n"
 msgstr ""
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
 msgstr ""
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
 msgstr ""
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
 msgstr ""
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
 msgstr ""
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2096,67 +2171,67 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
 msgstr ""
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
 msgstr ""
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
 msgstr ""
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
 msgstr ""
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2165,84 +2240,218 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
 msgstr ""
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
 msgstr "输出通道："
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
 msgstr ""
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr ""
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr ""
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr ""
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr ""
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr ""
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr ""
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr ""
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "环绕音"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
 msgstr ""
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
 msgstr ""
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr ""
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "已停止"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
 msgstr "Audacious未开始播放"
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+msgstr ""
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr ""
+
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
 msgstr ""
 
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr ""
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "暂停"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "下一首"
+
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. 默认设备"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
 msgstr "音频设备："
 
@@ -2267,22 +2476,23 @@
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
 msgstr ""
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2302,159 +2512,199 @@
 "USA."
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
 msgstr ""
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
 msgstr ""
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
 msgstr ""
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
 msgstr ""
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
 msgstr "方法："
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
 msgstr ""
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
 msgstr ""
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
 msgstr ""
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
 msgstr ""
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
 msgstr ""
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "修改密码"
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr ""
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "服务"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr ""
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
 msgstr ""
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "用户名："
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr ""
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "密码："
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr ""
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
 msgstr ""
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:233
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.c:311
+msgid ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/sdlout/plugin.c:27
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
+msgstr ""
+
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
 msgstr ""
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "库"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
 msgstr ""
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
 msgstr ""
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
 msgstr ""
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
 msgstr[0] ""
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2464,7 +2714,7 @@
 " %s, %d songs"
 msgstr[0] ""
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2474,73 +2724,73 @@
 " %d songs by %s"
 msgstr[0] ""
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "创建播放列表"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
 msgstr "添加到播放列表"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "搜索库"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr ""
+msgstr "要将您的音乐库导入Audacious，选择一个文件夹，然后点击“刷新”图标。"
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "请稍等...."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "选择文件夹"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
 msgstr ""
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
 msgstr "播放器(_P)："
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
 msgstr "选择主界面字体"
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
 msgstr "播放列表(_P)："
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
 msgstr "选择播放列表字体："
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "字体(_F)"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "使用点阵字体（仅支持ASCII字符）"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "来回滚动歌曲标题"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "主题(_S)"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "界面设置"
 
@@ -2596,775 +2846,786 @@
 msgid "Presets"
 msgstr "预设"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "载入预设"
 
 #: src/skins/ui_equalizer.c:988
 msgid "Load auto-preset"
-msgstr ""
+msgstr "载入自动载入预设"
 
 #: src/skins/ui_equalizer.c:1018 src/skins/ui_equalizer.c:1036
 #: src/skins/ui_equalizer.c:1052
 msgid "Load equalizer preset"
 msgstr "加载均衡器预置"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "保存预设"
 
 #: src/skins/ui_equalizer.c:1087
 msgid "Save auto-preset"
-msgstr ""
+msgstr "保存自动加载预设"
 
 #: src/skins/ui_equalizer.c:1118 src/skins/ui_equalizer.c:1154
 msgid "Save equalizer preset"
 msgstr "保存均衡器预置"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "删除预设"
 
 #: src/skins/ui_equalizer.c:1190
 msgid "Delete auto-preset"
-msgstr ""
+msgstr "删除自动加载预设"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
-msgstr ""
+msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "千赫兹"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr "查找： %d:%-2.2d/%d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
 msgstr "音量：%d%%"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
 msgstr "平衡：%d%% 左"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
 msgstr "平衡：中间"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
 msgstr "平衡：%d%% 右"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "选项菜单"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "禁用“顶置窗口”"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "启用“顶置窗口”"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "文件信息"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "可视化菜单"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "单一窗口模式"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "播放列表模式"
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
 msgstr "完成后停止"
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
 msgstr "完成后不停止"
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
 msgstr ""
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "完成当前歌曲后停止"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "峰值"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "重复"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "随机"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "禁止自动播放下一首"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "显示播放器"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "显示播放列表编辑器"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "显示均衡器"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "顶置窗口"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "所有工作区可见"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "收起播放器"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "收起播放列表编辑器"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "收起均衡器"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "分析器"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "示波器"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "声纹"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "关闭"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "一般"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "火炎"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "垂线"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "细线"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "柱状"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "点状"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "线状"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "块状"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "冷蓝"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "平滑"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "最慢"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "慢"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "中速"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "快"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "最快"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "已用时间"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "剩余时间"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "暂停"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "上一首"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "下一首"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "可视化效果"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "可视化模式"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "分析器模式"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "示波器模式"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "声纹模式"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "窗口渲染VU模式"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "分析器减退速度"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "峰值减退速度"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "播放列表"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
 msgstr ""
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "新建播放列表"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "前一个播放列表"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "下一下播放列表"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "删除播放列表"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "导入播放列表"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
 msgstr "把列表加载到被选中的播放列表。"
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "导出播放列表"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "保存被选中的播放列表"
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "刷新列表"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
 msgstr "刷新播放列表的歌曲信息"
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "播放列表管理器"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "列表管理器"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "外观"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "界面"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "界面设置..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "添加网络地址..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "添加远程文件到播放列表"
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "添加文件..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "添加文件到播放列表。"
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "搜索/选择"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
 msgstr "在列表中搜索并选择符合条件的条目"
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "反选"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
 msgstr "反转被选中与未被选中的条目"
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "选中全部"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "选中播放列表中的所有条目。"
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "取消选中"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "取消对播放列表的选择"
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "清空"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "清空播放列表中的所有条目。"
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "清空队列"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
 msgstr "清空此列表中的队列"
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "删除不可用文件"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "从播放列表中删除不可用文件"
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "删除重复的条目"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "按标题"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
 msgstr "根据标题删除重复的条目"
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "根据文件名"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
 msgstr "根据文件名删除重复的条目"
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "根据路径和文件名"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
 msgstr "根据文件的完整路径删除重复条目"
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "删除未被选中的"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
 msgstr "删除播放列表中未被选中的条目。"
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "删除已选中的"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
 msgstr "删除播放列表中已选中的条目。"
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "打乱列表"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "播放列表随机"
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "反转列表"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "反转播放列表"
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "排序列表"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "按标题"
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "按专辑"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "按专辑"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "按艺术家"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "按艺术家"
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "按文件名"
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "按完整路径"
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "按日期"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "按修改时间"
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "按音轨号码"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "按音轨序号"
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "排序已选中的"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "文件"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "插件服务"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "查看音轨信息"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "查看音轨信息"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "关于Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "播放文件"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "加载并播放文件"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "播放位置"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "播放被选中位置的文件"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "插件服务"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "首选项"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "打开首选项窗口"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "退出Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "设置A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "清空A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "跳到文件"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "跳到时间"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "队列切换"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
 msgstr "启用/禁用播放队列的条目"
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "复制"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "剪切"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "粘贴"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "载入"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "导入"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "保存"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "删除"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "预设"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "自动载入预设"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "载入自动载入预设"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "将默认预设载入到均衡器"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "零"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "将均衡器的预设等级设置为零"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "从文件加载"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "从文件加载预设"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "从WinAMP EQF文件加载"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "从WinAMP EQF文件加载预设"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP 预设"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "导入WinAMP预设"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "保存自动加载预设"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "保存默认预设"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "保存到文件"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "保存预设到文件"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "保存到WinAMP EQF文件"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "保存预设到WinAMP EQF文件"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "删除自动加载预设"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "从当前播放列表中搜索条目"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
-msgstr "按部分字段搜索播放列表中的条目。各个字段都可以使用正则表达式，而且是不分大小字的。如果你不知道何为正则表达式，简单的输入部分你想搜索的文字亦可。"
+msgstr ""
+"按部分字段搜索播放列表中的条目。各个字段都可以使用正则表达式，而且是不分大小"
+"字的。如果你不知道何为正则表达式，简单的输入部分你想搜索的文字亦可。"
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
 msgstr "标题："
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
 msgstr "专辑："
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
 msgstr "艺术家："
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
 msgstr "文件名"
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
 msgstr "搜索前清空之前的结果"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
 msgstr "自动为区配条目切换队列"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
 msgstr "用匹配的条目创建新的播放列表"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Audacious播放列表编辑器"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
-msgstr ""
+msgstr "%s (%d of %d)"
 
 #: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
@@ -3379,81 +3640,97 @@
 msgid "Could not create directory (%s): %s\n"
 msgstr "无法创建目录(%s)：%s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
 msgstr ""
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 msgstr ""
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
 msgstr ""
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
 msgstr ""
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
 msgstr ""
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
 msgstr ""
 
-#: src/song_change/song_change.c:56
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "确定"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "取消"
+
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "歌曲改变"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "歌曲开始播放时执行指令。"
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
 msgstr "指令："
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "歌曲即将完成时执行指令。"
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "当Audacious播放到列表结尾时执行指令。"
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
 msgstr "歌曲的标题改变时执行指令(如：网络媒体的标题)。"
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3472,33 +3749,68 @@
 "%T: Track title"
 msgstr ""
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "传递到Shell的参数一定要用引号包围，否则会是一件相当危险的事。"
+msgstr ""
+"传递到Shell的参数一定要用引号包围，否则会是一件相当危险的"
+"事。"
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "指令"
 
-#: src/speed-pitch/speed-pitch.c:227
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr ""
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/speed-pitch/speed-pitch.c:225
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3509,63 +3821,63 @@
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "调整音量"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "改变歌曲"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
 msgstr ""
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "禁用弹出窗口"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
 msgstr ""
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
-msgstr ""
+msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
 msgstr ""
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3574,11 +3886,11 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
 msgstr ""
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
@@ -3586,15 +3898,15 @@
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
 msgstr ""
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3615,44 +3927,47 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
 msgstr ""
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
 msgstr ""
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
 msgstr ""
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
 msgstr ""
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - 选择文件"

audacious-plugins-3.3.4.tar.bz2/po/zh_TW.po -> audacious-plugins-3.4.2.tar.bz2/po/zh_TW.po Changed

@@ -1,591 +1,659 @@
 # Chinese (traditional) translation for Audacious Plugins
 # Copyright (C) Audacious translators
 # This file is distributed under the same license as the Audacious Plugins package.
-# 
+#
 # Translators:
-# Ruei-Yuan Lu <RueiYuan.Lu@gmail.com>, 2011.
+# Ruei-Yuan Lu <RueiYuan.Lu@gmail.com>, 2011
 msgid ""
 msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
+"Project-Id-Version: Audacious Plugins Plugins Plugins Plugins\n"
 "Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2013-02-03 18:55+0100\n"
-"PO-Revision-Date: 2012-12-16 23:46+0000\n"
+"POT-Creation-Date: 2013-11-01 16:34+0100\n"
+"PO-Revision-Date: 2013-05-16 12:36+0000\n"
 "Last-Translator: Radioactiveman <thomas-lange2@gmx.de>\n"
-"Language-Team: Chinese (traditional)\n"
+"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
+"audacious/language/zh_TW/)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:105 src/skins/ui_main.c:456
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:104 src/skins/ui_main.c:430
 msgid "mono"
 msgstr "單聲道"
 
-#: src/aac/libmp4.c:440 src/gtkui/ui_statusbar.c:107 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/gtkui/ui_statusbar.c:106 src/skins/ui_main.c:429
 msgid "stereo"
 msgstr "立體聲"
 
-#: src/aac/libmp4.c:440 src/skins/ui_main.c:455
+#: src/aac/libmp4.c:439 src/skins/ui_main.c:429
 msgid "surround"
 msgstr "環繞"
 
-#: src/aac/libmp4.c:931
+#: src/aac/libmp4.c:930
 msgid "AAC Decoder"
-msgstr ""
+msgstr "AAC 解碼器"
 
-#: src/adplug/adplug-xmms.cc:151 src/modplug/modplugbmp.cxx:467
-#: src/psf/plugin.c:126 src/vtx/vtx.c:68 src/xsf/plugin.c:86
+#: src/adplug/adplug-xmms.cc:147 src/modplug/modplugbmp.cxx:407
+#: src/psf/plugin.c:124 src/vtx/vtx.c:69 src/xsf/plugin.c:85
 msgid "sequenced"
-msgstr ""
+msgstr "編曲機"
 
-#: src/adplug/plugin.c:16
+#: src/adplug/plugin.c:14
 msgid "AdPlug (AdLib Player)"
-msgstr ""
+msgstr "AdPlug (AdLib 播放器)"
 
-#: src/alarm/alarm.c:831
+#: src/alarm/alarm.c:809
 msgid ""
 "A plugin that can be used to start playing at a certain time.\n"
 "\n"
 "Originally written by Adam Feakin and Daniel Stodden."
 msgstr ""
+"您可以使用此外掛在特定時間播放。\n"
+"\n"
+"Originally written by Adam Feakin and Daniel Stodden."
 
-#: src/alarm/alarm.c:836 src/alarm/interface.c:32
+#: src/alarm/alarm.c:814 src/alarm/interface.c:82
 msgid "Alarm"
 msgstr "鬧鐘"
 
-#: src/alarm/interface.c:39
-msgid "This is your wakeup call."
+#: src/alarm/interface.c:28
+msgid ""
+"Time\n"
+" Alarm at:\n"
+" The time for the alarm to come on.\n"
+"\n"
+" Quiet after:\n"
+" Stop alarm after this amount of time.\n"
+" (if the wakeup dialog is not closed)\n"
+"\n"
+"\n"
+"Days\n"
+" Day:\n"
+" Select the days for the alarm to activate.\n"
+"\n"
+" Time:\n"
+" Choose the time for the alarm on each day,\n"
+" or select the toggle button to use the default\n"
+" time.\n"
+"\n"
+"\n"
 msgstr ""
+"時間\n"
+" 鈴響於：\n"
+" 鬧鐘的觸發時間。\n"
+"\n"
+" 多久後靜音：\n"
+" 鈴響的時間長度。\n"
+" (若喚醒的對話視窗未被關閉)\n"
+"\n"
+"\n"
+"週排程\n"
+" 哪幾天：\n"
+" 選擇哪幾天要啟用鬧鐘。\n"
+"\n"
+" 時間：\n"
+" 選擇每天的鬧鐘時間，\n"
+" 或者勾選使用預設值。\n"
+"\n"
+"\n"
 
-#: src/alarm/interface.c:54 src/alarm/interface.c:1180 src/sndio/sndio.c:433
-msgid "OK"
-msgstr "確認"
-
-#: src/alarm/interface.c:220
-msgid "Alarm Settings"
-msgstr "鬧鐘設定"
-
-#: src/alarm/interface.c:235 src/alarm/interface.c:396
-#: src/alarm/interface.c:753
-msgid "Time"
-msgstr "時間"
-
-#: src/alarm/interface.c:275
-msgid "hours"
-msgstr "小時"
-
-#: src/alarm/interface.c:332
-msgid "h"
+#: src/alarm/interface.c:45
+msgid ""
+"Volume\n"
+" Fading:\n"
+" Fade the volume up to the chosen volume\n"
+" for this amount of time.\n"
+"\n"
+" Start at:\n"
+" Start fading from this volume.\n"
+"\n"
+" Final:\n"
+" The volume to stop fading at. If the fading\n"
+" time is 0 then set volume to this and start\n"
+" playing.\n"
+"\n"
+"\n"
+"Options:\n"
+" Additional Command:\n"
+" Run this command at the alarm time.\n"
+"\n"
 msgstr ""
+"音量\n"
+" 淡入：\n"
+" 在指定的時間內將音量\n"
+" 漸漸提升到指定的音量。\n"
+"\n"
+" 初始音量：\n"
+" 從此音量開始淡入。\n"
+"\n"
+" 最終音量：\n"
+" 音量淡入的終點。若淡\n"
+" 入的時間長為零則直\n"
+" 接使用此音量開始播放。\n"
+"\n"
+"\n"
+"選項：\n"
+" 額外的命令：\n"
+" 鬧鐘觸發時執行這個指令。\n"
+"\n"
 
-#: src/alarm/interface.c:360
-msgid "minutes"
-msgstr "分鐘"
-
-#: src/alarm/interface.c:376
-msgid "Quiet after:"
-msgstr "多久後靜音:"
+#: src/alarm/interface.c:62
+msgid ""
+" Playlist:\n"
+" Load this playlist. If no playlist\n"
+" is given, the current one will be used.\n"
+" The URL of an mp3/ogg stream\n"
+" can also be entered here.\n"
+"\n"
+" Reminder:\n"
+" Display a reminder when the alarm goes off.\n"
+" Type the reminder in the box and turn on the\n"
+" toggle button if you want it to be shown."
+msgstr ""
+" 播放清單：\n"
+" 載入該播放清單。若未指定\n"
+" 則會直接採用目前的清單。\n"
+" 您也可以在此輸入 mp3/ogg\n"
+" 串流的網址。\n"
+"\n"
+" 提醒：\n"
+" 當觸發鬧鐘時顯示提醒訊息。\n"
+" 若您希望它被顯示，請勾選並在欄\n"
+" 位中輸入訊息。"
 
-#: src/alarm/interface.c:386
-msgid "Alarm at (default):"
-msgstr "鈴響於 (預設)"
+#: src/alarm/interface.c:81
+msgid "This is your wakeup call."
+msgstr "這是您的喚醒。"
 
-#: src/alarm/interface.c:404
-msgid "Choose the days for the alarm to come on"
-msgstr "選擇想要在哪幾天啟用鬧鐘"
+#: src/alarm/interface.c:99
+msgid "Your reminder for today is..."
+msgstr "您今天的提醒"
 
-#: src/alarm/interface.c:431 src/alarm/interface.c:477
-#: src/alarm/interface.c:523 src/alarm/interface.c:569
-#: src/alarm/interface.c:615 src/alarm/interface.c:661
-#: src/alarm/interface.c:707 src/bs2b/plugin.c:179
-#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:457
-#: src/skins/ui_manager.c:478
-msgid "Default"
-msgstr "預設"
+#: src/alarm/interface.c:101 src/alarm/interface.c:415
+msgid "Reminder"
+msgstr "提醒"
 
-#: src/alarm/interface.c:745
-msgid "Day"
-msgstr "日子"
+#: src/alarm/interface.c:140
+msgid "Monday"
+msgstr "星期一"
 
-#: src/alarm/interface.c:761
+#: src/alarm/interface.c:140
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/alarm/interface.c:770
+#: src/alarm/interface.c:140
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/alarm/interface.c:779
+#: src/alarm/interface.c:141
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/alarm/interface.c:788
+#: src/alarm/interface.c:141
 msgid "Friday"
 msgstr "星期五"
 
-#: src/alarm/interface.c:797
+#: src/alarm/interface.c:141
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/alarm/interface.c:806
+#: src/alarm/interface.c:141
 msgid "Sunday"
 msgstr "星期日"
 
-#: src/alarm/interface.c:814
-msgid "Monday"
-msgstr "星期一"
+#: src/alarm/interface.c:175
+msgid "Alarm Settings"
+msgstr "鬧鐘設定"
+
+#: src/alarm/interface.c:186 src/alarm/interface.c:250
+#: src/alarm/interface.c:265
+msgid "Time"
+msgstr "時間"
+
+#: src/alarm/interface.c:193
+msgid "Alarm at (default):"
+msgstr "鈴響於 (預設)"
+
+#: src/alarm/interface.c:216
+msgid "h"
+msgstr "h"
+
+#: src/alarm/interface.c:220
+msgid "Quiet after:"
+msgstr "多久後靜音："
+
+#: src/alarm/interface.c:234
+msgid "hours"
+msgstr "小時"
+
+#: src/alarm/interface.c:246
+msgid "minutes"
+msgstr "分鐘"
+
+#: src/alarm/interface.c:255
+msgid "Choose the days for the alarm to come on"
+msgstr "選擇想要在哪幾天啟用鬧鐘"
 
-#: src/alarm/interface.c:823
+#: src/alarm/interface.c:262
+msgid "Day"
+msgstr "哪幾天"
+
+#: src/alarm/interface.c:280 src/bs2b/plugin.c:177
+#: src/skins/ui_equalizer.c:1108 src/skins/ui_manager.c:456
+#: src/skins/ui_manager.c:477
+msgid "Default"
+msgstr "預設"
+
+#: src/alarm/interface.c:310
 msgid "Days"
 msgstr "週排程"
 
-#: src/alarm/interface.c:839
+#: src/alarm/interface.c:319
 msgid "Fading"
 msgstr "淡出"
 
-#: src/alarm/interface.c:876 src/crossfade/crossfade.c:263 src/lirc/lirc.c:416
+#: src/alarm/interface.c:327 src/crossfade/crossfade.c:261 src/lirc/lirc.c:397
 msgid "seconds"
 msgstr "秒"
 
-#: src/alarm/interface.c:884 src/alarm/interface.c:999
+#: src/alarm/interface.c:334 src/alarm/interface.c:381
 msgid "Volume"
 msgstr "音量"
 
-#: src/alarm/interface.c:910
-msgid "Current"
-msgstr "目前音量"
-
-#: src/alarm/interface.c:918
+#: src/alarm/interface.c:339
 msgid "Start at"
 msgstr "初始音量"
 
-#: src/alarm/interface.c:946 src/alarm/interface.c:990
-msgid "%"
-msgstr "%"
-
-#: src/alarm/interface.c:962
+#: src/alarm/interface.c:357
 msgid "Final"
 msgstr "最終音量"
 
-#: src/alarm/interface.c:1015
+#: src/alarm/interface.c:372
+msgid "Current"
+msgstr "目前音量"
+
+#: src/alarm/interface.c:387
 msgid "Additional Command"
 msgstr "額外命令"
 
-#: src/alarm/interface.c:1041
+#: src/alarm/interface.c:393
 msgid "enable"
 msgstr "啟用"
 
-#: src/alarm/interface.c:1049
+#: src/alarm/interface.c:400
 msgid "Playlist (optional)"
 msgstr "播放清單 (選用)"
 
-#: src/alarm/interface.c:1075
+#: src/alarm/interface.c:407
 msgid "Select a playlist"
-msgstr ""
+msgstr "請選擇播放清單"
 
-#: src/alarm/interface.c:1085 src/alarm/interface.c:1250
-msgid "Reminder"
-msgstr "提醒"
-
-#: src/alarm/interface.c:1102
+#: src/alarm/interface.c:419
 msgid "Use reminder"
-msgstr "提醒命令"
+msgstr "提醒文字"
 
-#: src/alarm/interface.c:1118
+#: src/alarm/interface.c:428
 msgid "Options"
 msgstr "選項"
 
-#: src/alarm/interface.c:1126
+#: src/alarm/interface.c:433
 msgid "What do these options mean?"
 msgstr "這些選項代表什麼意思？"
 
-#: src/alarm/interface.c:1155
-msgid ""
-"\n"
-"Time\n"
-" Alarm at: \n"
-" The time for the alarm to come on.\n"
-"\n"
-" Quiet After: \n"
-" Stop alarm after this amount of time.\n"
-" (if the wakeup dialog is not closed)\n"
-"\n"
-"\n"
-"Days\n"
-" Day:\n"
-" Select the days for the alarm to activate.\n"
-"\n"
-" Time:\n"
-" Choose the time for the alarm on each day,\n"
-" or select the toggle button to use the default\n"
-" time.\n"
-"\n"
-"\n"
-"Volume\n"
-" Fading: \n"
-" Fade the volume up to the chosen volume \n"
-" for this amount of time.\n"
-"\n"
-" Start at: \n"
-" Start fading from this volume.\n"
-"\n"
-" Final: \n"
-" The volume to stop fading at. If the fading\n"
-" time is 0 then set volume to this and start\n"
-" playing.\n"
-"\n"
-"\n"
-"Options:\n"
-" Additional Command:\n"
-" Run this command at the alarm time.\n"
-"\n"
-" Playlist: \n"
-" Load this playlist for playing songs from.\n"
-" If no playlist is given, the songs which are\n"
-" currently in the list will be used.\n"
-" The URL of an mp3/ogg stream can also be\n"
-" entered here.\n"
-"\n"
-" Reminder:\n"
-" Display a reminder when the alarm goes off,\n"
-" type the reminder in the box and turn on the\n"
-" toggle button if you want it to be shown.\n"
-msgstr ""
-
-#: src/alarm/interface.c:1157 src/skins/ui_manager.c:390
+#: src/alarm/interface.c:447 src/skins/ui_manager.c:389
 msgid "Help"
 msgstr "說明"
 
-#: src/alarm/interface.c:1189 src/sndio/sndio.c:441
-msgid "Cancel"
-msgstr "取消"
-
-#: src/alarm/interface.c:1257
-msgid "Your reminder for today is.."
-msgstr "您今天的提醒"
-
-#: src/alarm/interface.c:1282
-msgid "Thankyou"
-msgstr "謝謝"
-
-#: src/albumart/albumart.c:101
+#: src/albumart/albumart.c:143
 msgid "Album Art"
-msgstr ""
+msgstr "專輯封面"
 
-#: src/alsa/config.c:210
+#: src/alsa/config.c:212
 msgid "Default PCM device"
 msgstr "預設 PCM 裝置"
 
-#: src/alsa/config.c:235
+#: src/alsa/config.c:241
 msgid "Default mixer device"
 msgstr "預設混音器裝置"
 
-#: src/alsa/config.c:433
+#: src/alsa/config.c:428
 msgid "ALSA Output Plugin Preferences"
 msgstr "ALSA 輸出外掛偏好設定"
 
-#: src/alsa/config.c:439
+#: src/alsa/config.c:434
 msgid "PCM device:"
-msgstr "PCM 裝置:"
+msgstr "PCM 裝置："
 
-#: src/alsa/config.c:441
+#: src/alsa/config.c:436
 msgid "Mixer device:"
-msgstr "混音器裝置:"
+msgstr "混音器裝置："
 
-#: src/alsa/config.c:443
+#: src/alsa/config.c:438
 msgid "Mixer element:"
-msgstr "混音器元件:"
+msgstr "混音器元件："
 
-#: src/alsa/config.c:446
+#: src/alsa/config.c:441
 msgid "Work around drain hangup"
 msgstr "處理欠載鎖死"
 
-#: src/alsa/plugin.c:27
+#: src/alsa/plugin.c:25
 msgid ""
 "ALSA Output Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose code served as a reference when the ALSA manual was not enough."
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 msgstr ""
+"ALSA Output Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"My thanks to William Pitcock, author of the ALSA Output Plugin NG, whose "
+"code served as a reference when the ALSA manual was not enough."
 
-#: src/alsa/plugin.c:34
+#: src/alsa/plugin.c:32
 msgid "ALSA Output"
-msgstr ""
-
-#: src/amidi-plug/amidi-plug.c:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
+msgstr "ALSA 輸出"
 
-#: src/amidi-plug/amidi-plug.c:270
+#: src/amidi-plug/amidi-plug.c:248
 msgid ""
 "You have not selected any sequencer ports for MIDI playback. You can do so "
 "in the MIDI plugin preferences."
-msgstr "您尚未選擇任何用於播放 MIDI 的編曲機連接埠。請到 MIDI 外掛偏好設定中設定。"
+msgstr ""
+"您尚未選擇任何用於播放 MIDI 的編曲機連接埠。請到 MIDI 外掛偏好設定中設定。"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:35
+#: src/amidi-plug/amidi-plug.c:708
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI 播放器)"
+
+#: src/amidi-plug/backend-alsa/b-alsa.c:38
 msgid "ALSA Backend "
 msgstr "ALSA 後端"
 
-#: src/amidi-plug/backend-alsa/b-alsa.c:37
+#: src/amidi-plug/backend-alsa/b-alsa.c:41
 msgid ""
-"This backend sends MIDI events to a group of user-chosen ALSA sequencer ports. The ALSA sequencer interface is very versatile, it can provide ports for audio cards hardware synthesizers (i.e. emu10k1) but also for software synths, external devices, etc.\n"
-"This backend does not produce audio, MIDI events are handled directly from devices/programs behind the ALSA ports; in example, MIDI events sent to the hardware synth will be directly played.\n"
+"This backend sends MIDI events to a group of user-chosen ALSA sequencer "
+"ports. The ALSA sequencer interface is very versatile, it can provide ports "
+"for audio cards hardware synthesizers (i.e. emu10k1) but also for software "
+"synths, external devices, etc.\n"
+"This backend does not produce audio, MIDI events are handled directly from "
+"devices/programs behind the ALSA ports; in example, MIDI events sent to the "
+"hardware synth will be directly played.\n"
 "Backend written by Giacomo Lozito."
-msgstr "這個後端會傳送 MIDI 事件到一組由使用者指定的 ALSA 編曲機連接埠。ALSA 編曲機介面有很多功能，它不但可以提供連接埠給音效卡上的硬體編曲機 (如 emu10k1) 還可以給軟體合成器與外接裝置等。\n\n這個後端本身並不產生音效，MIDI 事件直接由 ALSA 連接埠後的裝置或程式來處理；舉例來說，MIDI 事件被送到硬體合成器以後將會被直接播放。\n\n作者：Giacomo Lozito"
+msgstr ""
+"這個後端會傳送 MIDI 事件到一組由使用者指定的 ALSA 編曲機連接埠。ALSA 編曲機介"
+"面有很多功能，它不但可以提供連接埠給音效卡上的硬體編曲機 (如 emu10k1) 還可以"
+"給軟體合成器與外接裝置等。\n"
+"\n"
+"這個後端本身並不產生音效，MIDI 事件直接由 ALSA 連接埠後的裝置或程式來處理；舉"
+"例來說，MIDI 事件被送到硬體合成器以後將會被直接播放。\n"
+"\n"
+"作者：Giacomo Lozito"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:40
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:45
 msgid "FluidSynth Backend "
 msgstr "FluidSynth 後端"
 
-#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:42
+#: src/amidi-plug/backend-fluidsynth/b-fluidsynth.c:48
 msgid ""
-"This backend produces audio by sending MIDI events to FluidSynth, a real-time software synthesizer based on the SoundFont2 specification (www.fluidsynth.org).\n"
-"Produced audio can be manipulated via player effect plugins and is processed by chosen output plugin.\n"
+"This backend produces audio by sending MIDI events to FluidSynth, a real-"
+"time software synthesizer based on the SoundFont2 specification (www."
+"fluidsynth.org).\n"
+"Produced audio can be manipulated via player effect plugins and is processed "
+"by chosen output plugin.\n"
 "Backend written by Giacomo Lozito."
 msgstr ""
+"這個後端會將 MIDI 事件傳送給 FluidSynth 並產生音效，FluidSynth 是一個基於 "
+"SoundFont2 規格 (www.fluidsynth.org) 的即時軟體合成器。\n"
+"\n"
+"產生的音效會被播放器的特效外掛與輸出外掛影響。\n"
+"\n"
+"作者：Giacomo Lozito"
 
-#: src/amidi-plug/i_configure-alsa.c:322
+#: src/amidi-plug/i_configure-alsa.c:353
 msgid "Port"
 msgstr "連接埠"
 
-#: src/amidi-plug/i_configure-alsa.c:324
+#: src/amidi-plug/i_configure-alsa.c:355
 msgid "Client name"
 msgstr "客戶端名稱"
 
-#: src/amidi-plug/i_configure-alsa.c:326
+#: src/amidi-plug/i_configure-alsa.c:357
 msgid "Port name"
 msgstr "連接埠名稱"
 
-#: src/amidi-plug/i_configure-alsa.c:340
+#: src/amidi-plug/i_configure-alsa.c:371
 msgid "ALSA output ports"
 msgstr "ALSA 輸出埠"
 
-#: src/amidi-plug/i_configure-alsa.c:395
+#: src/amidi-plug/i_configure-alsa.c:432
 msgid "Soundcard: "
-msgstr "音效卡:"
+msgstr "音效卡："
 
-#: src/amidi-plug/i_configure-alsa.c:397
+#: src/amidi-plug/i_configure-alsa.c:434
 msgid "Mixer control: "
-msgstr "混音器控制器:"
+msgstr "混音器控制器："
 
-#: src/amidi-plug/i_configure-alsa.c:407
+#: src/amidi-plug/i_configure-alsa.c:444
 msgid "Mixer settings"
 msgstr "混音器設定"
 
-#: src/amidi-plug/i_configure-alsa.c:434
+#: src/amidi-plug/i_configure-alsa.c:472
 msgid ""
 "ALSA\n"
 "backend"
-msgstr "ALSA\n後端"
+msgstr ""
+"ALSA\n"
+"後端"
 
-#: src/amidi-plug/i_configure-ap.c:57
+#: src/amidi-plug/i_configure-ap.c:63
 msgid "AMIDI-Plug - backend information"
 msgstr "AMIDI-Plug - 後端資訊"
 
-#: src/amidi-plug/i_configure-ap.c:207
+#: src/amidi-plug/i_configure-ap.c:221
 msgid "Backend selection"
 msgstr "選擇後端"
 
-#: src/amidi-plug/i_configure-ap.c:247
+#: src/amidi-plug/i_configure-ap.c:261
 msgid "Playback settings"
 msgstr "播放設定"
 
-#: src/amidi-plug/i_configure-ap.c:252
+#: src/amidi-plug/i_configure-ap.c:266
 msgid "Transpose: "
-msgstr "移調: "
+msgstr "移調："
 
-#: src/amidi-plug/i_configure-ap.c:261
+#: src/amidi-plug/i_configure-ap.c:275
 msgid "Drum shift: "
-msgstr "鼓移: "
+msgstr "鼓移："
 
-#: src/amidi-plug/i_configure-ap.c:279
+#: src/amidi-plug/i_configure-ap.c:293
 msgid "Advanced settings"
 msgstr "進階設定"
 
-#: src/amidi-plug/i_configure-ap.c:283
+#: src/amidi-plug/i_configure-ap.c:297
 msgid "pre-calculate length of MIDI files in playlist"
 msgstr "事先計算在播放清單中 MIDI 檔的長度"
 
-#: src/amidi-plug/i_configure-ap.c:288
+#: src/amidi-plug/i_configure-ap.c:304
 msgid "extract comments from MIDI file (if available)"
 msgstr "提取 MIDI 檔的備註資料 (若可用的話)"
 
-#: src/amidi-plug/i_configure-ap.c:293
+#: src/amidi-plug/i_configure-ap.c:311
 msgid "extract lyrics from MIDI file (if available)"
 msgstr "提取 MIDI 檔的歌詞資料 (若可用的話)"
 
-#: src/amidi-plug/i_configure-ap.c:323
+#: src/amidi-plug/i_configure-ap.c:344
 msgid ""
 "AMIDI\n"
 "Plug"
-msgstr "AMIDI\nPlug"
-
-#: src/amidi-plug/i_configure.c:64
-msgid "AMIDI-Plug - select file"
-msgstr "AMIDI-Plug - 選擇檔案"
+msgstr ""
+"AMIDI\n"
+"Plug"
 
-#: src/amidi-plug/i_configure.c:110
+#: src/amidi-plug/i_configure.c:76
 msgid "AMIDI-Plug Settings"
-msgstr ""
+msgstr "AMIDI-Plug 設定"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:55
+#: src/amidi-plug/i_configure-fluidsynth.c:63
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - 選擇 SoundFont 檔案"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:290
+#: src/amidi-plug/i_configure-fluidsynth.c:321
 msgid "SoundFont settings"
 msgstr "SoundFont 設定"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:322
+#: src/amidi-plug/i_configure-fluidsynth.c:359
 msgid "Filename"
 msgstr "檔案名稱"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:326
+#: src/amidi-plug/i_configure-fluidsynth.c:363
 msgid "Size (bytes)"
 msgstr "大小 (位元組)"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:375
+#: src/amidi-plug/i_configure-fluidsynth.c:412
 msgid "Load SF on player start"
 msgstr "播放器啟動時載入 SF 檔"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:379
+#: src/amidi-plug/i_configure-fluidsynth.c:416
 msgid "Load SF on first MIDI file play"
-msgstr ""
+msgstr "在第一次播放 MIDI 檔案時載入 SF 檔"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:392
+#: src/amidi-plug/i_configure-fluidsynth.c:431
 msgid "Synthesizer settings"
 msgstr "合成器設定"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:401
+#: src/amidi-plug/i_configure-fluidsynth.c:440
 msgid "gain"
 msgstr "增益"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:407
-#: src/amidi-plug/i_configure-fluidsynth.c:435
-#: src/amidi-plug/i_configure-fluidsynth.c:463
-#: src/amidi-plug/i_configure-fluidsynth.c:494
+#: src/amidi-plug/i_configure-fluidsynth.c:446
+#: src/amidi-plug/i_configure-fluidsynth.c:476
+#: src/amidi-plug/i_configure-fluidsynth.c:506
+#: src/amidi-plug/i_configure-fluidsynth.c:540
 msgid "use default"
 msgstr "使用預設值"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:410
-#: src/amidi-plug/i_configure-fluidsynth.c:438
+#: src/amidi-plug/i_configure-fluidsynth.c:449
+#: src/amidi-plug/i_configure-fluidsynth.c:479
 msgid "value:"
-msgstr "數值:"
+msgstr "數值："
 
-#: src/amidi-plug/i_configure-fluidsynth.c:429
+#: src/amidi-plug/i_configure-fluidsynth.c:470
 msgid "polyphony"
-msgstr ""
+msgstr "複調"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:457
+#: src/amidi-plug/i_configure-fluidsynth.c:500
 msgid "reverb"
 msgstr "迴響"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:466
-#: src/amidi-plug/i_configure-fluidsynth.c:497
+#: src/amidi-plug/i_configure-fluidsynth.c:509
+#: src/amidi-plug/i_configure-fluidsynth.c:543
 msgid "yes"
 msgstr "是"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:468
-#: src/amidi-plug/i_configure-fluidsynth.c:499
+#: src/amidi-plug/i_configure-fluidsynth.c:511
+#: src/amidi-plug/i_configure-fluidsynth.c:545
 msgid "no"
 msgstr "否"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:488
+#: src/amidi-plug/i_configure-fluidsynth.c:534
 msgid "chorus"
 msgstr "合唱"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:519
+#: src/amidi-plug/i_configure-fluidsynth.c:568
 msgid "sample rate"
 msgstr "取樣率"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:525
+#: src/amidi-plug/i_configure-fluidsynth.c:574
 msgid "22050 Hz "
 msgstr "22050 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:528
+#: src/amidi-plug/i_configure-fluidsynth.c:577
 msgid "44100 Hz "
 msgstr "44100 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:531
+#: src/amidi-plug/i_configure-fluidsynth.c:580
 msgid "96000 Hz "
 msgstr "96000 Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:534
+#: src/amidi-plug/i_configure-fluidsynth.c:583
 msgid "custom "
 msgstr "自訂"
 
-#: src/amidi-plug/i_configure-fluidsynth.c:543
+#: src/amidi-plug/i_configure-fluidsynth.c:592
 msgid "Hz "
 msgstr "Hz "
 
-#: src/amidi-plug/i_configure-fluidsynth.c:607
+#: src/amidi-plug/i_configure-fluidsynth.c:662
 msgid ""
 "FluidSynth\n"
 "backend"
-msgstr "FluidSynth\n 後端"
+msgstr ""
+"FluidSynth\n"
+" 後端"
 
-#: src/amidi-plug/i_fileinfo.c:167
+#: src/amidi-plug/i_fileinfo.c:175
 msgid "Name:"
-msgstr "名稱:"
+msgstr "名稱："
 
-#: src/amidi-plug/i_fileinfo.c:191
+#: src/amidi-plug/i_fileinfo.c:200
 msgid " MIDI Info "
 msgstr " MIDI 資訊 "
 
-#: src/amidi-plug/i_fileinfo.c:205
+#: src/amidi-plug/i_fileinfo.c:214
 msgid "Format:"
-msgstr "格式:"
+msgstr "格式："
 
-#: src/amidi-plug/i_fileinfo.c:208
+#: src/amidi-plug/i_fileinfo.c:217
 msgid "Length (msec):"
-msgstr "長度 (毫秒):"
+msgstr "長度 (毫秒)："
 
-#: src/amidi-plug/i_fileinfo.c:211
+#: src/amidi-plug/i_fileinfo.c:220
 msgid "No. of Tracks:"
-msgstr ""
+msgstr "音軌編號："
 
-#: src/amidi-plug/i_fileinfo.c:216
+#: src/amidi-plug/i_fileinfo.c:226
 msgid "variable"
-msgstr ""
+msgstr "變動的"
 
-#: src/amidi-plug/i_fileinfo.c:217
+#: src/amidi-plug/i_fileinfo.c:228
 msgid "BPM:"
-msgstr "BPM:"
+msgstr "BPM："
 
-#: src/amidi-plug/i_fileinfo.c:223
+#: src/amidi-plug/i_fileinfo.c:236
 msgid "BPM (wavg):"
-msgstr ""
+msgstr "BPM (wavg)："
 
-#: src/amidi-plug/i_fileinfo.c:226
+#: src/amidi-plug/i_fileinfo.c:239
 msgid "Time Div:"
-msgstr ""
+msgstr "時間分割："
 
-#: src/amidi-plug/i_fileinfo.c:237
+#: src/amidi-plug/i_fileinfo.c:250
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI 備註與歌詞 "
 
-#: src/amidi-plug/i_fileinfo.c:288
+#: src/amidi-plug/i_fileinfo.c:301
 msgid "* no comments available in this MIDI file *"
 msgstr "* 這個 MIDI 檔不包含備註資料 *"
 
-#: src/amidi-plug/i_fileinfo.c:301
+#: src/amidi-plug/i_fileinfo.c:314
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* 這個 MIDI 檔不包含歌詞資料 *"
 
-#: src/amidi-plug/i_fileinfo.c:349
+#: src/amidi-plug/i_fileinfo.c:367
 msgid " (invalid UTF-8)"
 msgstr " (無效的 UTF-8 字串)"
 
-#: src/amidi-plug/i_utils.c:36
+#: src/amidi-plug/i_utils.c:39
 msgid "About AMIDI-Plug"
-msgstr ""
+msgstr "關於 AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:50
-msgid "AMIDI-Plug "
-msgstr ""
+#: src/amidi-plug/i_utils.c:53
+msgid "AMIDI-Plug"
+msgstr "AMIDI-Plug"
 
-#: src/amidi-plug/i_utils.c:51
+#: src/amidi-plug/i_utils.c:54
 msgid ""
 "\n"
 "modular MIDI music player\n"
@@ -607,14 +675,33 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"\n"
+"modular MIDI music player\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"written by Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"special thanks to...\n"
+"\n"
+"Clemens Ladisch and Jaroslav Kysela\n"
+"for their cool programs aplaymidi and amixer; those\n"
+"were really useful, along with alsa-lib docs, in order\n"
+"to learn more about the ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"for the nice midi keyboard logo\n"
+"\n"
+"Tony Vroon\n"
+"for the good help with alpha testing"
 
 #: src/aosd/aosd.c:29
 msgid "Audacious OSD "
-msgstr ""
+msgstr "Audacious OSD "
 
 #: src/aosd/aosd.c:37
 msgid "AOSD (On-Screen Display)"
-msgstr ""
+msgstr "AOSD (Audacious OSD)"
 
 #: src/aosd/aosd_style.c:75
 msgid "Rectangle"
@@ -649,7 +736,8 @@
 "Triggers OSD when, during playback, the song title changes but the filename "
 "is the same. This is mostly useful to display title changes in internet "
 "streams."
-msgstr "當播放中歌曲標題改變但檔名不變時觸發 OSD。這對顯示網路串流的標題很有用。"
+msgstr ""
+"當播放中歌曲標題改變但檔名不變時觸發 OSD。這對顯示網路串流的標題很有用。"
 
 #: src/aosd/aosd_trigger.c:86
 msgid "Pause On"
@@ -673,15 +761,15 @@
 
 #: src/aosd/aosd_ui.c:200
 msgid "Relative X offset:"
-msgstr "X 軸相對位移:"
+msgstr "X 軸相對位移："
 
 #: src/aosd/aosd_ui.c:207
 msgid "Relative Y offset:"
-msgstr "Y 軸相對位移:"
+msgstr "Y 軸相對位移："
 
 #: src/aosd/aosd_ui.c:214
 msgid "Max OSD width:"
-msgstr "最大 OSD 寬度:"
+msgstr "最大 OSD 寬度："
 
 #: src/aosd/aosd_ui.c:225
 msgid "Multi-Monitor options"
@@ -689,7 +777,7 @@
 
 #: src/aosd/aosd_ui.c:229
 msgid "Display OSD using:"
-msgstr "顯示 OSD:"
+msgstr "顯示 OSD："
 
 #: src/aosd/aosd_ui.c:231
 msgid "all monitors"
@@ -706,15 +794,15 @@
 
 #: src/aosd/aosd_ui.c:292
 msgid "Display:"
-msgstr "顯示:"
+msgstr "顯示："
 
 #: src/aosd/aosd_ui.c:297
 msgid "Fade in:"
-msgstr "淡入:"
+msgstr "淡入："
 
 #: src/aosd/aosd_ui.c:302
 msgid "Fade out:"
-msgstr "淡出:"
+msgstr "淡出："
 
 #: src/aosd/aosd_ui.c:383
 msgid "Fonts"
@@ -723,7 +811,7 @@
 #: src/aosd/aosd_ui.c:391
 #, c-format
 msgid "Font %i:"
-msgstr "字型 %i:"
+msgstr "字型 %i："
 
 #: src/aosd/aosd_ui.c:409
 msgid "Shadow"
@@ -752,7 +840,7 @@
 #: src/aosd/aosd_ui.c:602
 #, c-format
 msgid "Color %i:"
-msgstr "顏色 %i:"
+msgstr "顏色 %i："
 
 #: src/aosd/aosd_ui.c:620
 msgid "Custom Skin"
@@ -760,7 +848,7 @@
 
 #: src/aosd/aosd_ui.c:626
 msgid "Skin file:"
-msgstr "面板檔案:"
+msgstr "面板檔案："
 
 #: src/aosd/aosd_ui.c:630
 msgid "Browse"
@@ -781,8 +869,11 @@
 #: src/aosd/aosd_ui.c:791
 msgid ""
 "Composite manager not detected;\n"
-"unless you know that you have one running, please activate a composite manager otherwise the OSD won't work properly"
-msgstr "未偵測到合成特效管理程式；\n除非您確定已經執行，否則 OSD 將無法正確啟用。"
+"unless you know that you have one running, please activate a composite "
+"manager otherwise the OSD won't work properly"
+msgstr ""
+"未偵測到合成特效管理程式；\n"
+"除非您確定已經執行，否則 OSD 將無法正確啟用。"
 
 #: src/aosd/aosd_ui.c:799
 msgid "Composite manager not required for fake transparency"
@@ -845,47 +936,47 @@
 msgid "Misc"
 msgstr "雜項"
 
-#: src/asx/asx.c:97
+#: src/asx/asx.c:96
 msgid "ASXv1/ASXv2 Playlists"
-msgstr ""
+msgstr "ASXv1／ASXv2 播放清單"
 
-#: src/audpl/audpl.c:224
+#: src/audpl/audpl.c:222
 msgid "Audacious Playlists (audpl)"
-msgstr ""
+msgstr "Audacious 播放清單 (audpl)"
 
-#: src/blur_scope/blur_scope.c:49
+#: src/blur_scope/blur_scope.c:47
 msgid "Color"
-msgstr ""
+msgstr "色彩"
 
-#: src/blur_scope/blur_scope.c:58
+#: src/blur_scope/blur_scope.c:56
 msgid "Blur Scope"
-msgstr ""
+msgstr "模糊波形"
 
-#: src/bs2b/plugin.c:138
+#: src/bs2b/plugin.c:136
 msgid "Bauer Stereophonic-to-Binaural Preferences"
-msgstr ""
+msgstr "Bauer Stereophonic-to-Binaural 偏好設定"
 
-#: src/bs2b/plugin.c:149
+#: src/bs2b/plugin.c:147
 msgid "Feed level:"
-msgstr ""
+msgstr "饋送等級："
 
-#: src/bs2b/plugin.c:163
+#: src/bs2b/plugin.c:161
 msgid "Cut frequency:"
-msgstr ""
+msgstr "截斷頻率："
 
-#: src/bs2b/plugin.c:177
+#: src/bs2b/plugin.c:175
 msgid "Presets:"
 msgstr "樣式"
 
-#: src/bs2b/plugin.c:199
+#: src/bs2b/plugin.c:197
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr ""
+msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
 
-#: src/cairo-spectrum/cairo-spectrum.c:296
+#: src/cairo-spectrum/cairo-spectrum.c:297
 msgid "Spectrum Analyzer"
-msgstr ""
+msgstr "頻譜分析儀"
 
-#: src/cdaudio-ng/cdaudio-ng.c:111
+#: src/cdaudio-ng/cdaudio-ng.c:103
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -896,232 +987,244 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"\n"
+"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
+"and to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Also thank you to Tony Vroon for mentoring and guiding me.\n"
+"\n"
+"This was a Google Summer of Code 2007 project."
 
-#: src/cdaudio-ng/cdaudio-ng.c:129
+#: src/cdaudio-ng/cdaudio-ng.c:121
 msgid "Device"
-msgstr ""
+msgstr "裝置"
 
-#: src/cdaudio-ng/cdaudio-ng.c:130
+#: src/cdaudio-ng/cdaudio-ng.c:122
 msgid "Read speed:"
-msgstr ""
+msgstr "讀取速度："
 
-#: src/cdaudio-ng/cdaudio-ng.c:133
+#: src/cdaudio-ng/cdaudio-ng.c:125
 msgid "Override device:"
-msgstr ""
+msgstr "覆載裝置："
 
-#: src/cdaudio-ng/cdaudio-ng.c:135
+#: src/cdaudio-ng/cdaudio-ng.c:127
 msgid "Metadata"
-msgstr ""
+msgstr "詮釋資料"
 
-#: src/cdaudio-ng/cdaudio-ng.c:136
+#: src/cdaudio-ng/cdaudio-ng.c:128
 msgid "Use CD-Text"
-msgstr ""
+msgstr "使用 CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.c:138
+#: src/cdaudio-ng/cdaudio-ng.c:130
 msgid "Use CDDB"
-msgstr ""
+msgstr "使用 CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.c:140
+#: src/cdaudio-ng/cdaudio-ng.c:132
 msgid "Use HTTP instead of CDDBP"
 msgstr "使用 HTTP 而非 CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.c:142
+#: src/cdaudio-ng/cdaudio-ng.c:134
 msgid "Server:"
-msgstr ""
+msgstr "伺服器："
 
-#: src/cdaudio-ng/cdaudio-ng.c:144
+#: src/cdaudio-ng/cdaudio-ng.c:136
 msgid "Path:"
-msgstr ""
+msgstr "路徑："
 
-#: src/cdaudio-ng/cdaudio-ng.c:146
+#: src/cdaudio-ng/cdaudio-ng.c:138
 msgid "Port:"
-msgstr ""
+msgstr "連接埠："
 
-#: src/cdaudio-ng/cdaudio-ng.c:156
+#: src/cdaudio-ng/cdaudio-ng.c:148
 msgid "Audio CD Plugin"
-msgstr ""
+msgstr "音樂 CD 外掛"
 
-#: src/cdaudio-ng/cdaudio-ng.c:257
+#: src/cdaudio-ng/cdaudio-ng.c:249
 msgid "Failed to initialize cdio subsystem."
-msgstr ""
+msgstr "無法初始化 cdio 子系統。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:314
+#: src/cdaudio-ng/cdaudio-ng.c:306
 #, c-format
 msgid "Invalid URI %s."
-msgstr ""
+msgstr "無效的 URI %s。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:316
+#: src/cdaudio-ng/cdaudio-ng.c:308
 #, c-format
 msgid "Track %d not found."
-msgstr ""
+msgstr "找不到音軌 %d。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:318
+#: src/cdaudio-ng/cdaudio-ng.c:310
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "軌道 %d 是資料軌。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:320
+#: src/cdaudio-ng/cdaudio-ng.c:312
 msgid "Failed to open audio output."
-msgstr ""
+msgstr "無法開啟音訊輸出。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:403
+#: src/cdaudio-ng/cdaudio-ng.c:395
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "讀取音樂 CD 時發生錯誤。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:513
+#: src/cdaudio-ng/cdaudio-ng.c:505
 msgid "Audio CD"
 msgstr "音樂 CD"
 
-#: src/cdaudio-ng/cdaudio-ng.c:543 src/cdaudio-ng/cdaudio-ng.c:552
+#: src/cdaudio-ng/cdaudio-ng.c:535 src/cdaudio-ng/cdaudio-ng.c:544
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr ""
+msgstr "無法開啟 CD 裝置 %s。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:555
+#: src/cdaudio-ng/cdaudio-ng.c:547
 msgid "No audio capable CD drive found."
-msgstr ""
+msgstr "找不到可以播放音訊的光碟機。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:582
+#: src/cdaudio-ng/cdaudio-ng.c:574
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "開啟的光碟機無法完成初始化。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:595
+#: src/cdaudio-ng/cdaudio-ng.c:587
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "無法取得第一個或最後的音軌編號。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:620
+#: src/cdaudio-ng/cdaudio-ng.c:612
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "無法讀取音軌 %d 的起始／結束邏輯磁區編號。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:710
+#: src/cdaudio-ng/cdaudio-ng.c:702
 msgid "Failed to create the cddb connection."
-msgstr ""
+msgstr "無法建立 cddb 的連線。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:785
+#: src/cdaudio-ng/cdaudio-ng.c:777
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "無法查詢 CDDB 伺服器"
 
-#: src/cdaudio-ng/cdaudio-ng.c:787
+#: src/cdaudio-ng/cdaudio-ng.c:779
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "無法查詢 CDDB 伺服器：%s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:811
+#: src/cdaudio-ng/cdaudio-ng.c:803
 #, c-format
 msgid "Failed to read the cddb info: %s"
-msgstr ""
+msgstr "無法讀取 cddb 資訊：%s"
 
-#: src/cdaudio-ng/cdaudio-ng.c:884
+#: src/cdaudio-ng/cdaudio-ng.c:876
 msgid "Drive is empty."
 msgstr "光碟機是空的。"
 
-#: src/cdaudio-ng/cdaudio-ng.c:886
+#: src/cdaudio-ng/cdaudio-ng.c:878
 msgid "Unsupported disk type."
 msgstr "未支援的光碟類型"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Play CD"
 msgstr "播放 CD"
 
-#: src/cd-menu-items/cd-menu-items.c:32
+#: src/cd-menu-items/cd-menu-items.c:30
 msgid "Add CD"
 msgstr "加入 CD"
 
-#: src/cd-menu-items/cd-menu-items.c:59
+#: src/cd-menu-items/cd-menu-items.c:57
 msgid "Audio CD Menu Items"
-msgstr ""
+msgstr "音樂 CD 選單項目"
 
-#: src/compressor/plugin.c:37
+#: src/compressor/plugin.c:35
 msgid "Compression"
-msgstr ""
+msgstr "壓縮"
 
-#: src/compressor/plugin.c:38
+#: src/compressor/plugin.c:36
 msgid "Center volume:"
-msgstr "中央音量:"
+msgstr "中央音量："
 
-#: src/compressor/plugin.c:41
+#: src/compressor/plugin.c:39
 msgid "Dynamic range:"
-msgstr "動態範圍:"
+msgstr "動態範圍："
 
-#: src/compressor/plugin.c:55
+#: src/compressor/plugin.c:53
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/compressor/plugin.c:60
+#: src/compressor/plugin.c:58
 msgid "Dynamic Range Compressor"
-msgstr ""
+msgstr "動態範圍壓縮"
 
-#: src/console/configure.c:135 src/console/plugin.c:43
+#: src/console/configure.c:134 src/console/plugin.c:42
 msgid "Game Console Music Decoder"
 msgstr "遊戲主機音樂解碼器"
 
-#: src/console/configure.c:152
+#: src/console/configure.c:151
 msgid "General"
 msgstr "一般"
 
-#: src/console/configure.c:154 src/skins/ui_manager.c:176
+#: src/console/configure.c:153 src/skins/ui_manager.c:175
 msgid "Playback"
 msgstr "播放"
 
-#: src/console/configure.c:169
+#: src/console/configure.c:168
 msgid "Bass:"
 msgstr "低音"
 
-#: src/console/configure.c:173 src/console/configure.c:184
-#: src/console/configure.c:205
+#: src/console/configure.c:172 src/console/configure.c:183
+#: src/console/configure.c:204
 msgid "secs"
 msgstr "秒"
 
-#: src/console/configure.c:180
+#: src/console/configure.c:179
 msgid "Treble:"
 msgstr "高音"
 
-#: src/console/configure.c:201
+#: src/console/configure.c:200
 msgid "Default song length:"
-msgstr "預設歌曲長度:"
+msgstr "預設歌曲長度："
 
-#: src/console/configure.c:207
+#: src/console/configure.c:206
 msgid "Resampling"
 msgstr "重取樣"
 
-#: src/console/configure.c:213
+#: src/console/configure.c:212
 msgid "Enable audio resampling"
 msgstr "啟用聲音重取樣"
 
-#: src/console/configure.c:228
+#: src/console/configure.c:227
 msgid "Resampling rate:"
 msgstr "重取樣率"
 
-#: src/console/configure.c:232 src/resample/resample.c:180
-#: src/resample/resample.c:186 src/resample/resample.c:189
-#: src/resample/resample.c:192 src/resample/resample.c:195
-#: src/resample/resample.c:198 src/resample/resample.c:201
-#: src/resample/resample.c:204
+#: src/console/configure.c:231 src/modplug/plugin_main.c:98
+#: src/resample/resample.c:178 src/resample/resample.c:184
+#: src/resample/resample.c:187 src/resample/resample.c:190
+#: src/resample/resample.c:193 src/resample/resample.c:196
+#: src/resample/resample.c:199 src/resample/resample.c:202
+#: src/sox-resampler/sox-resampler.c:153
 msgid "Hz"
 msgstr "Hz"
 
-#: src/console/configure.c:243
+#: src/console/configure.c:242
 msgid "SPC"
 msgstr "SPC"
 
-#: src/console/configure.c:244
+#: src/console/configure.c:243
 msgid "Ignore length from SPC tags"
 msgstr "忽略 SPC 標籤裡記錄的長度"
 
-#: src/console/configure.c:245
+#: src/console/configure.c:244
 msgid "Increase reverb"
 msgstr "增加回音"
 
-#: src/console/configure.c:270
+#: src/console/configure.c:269
 msgid ""
-"The default song length, expressed in seconds, is used for songs that do not"
-" provide length information (i.e. looping tracks)."
-msgstr "預設的歌曲長度，以秒表示。用於沒有提供長度資訊的歌曲 (像會無限播放的音軌)"
+"The default song length, expressed in seconds, is used for songs that do not "
+"provide length information (i.e. looping tracks)."
+msgstr ""
+"預設的歌曲長度，以秒表示。用於沒有提供長度資訊的歌曲 (像會無限播放的音軌)"
 
-#: src/console/plugin.c:28
+#: src/console/plugin.c:27
 msgid ""
 "Console music decoder engine based on Game_Music_Emu 0.5.2\n"
 "Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
@@ -1130,87 +1233,105 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Console music decoder engine based on Game_Music_Emu 0.5.2\n"
+"Supported formats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
-#: src/crossfade/crossfade.c:83
+#: src/crossfade/crossfade.c:81
 msgid ""
 "Crossfading failed because the songs had a different number of channels. "
 "You can use the Channel Mixer to convert the songs to the same number of "
 "channels."
 msgstr ""
+"因為歌曲間的聲道數不同，無法使用 Crossfade。您可以使用聲道混合將歌曲轉換至相"
+"同的聲道數量。"
 
-#: src/crossfade/crossfade.c:90
+#: src/crossfade/crossfade.c:88
 msgid ""
 "Crossfading failed because the songs had different sample rates. You can "
 "use the Sample Rate Converter to convert the songs to the same sample rate."
 msgstr ""
+"淡入淡出失敗，因為歌曲間的取樣率不同。您可以使用取樣率轉換功能來取得相同的取"
+"樣率。"
 
-#: src/crossfade/crossfade.c:256
+#: src/crossfade/crossfade.c:254
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/crossfade/crossfade.c:260
+#: src/crossfade/crossfade.c:258
 msgid "Crossfade"
-msgstr ""
+msgstr "淡入淡出"
 
-#: src/crossfade/crossfade.c:261
+#: src/crossfade/crossfade.c:259
 msgid "Overlap:"
-msgstr ""
+msgstr "重疊："
 
-#: src/crossfade/crossfade.c:271
+#: src/crossfade/crossfade.c:269
 msgid "Crossfade"
-msgstr ""
+msgstr "淡入淡出"
 
-#: src/crystalizer/crystalizer.c:42
+#: src/crystalizer/crystalizer.c:40
 msgid "Crystalizer"
-msgstr ""
+msgstr "Crystalizer"
 
-#: src/crystalizer/crystalizer.c:43 src/stereo_plugin/stereo.c:28
+#: src/crystalizer/crystalizer.c:41 src/stereo_plugin/stereo.c:26
 msgid "Intensity:"
-msgstr ""
+msgstr "效果強度："
 
-#: src/crystalizer/crystalizer.c:53
+#: src/crystalizer/crystalizer.c:51
 msgid "Crystalizer"
-msgstr ""
+msgstr "Crystalizer"
 
-#: src/cue/cue.c:160
+#: src/cue/cue.c:158
 msgid "Cue Sheet Plugin"
-msgstr ""
+msgstr "Cue Sheet 外掛"
 
-#: src/echo_plugin/echo.c:26
+#: src/echo_plugin/echo.c:24
 msgid "Echo"
-msgstr ""
+msgstr "回音"
 
-#: src/echo_plugin/echo.c:27
+#: src/echo_plugin/echo.c:25 src/modplug/plugin_main.c:90
+#: src/modplug/plugin_main.c:104
 msgid "Delay:"
-msgstr ""
+msgstr "延遲："
 
-#: src/echo_plugin/echo.c:29
+#: src/echo_plugin/echo.c:27 src/modplug/plugin_main.c:91
+#: src/modplug/plugin_main.c:105
 msgid "ms"
-msgstr ""
+msgstr "毫秒"
 
-#: src/echo_plugin/echo.c:30
+#: src/echo_plugin/echo.c:28
 msgid "Feedback:"
-msgstr ""
+msgstr "反饋："
 
-#: src/echo_plugin/echo.c:33
+#: src/echo_plugin/echo.c:31 src/modplug/plugin_main.c:109
 msgid "Volume:"
-msgstr ""
+msgstr "音量："
 
-#: src/echo_plugin/echo.c:116
+#: src/echo_plugin/echo.c:114
 msgid ""
 "Echo Plugin\n"
 "By Johan Levin, 1999\n"
 "\n"
 "Surround echo by Carl van Schaik, 1999"
 msgstr ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"\n"
+"Surround echo by Carl van Schaik, 1999"
 
-#: src/echo_plugin/echo.c:122
+#: src/echo_plugin/echo.c:120
 msgid "Echo"
-msgstr ""
+msgstr "回音"
 
-#: src/ffaudio/ffaudio-core.c:633
+#: src/ffaudio/ffaudio-core.c:648
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1219,18 +1340,24 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
+"Multi-format audio decoding plugin for Audacious using\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious plugin by:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/ffaudio/ffaudio-core.c:680
+#: src/ffaudio/ffaudio-core.c:695
 msgid "FFmpeg Plugin"
-msgstr ""
+msgstr "FFmpeg 外掛"
 
 #: src/filewriter/filewriter.c:409
 msgid "FileWriter Configuration"
-msgstr ""
+msgstr "檔案輸出設定"
 
 #: src/filewriter/filewriter.c:421
 msgid "Output file format:"
-msgstr "輸出檔案格式:"
+msgstr "輸出檔案格式："
 
 #: src/filewriter/filewriter.c:439
 msgid "Configure"
@@ -1246,7 +1373,7 @@
 
 #: src/filewriter/filewriter.c:464
 msgid "Output file folder:"
-msgstr "輸出檔案資料夾:"
+msgstr "輸出檔案資料夾："
 
 #: src/filewriter/filewriter.c:468
 msgid "Pick a folder"
@@ -1254,7 +1381,7 @@
 
 #: src/filewriter/filewriter.c:481
 msgid "Get filename from:"
-msgstr "檔名來源:"
+msgstr "檔名來源："
 
 #: src/filewriter/filewriter.c:484
 msgid "original file tags"
@@ -1289,10 +1416,24 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 msgstr ""
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
 #: src/filewriter/filewriter.c:532
 msgid "FileWriter Plugin"
-msgstr ""
+msgstr "檔案輸出外掛"
 
 #: src/filewriter/mp3.c:37 src/filewriter/mp3.c:748
 msgid "Auto"
@@ -1302,11 +1443,13 @@
 msgid "Joint Stereo"
 msgstr "聯合立體聲"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:65
+#: src/mpg123/mpg123.c:213
 msgid "Stereo"
 msgstr "立體聲"
 
-#: src/filewriter/mp3.c:38 src/mpg123/mpg123.c:197
+#: src/filewriter/mp3.c:38 src/modplug/plugin_main.c:63
+#: src/mpg123/mpg123.c:213
 msgid "Mono"
 msgstr "單聲道"
 
@@ -1316,11 +1459,11 @@
 
 #: src/filewriter/mp3.c:712
 msgid "Algorithm Quality:"
-msgstr "演算法品質:"
+msgstr "演算法品質："
 
 #: src/filewriter/mp3.c:737
 msgid "Output Samplerate:"
-msgstr "輸出取樣率:"
+msgstr "輸出取樣率："
 
 #: src/filewriter/mp3.c:765
 msgid "(Hz)"
@@ -1328,23 +1471,23 @@
 
 #: src/filewriter/mp3.c:772
 msgid "Bitrate / Compression ratio:"
-msgstr "位元率 / 壓縮比率:"
+msgstr "位元率／壓縮比率："
 
 #: src/filewriter/mp3.c:796
 msgid "Bitrate (kbps):"
-msgstr "位元率 (kbps):"
+msgstr "位元率 (kbps)："
 
 #: src/filewriter/mp3.c:829
 msgid "Compression ratio:"
-msgstr "壓縮比率:"
+msgstr "壓縮比率："
 
 #: src/filewriter/mp3.c:853
 msgid "Audio Mode:"
-msgstr "音訊模式:"
+msgstr "音訊模式："
 
 #: src/filewriter/mp3.c:878
 msgid "Misc:"
-msgstr "雜項:"
+msgstr "雜項："
 
 #: src/filewriter/mp3.c:889
 msgid "Enforce strict ISO complience"
@@ -1354,29 +1497,29 @@
 msgid "Error protection"
 msgstr "錯誤保護"
 
-#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:222
+#: src/filewriter/mp3.c:912 src/filewriter/vorbis.c:219
 msgid "Quality"
 msgstr "品質"
 
 #: src/filewriter/mp3.c:921
 msgid "Enable VBR/ABR"
-msgstr "啟用 VBR/ABR"
+msgstr "啟用 VBR／ABR"
 
 #: src/filewriter/mp3.c:931
 msgid "Type:"
-msgstr "類型:"
+msgstr "類型："
 
 #: src/filewriter/mp3.c:964
 msgid "VBR Options:"
-msgstr "VBR 選項:"
+msgstr "VBR 選項："
 
 #: src/filewriter/mp3.c:980
 msgid "Minimum bitrate (kbps):"
-msgstr "最小位元率 (kbps):"
+msgstr "最小位元率 (kbps)："
 
 #: src/filewriter/mp3.c:1007
 msgid "Maximum bitrate (kbps):"
-msgstr "最大位元率 (kbps):"
+msgstr "最大位元率 (kbps)："
 
 #: src/filewriter/mp3.c:1030
 msgid "Strictly enforce minimum bitrate"
@@ -1384,15 +1527,15 @@
 
 #: src/filewriter/mp3.c:1042
 msgid "ABR Options:"
-msgstr "ABR 選項:"
+msgstr "ABR 選項："
 
 #: src/filewriter/mp3.c:1052
 msgid "Average bitrate (kbps):"
-msgstr "平均位元率 (kbps):"
+msgstr "平均位元率 (kbps)："
 
 #: src/filewriter/mp3.c:1080
 msgid "VBR quality level:"
-msgstr "VBR 品質等級:"
+msgstr "VBR 品質等級："
 
 #: src/filewriter/mp3.c:1099
 msgid "Don't write Xing VBR header"
@@ -1400,11 +1543,11 @@
 
 #: src/filewriter/mp3.c:1112
 msgid "VBR/ABR"
-msgstr "VBR/ABR"
+msgstr "VBR／ABR"
 
 #: src/filewriter/mp3.c:1121
 msgid "Frame parameters:"
-msgstr ""
+msgstr "音框參數："
 
 #: src/filewriter/mp3.c:1133
 msgid "Mark as copyright"
@@ -1416,7 +1559,7 @@
 
 #: src/filewriter/mp3.c:1156
 msgid "ID3 params:"
-msgstr "ID3 參數:"
+msgstr "ID3 參數："
 
 #: src/filewriter/mp3.c:1167
 msgid "Force addition of version 2 tag"
@@ -1434,541 +1577,623 @@
 msgid "Tags"
 msgstr "標籤"
 
-#: src/filewriter/vorbis.c:212
+#: src/filewriter/vorbis.c:209
 msgid "Vorbis Encoder Configuration"
 msgstr "Vorbis 編碼器設定"
 
-#: src/filewriter/vorbis.c:235
+#: src/filewriter/vorbis.c:232
 msgid "Quality level (0 - 10):"
-msgstr "品質等級 (0 - 10):"
+msgstr "品質等級 (0 - 10)："
 
-#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:282
+#: src/flacng/metadata.c:357 src/wavpack/wavpack.c:280
 msgid "lossless"
-msgstr ""
+msgstr "無損"
 
-#: src/flacng/plugin.c:270
+#: src/flacng/plugin.c:269
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
-#: src/flacng/plugin.c:278
+#: src/flacng/plugin.c:277
 msgid "FLAC Decoder"
-msgstr ""
+msgstr "FLAC 解碼器"
 
-#: src/gio/gio.c:302
+#: src/gio/gio.c:300
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
 
-#: src/gio/gio.c:324
+#: src/gio/gio.c:322
 msgid "GIO Plugin"
+msgstr "GIO 外掛"
+
+#: src/gl-spectrum/gl-spectrum.c:283
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 msgstr ""
+"Audacious 的 OpenGL 頻譜分析儀\n"
+"Copyright 2013 Christophe Budé and John Lindgren\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
+
+#: src/gl-spectrum/gl-spectrum.c:292
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL 頻譜分析儀"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:44
+#: src/gnomeshortcuts/gnomeshortcuts.c:41
 msgid ""
 "Gnome Shortcut Plugin\n"
 "Lets you control the player with Gnome's shortcuts.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 msgstr ""
+"Gnome Shortcut Plugin\n"
+"讓您使用 Gnome 的快速鍵控制播放器。\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gnomeshortcuts/gnomeshortcuts.c:50
+#: src/gnomeshortcuts/gnomeshortcuts.c:47
 msgid "Gnome Shortcuts"
-msgstr ""
+msgstr "Gnome 快速鍵"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Entry number"
 msgstr "項目編號"
 
-#: src/gtkui/columns.c:33
+#: src/gtkui/columns.c:32
 msgid "Title"
 msgstr "標題"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Artist"
 msgstr "藝人"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Year"
 msgstr "年份"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Album"
 msgstr "專輯"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Track"
 msgstr "音軌"
 
-#: src/gtkui/columns.c:34
+#: src/gtkui/columns.c:33
 msgid "Genre"
 msgstr "類型"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Queue position"
 msgstr "佇列位置"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "Length"
 msgstr "長度"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File path"
 msgstr "檔案路徑"
 
-#: src/gtkui/columns.c:35
+#: src/gtkui/columns.c:34
 msgid "File name"
 msgstr "檔案名稱"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Custom title"
 msgstr "自訂標題"
 
-#: src/gtkui/columns.c:36
+#: src/gtkui/columns.c:35
 msgid "Bitrate"
 msgstr "位元率"
 
-#: src/gtkui/columns.c:275
+#: src/gtkui/columns.c:277
 msgid "Choose Columns"
 msgstr "選擇欄位"
 
-#: src/gtkui/columns.c:291
+#: src/gtkui/columns.c:293
 msgid "Available:"
-msgstr "可用的:"
+msgstr "可用的："
 
-#: src/gtkui/columns.c:325
+#: src/gtkui/columns.c:327
 msgid "Chosen:"
-msgstr "已選擇:"
+msgstr "已選擇："
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Left"
 msgstr "嵌入左方"
 
-#: src/gtkui/layout.c:120
+#: src/gtkui/layout.c:119
 msgid "Dock at Right"
 msgstr "嵌入右方"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Top"
 msgstr "嵌入頂端"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Dock at Bottom"
 msgstr "嵌入底端"
 
-#: src/gtkui/layout.c:121
+#: src/gtkui/layout.c:120
 msgid "Undock"
 msgstr "解除嵌入"
 
-#: src/gtkui/layout.c:121 src/ladspa/plugin.c:624
+#: src/gtkui/layout.c:120 src/ladspa/plugin.c:623
 msgid "Disable"
 msgstr "關閉"
 
-#: src/gtkui/menus.c:159
+#: src/gtkui/menus.c:170
 msgid "_Open Files ..."
 msgstr "開啟檔案(_O) ..."
 
-#: src/gtkui/menus.c:160
+#: src/gtkui/menus.c:171
 msgid "Open _URL ..."
-msgstr "開啟 _URL ..."
+msgstr "開啟網址(_U) ..."
 
-#: src/gtkui/menus.c:161
+#: src/gtkui/menus.c:172
 msgid "_Add Files ..."
 msgstr "加入檔案(_A) ... "
 
-#: src/gtkui/menus.c:162
+#: src/gtkui/menus.c:173
 msgid "Add U_RL ..."
-msgstr "加入 U_RL ..."
+msgstr "加入網址(_R) ..."
 
-#: src/gtkui/menus.c:164
+#: src/gtkui/menus.c:175
 msgid "_Search Library"
-msgstr ""
+msgstr "搜尋媒體櫃(_S)"
 
-#: src/gtkui/menus.c:166
+#: src/gtkui/menus.c:177
 msgid "A_bout ..."
 msgstr "關於(_B) ..."
 
-#: src/gtkui/menus.c:167
+#: src/gtkui/menus.c:178
 msgid "_Preferences ..."
 msgstr "偏好設定(_P) ..."
 
-#: src/gtkui/menus.c:168 src/skins/ui_manager.c:414
+#: src/gtkui/menus.c:179 src/skins/ui_manager.c:413
 msgid "_Quit"
 msgstr "離開(_Q)"
 
-#: src/gtkui/menus.c:171 src/gtkui/menus.c:258
+#: src/gtkui/menus.c:182 src/gtkui/menus.c:296
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.c:172
+#: src/gtkui/menus.c:183
 msgid "Paus_e"
 msgstr "暫停(_E)"
 
-#: src/gtkui/menus.c:173
+#: src/gtkui/menus.c:184
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.c:174
+#: src/gtkui/menus.c:185
 msgid "Pre_vious"
 msgstr "上一個(_V)"
 
-#: src/gtkui/menus.c:175
+#: src/gtkui/menus.c:186
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: src/gtkui/menus.c:177
+#: src/gtkui/menus.c:188
 msgid "_Repeat"
 msgstr "重複"
 
-#: src/gtkui/menus.c:178
+#: src/gtkui/menus.c:189
 msgid "S_huffle"
 msgstr "隨機"
 
-#: src/gtkui/menus.c:179
+#: src/gtkui/menus.c:190
 msgid "N_o Playlist Advance"
 msgstr "不要切換播放清單"
 
-#: src/gtkui/menus.c:180
-msgid "Stop _After This Song"
-msgstr "播放完目前歌曲後停止"
+#: src/gtkui/menus.c:191
+msgid "Stop A_fter This Song"
+msgstr "播放完目前歌曲後停止(_F)"
 
-#: src/gtkui/menus.c:182 src/gtkui/menus.c:246
+#: src/gtkui/menus.c:193 src/gtkui/menus.c:284
 msgid "Song _Info ..."
 msgstr "歌曲資訊(_I) ..."
 
-#: src/gtkui/menus.c:183
+#: src/gtkui/menus.c:194
 msgid "Jump to _Time ..."
 msgstr "跳至時間(_T) ..."
 
-#: src/gtkui/menus.c:184
+#: src/gtkui/menus.c:195
 msgid "_Jump to Song ..."
 msgstr "跳至歌曲(_J) ..."
 
-#: src/gtkui/menus.c:187
-msgid "By Track _Number"
-msgstr "音軌編號(_N)"
+#: src/gtkui/menus.c:197
+msgid "Set Repeat Point _A"
+msgstr "設定重複點 _A"
+
+#: src/gtkui/menus.c:198
+msgid "Set Repeat Point _B"
+msgstr "設定重複點 _B"
 
-#: src/gtkui/menus.c:188
+#: src/gtkui/menus.c:199
+msgid "_Clear Repeat Points"
+msgstr "清除重複點(_C)"
+
+#: src/gtkui/menus.c:202 src/gtkui/menus.c:208 src/gtkui/menus.c:221
 msgid "By _Title"
 msgstr "標題(_T)"
 
-#: src/gtkui/menus.c:189
+#: src/gtkui/menus.c:203
+msgid "By _Filename"
+msgstr "檔案名稱(_F)"
+
+#: src/gtkui/menus.c:204
+msgid "By File _Path"
+msgstr "檔案路徑(_P)"
+
+#: src/gtkui/menus.c:207 src/gtkui/menus.c:220
+msgid "By Track _Number"
+msgstr "音軌編號(_N)"
+
+#: src/gtkui/menus.c:209 src/gtkui/menus.c:222
 msgid "By _Artist"
 msgstr "藝人(_A)"
 
-#: src/gtkui/menus.c:190
-msgid "By A_lbum"
-msgstr "專輯(_L)"
+#: src/gtkui/menus.c:210 src/gtkui/menus.c:223
+msgid "By Al_bum"
+msgstr "專輯(_B)"
 
-#: src/gtkui/menus.c:191
+#: src/gtkui/menus.c:211 src/gtkui/menus.c:224
 msgid "By Release _Date"
 msgstr "發行日期(_D)"
 
-#: src/gtkui/menus.c:192
+#: src/gtkui/menus.c:212 src/gtkui/menus.c:225
+msgid "By _Length"
+msgstr "長度(_L)"
+
+#: src/gtkui/menus.c:213 src/gtkui/menus.c:226
 msgid "By _File Path"
 msgstr "檔案路徑(_F)"
 
-#: src/gtkui/menus.c:193
+#: src/gtkui/menus.c:214 src/gtkui/menus.c:227
 msgid "By _Custom Title"
 msgstr "自訂標題(_C)"
 
-#: src/gtkui/menus.c:195
+#: src/gtkui/menus.c:216 src/gtkui/menus.c:229
 msgid "R_everse Order"
 msgstr "反向順序(_E)"
 
-#: src/gtkui/menus.c:196
+#: src/gtkui/menus.c:217 src/gtkui/menus.c:230
 msgid "_Random Order"
 msgstr "隨機順序(_R)"
 
-#: src/gtkui/menus.c:199
+#: src/gtkui/menus.c:233
 msgid "_Play This Playlist"
-msgstr ""
+msgstr "播放此清單(_P)"
 
-#: src/gtkui/menus.c:200 src/gtkui/menus.c:248
+#: src/gtkui/menus.c:234 src/gtkui/menus.c:286
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
-#: src/gtkui/menus.c:201
-msgid "Remove _Unavailable Files"
-msgstr "移除不存在的檔案(_U)"
-
-#: src/gtkui/menus.c:203
+#: src/gtkui/menus.c:236
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/gtkui/menus.c:205
+#: src/gtkui/menus.c:237
+#, fuzzy
+msgid "Sort Se_lected"
+msgstr "排序選擇的項目"
+
+#: src/gtkui/menus.c:238
+msgid "Remove _Duplicates"
+msgstr "移除重複的項目(_D)"
+
+#: src/gtkui/menus.c:239
+msgid "Remove _Unavailable Files"
+msgstr "移除不存在的檔案(_U)"
+
+#: src/gtkui/menus.c:241
 msgid "_New"
 msgstr "新增(_N)"
 
-#: src/gtkui/menus.c:206
+#: src/gtkui/menus.c:242
 msgid "Ren_ame ..."
-msgstr ""
+msgstr "重新命名(_A) ..."
 
-#: src/gtkui/menus.c:207 src/gtkui/menus.c:260
+#: src/gtkui/menus.c:243 src/gtkui/menus.c:298
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: src/gtkui/menus.c:209
+#: src/gtkui/menus.c:245
 msgid "_Import ..."
 msgstr "匯入(_I) ..."
 
-#: src/gtkui/menus.c:210
+#: src/gtkui/menus.c:246
 msgid "_Export ..."
-msgstr "匯出 (_E) ..."
+msgstr "匯出(_E) ..."
 
-#: src/gtkui/menus.c:212
+#: src/gtkui/menus.c:248
 msgid "Playlist _Manager ..."
-msgstr ""
+msgstr "播放清單管理(_M) ..."
 
-#: src/gtkui/menus.c:213
+#: src/gtkui/menus.c:249
 msgid "_Queue Manager ..."
 msgstr "佇列管理(_Q) ..."
 
-#: src/gtkui/menus.c:216
+#: src/gtkui/menus.c:252
 msgid "Volume _Up"
 msgstr "提高音量(_U)"
 
-#: src/gtkui/menus.c:217
+#: src/gtkui/menus.c:253
 msgid "Volume _Down"
 msgstr "降低音量(_D)"
 
-#: src/gtkui/menus.c:219
+#: src/gtkui/menus.c:255
 msgid "_Equalizer"
 msgstr "等化器(_E)"
 
-#: src/gtkui/menus.c:221
+#: src/gtkui/menus.c:257
 msgid "E_ffects"
 msgstr "特效(_F)"
 
-#: src/gtkui/menus.c:224
+#: src/gtkui/menus.c:260
 msgid "_Interface"
 msgstr "介面(_I)"
 
-#: src/gtkui/menus.c:225
+#: src/gtkui/menus.c:261
 msgid "_Visualizations"
 msgstr "視覺特效(_V)"
 
-#: src/gtkui/menus.c:227
+#: src/gtkui/menus.c:263
 msgid "Show _Menu Bar"
 msgstr "顯示選單列(_M)"
 
-#: src/gtkui/menus.c:228
+#: src/gtkui/menus.c:264
 msgid "Show I_nfo Bar"
 msgstr "顯示資訊列(_N)"
 
-#: src/gtkui/menus.c:229
+#: src/gtkui/menus.c:265
 msgid "Show Info Bar Vis_ualization"
-msgstr ""
+msgstr "顯示資訊列的視覺特效(_U)"
 
-#: src/gtkui/menus.c:230
+#: src/gtkui/menus.c:266
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: src/gtkui/menus.c:232
+#: src/gtkui/menus.c:268
+msgid "Show _Remaining Time"
+msgstr "顯示剩餘時間(_R)"
+
+#: src/gtkui/menus.c:270
 msgid "Show Close _Buttons"
-msgstr ""
+msgstr "顯示關閉按鈕(_B)"
 
-#: src/gtkui/menus.c:233
+#: src/gtkui/menus.c:271
 msgid "Show Column _Headers"
 msgstr "顯示欄位標頭(_H)"
 
-#: src/gtkui/menus.c:234
+#: src/gtkui/menus.c:272
 msgid "Choose _Columns ..."
-msgstr "選擇欄位 (_C) ..."
+msgstr "選擇欄位(_C) ..."
 
-#: src/gtkui/menus.c:235
+#: src/gtkui/menus.c:273
 msgid "Scrol_l on Song Change"
 msgstr "切換歌曲時捲動(_L)"
 
-#: src/gtkui/menus.c:238
+#: src/gtkui/menus.c:276
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: src/gtkui/menus.c:239
+#: src/gtkui/menus.c:277
 msgid "_Playback"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.c:240
+#: src/gtkui/menus.c:278
 msgid "P_laylist"
 msgstr "播放清單(_L)"
 
-#: src/gtkui/menus.c:241 src/gtkui/menus.c:255
+#: src/gtkui/menus.c:279 src/gtkui/menus.c:293
 msgid "_Services"
 msgstr "服務(_S)"
 
-#: src/gtkui/menus.c:242
+#: src/gtkui/menus.c:280
 msgid "_Output"
 msgstr "輸出(_O)"
 
-#: src/gtkui/menus.c:243
+#: src/gtkui/menus.c:281
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: src/gtkui/menus.c:247
+#: src/gtkui/menus.c:285
 msgid "_Queue/Unqueue"
-msgstr "排入/移出佇列(_Q)"
+msgstr "排入／移出佇列(_Q)"
 
-#: src/gtkui/menus.c:250
+#: src/gtkui/menus.c:288
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: src/gtkui/menus.c:251
+#: src/gtkui/menus.c:289
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: src/gtkui/menus.c:252
+#: src/gtkui/menus.c:290
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: src/gtkui/menus.c:253
+#: src/gtkui/menus.c:291
 msgid "Select _All"
 msgstr "選擇全部(_A)"
 
-#: src/gtkui/menus.c:259
+#: src/gtkui/menus.c:297
 msgid "_Rename ..."
-msgstr ""
+msgstr "重新命名(_R) ..."
 
-#: src/gtkui/ui_gtk.c:100
+#: src/gtkui/ui_gtk.c:96
 msgid "GTK Interface"
 msgstr "GTK 介面"
 
-#: src/gtkui/ui_gtk.c:170 src/skins/ui_main.c:299
+#: src/gtkui/ui_gtk.c:198 src/skins/ui_main.c:306
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.c:176
+#: src/gtkui/ui_gtk.c:204
 msgid "Buffering ..."
 msgstr "緩衝中 ..."
 
-#: src/gtkui/ui_gtk.c:179 src/skins/ui_main.c:301 src/skins/ui_main.c:1496
+#: src/gtkui/ui_gtk.c:207 src/skins/ui_main.c:308 src/skins/ui_main.c:1451
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_gtk.c:230 src/lyricwiki/lyricwiki.c:190
-#: src/lyricwiki/lyricwiki.c:200 src/lyricwiki/lyricwiki.c:216
-#: src/lyricwiki/lyricwiki.c:226 src/lyricwiki/lyricwiki.c:245
-#: src/skins/plugin.c:179
+#: src/gtkui/ui_gtk.c:253 src/lyricwiki/lyricwiki.c:208
+#: src/lyricwiki/lyricwiki.c:218 src/lyricwiki/lyricwiki.c:242
+#: src/lyricwiki/lyricwiki.c:252 src/lyricwiki/lyricwiki.c:271
+#: src/skins/plugin.c:176
 msgid "Error"
 msgstr "錯誤"
 
-#: src/gtkui/ui_statusbar.c:109
+#: src/gtkui/ui_statusbar.c:108
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr[0] "%d 聲道"
 
-#: src/gtkui/ui_statusbar.c:124
+#: src/gtkui/ui_statusbar.c:123
 #, c-format
 msgid "%d kbps"
 msgstr "%d kbps"
 
-#: src/hotkey/gui.c:72
-msgid "Previous Track"
+#: src/hotkey/gui.c:70
+msgid "Previous track"
 msgstr "上一個音軌"
 
-#: src/hotkey/gui.c:73 src/skins/ui_manager.c:178 src/skins/ui_manager.c:179
+#: src/hotkey/gui.c:71 src/notify/osd.c:68 src/skins/ui_manager.c:177
+#: src/skins/ui_manager.c:178
 msgid "Play"
 msgstr "播放"
 
-#: src/hotkey/gui.c:74
+#: src/hotkey/gui.c:72
 msgid "Pause/Resume"
-msgstr "暫停/回復"
+msgstr "暫停／回復"
 
-#: src/hotkey/gui.c:75 src/skins/ui_manager.c:184 src/skins/ui_manager.c:185
+#: src/hotkey/gui.c:73 src/skins/ui_manager.c:183 src/skins/ui_manager.c:184
 msgid "Stop"
 msgstr "停止"
 
-#: src/hotkey/gui.c:76
-msgid "Next Track"
+#: src/hotkey/gui.c:74
+msgid "Next track"
 msgstr "下一個音軌"
 
-#: src/hotkey/gui.c:77
-msgid "Forward 5 Seconds"
+#: src/hotkey/gui.c:75
+msgid "Forward 5 seconds"
 msgstr "快轉五秒"
 
-#: src/hotkey/gui.c:78
-msgid "Rewind 5 Seconds"
+#: src/hotkey/gui.c:76
+msgid "Rewind 5 seconds"
 msgstr "倒轉五秒"
 
-#: src/hotkey/gui.c:79
+#: src/hotkey/gui.c:77
 msgid "Mute"
 msgstr "靜音"
 
-#: src/hotkey/gui.c:80
-msgid "Volume Up"
+#: src/hotkey/gui.c:78
+msgid "Volume up"
 msgstr "提高音量"
 
-#: src/hotkey/gui.c:81
-msgid "Volume Down"
+#: src/hotkey/gui.c:79
+msgid "Volume down"
 msgstr "降低音量"
 
-#: src/hotkey/gui.c:82 src/skins/ui_manager.c:423 src/skins/ui_manager.c:424
-msgid "Jump to File"
+#: src/hotkey/gui.c:80
+msgid "Jump to file"
 msgstr "跳至檔案"
 
-#: src/hotkey/gui.c:83
-msgid "Toggle Player Window(s)"
-msgstr ""
+#: src/hotkey/gui.c:81
+msgid "Toggle player window(s)"
+msgstr "切換顯示播放器視窗"
 
-#: src/hotkey/gui.c:84
+#: src/hotkey/gui.c:82
 msgid "Show On-Screen-Display"
 msgstr "顯示 OSD"
 
-#: src/hotkey/gui.c:85
-msgid "Toggle Repeat"
+#: src/hotkey/gui.c:83
+msgid "Toggle repeat"
 msgstr "切換重複播放"
 
-#: src/hotkey/gui.c:86
-msgid "Toggle Shuffle"
+#: src/hotkey/gui.c:84
+msgid "Toggle shuffle"
 msgstr "切換隨機播放"
 
-#: src/hotkey/gui.c:87
-msgid "Raise Player Window(s)"
-msgstr ""
+#: src/hotkey/gui.c:85
+msgid "Toggle stop after current"
+msgstr "播放完目前歌曲後停止"
+
+#: src/hotkey/gui.c:86
+msgid "Raise player window(s)"
+msgstr "將播放器視窗放到最上層"
 
-#: src/hotkey/gui.c:97
+#: src/hotkey/gui.c:96
 msgid "(none)"
 msgstr "(無)"
 
-#: src/hotkey/gui.c:234
+#: src/hotkey/gui.c:233
 msgid ""
-"It is not recommended to bind the primary mouse buttons without modificators.\n"
+"It is not recommended to bind the primary mouse buttons without "
+"modificators.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
+"不建議在不使用組合鍵的情況下綁定滑鼠按鍵。\n"
+"\n"
+"您想要繼續嗎？"
 
-#: src/hotkey/gui.c:236
+#: src/hotkey/gui.c:235
 msgid "Binding mouse buttons"
 msgstr "綁定滑鼠按鈕"
 
-#: src/hotkey/gui.c:386
+#: src/hotkey/gui.c:385
 msgid "Global Hotkey Plugin Configuration"
 msgstr "全域熱鍵外掛設定"
 
-#: src/hotkey/gui.c:402
+#: src/hotkey/gui.c:401
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "請在輸入欄位中按下想要的按鍵組合。\n你也可以綁定滑鼠按鈕。"
+msgstr ""
+"請在輸入欄位中按下想要的按鍵組合。\n"
+"您也可以綁定滑鼠按鈕。"
 
-#: src/hotkey/gui.c:407
+#: src/hotkey/gui.c:406
 msgid "Hotkeys:"
-msgstr "熱鍵:"
+msgstr "熱鍵："
 
-#: src/hotkey/gui.c:424
+#: src/hotkey/gui.c:423
 msgid "Action:"
-msgstr "動作:"
+msgstr "動作："
 
-#: src/hotkey/gui.c:431
+#: src/hotkey/gui.c:430
 msgid "Key Binding:"
-msgstr "按鍵綁定:"
+msgstr "按鍵綁定："
 
-#: src/hotkey/plugin.c:68
+#: src/hotkey/plugin.c:66
 msgid ""
 "Global Hotkey Plugin\n"
 "Control the player with global key combinations or multimedia keys.\n"
@@ -1982,103 +2207,128 @@
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributers include:\n"
+"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/hotkey/plugin.c:80
+#: src/hotkey/plugin.c:78
 msgid "Global Hotkeys"
-msgstr ""
+msgstr "全域熱鍵"
 
-#: src/jack/jack.c:411
+#: src/jack/jack.c:410
 msgid ""
 "Based on xmms-jack, by Chris Morgan:\n"
 "http://xmms-jack.sourceforge.net/\n"
 "\n"
 "Ported to Audacious by Giacomo Lozito"
 msgstr ""
+"Based on xmms-jack, by Chris Morgan:\n"
+"http://xmms-jack.sourceforge.net/\n"
+"\n"
+"Ported to Audacious by Giacomo Lozito"
 
-#: src/jack/jack.c:417
+#: src/jack/jack.c:416
 msgid "JACK Output"
-msgstr ""
+msgstr "JACK 輸出"
 
-#: src/ladspa/plugin.c:494
+#: src/ladspa/plugin.c:493
 #, c-format
 msgid "%s Settings"
 msgstr "%s 設定"
 
-#: src/ladspa/plugin.c:562
+#: src/ladspa/plugin.c:561
 msgid "LADSPA Host Settings"
 msgstr "LADSPA 主控端設定"
 
-#: src/ladspa/plugin.c:571
+#: src/ladspa/plugin.c:570
 msgid "Module paths:"
-msgstr "模組路徑:"
+msgstr "模組路徑："
 
-#: src/ladspa/plugin.c:576
+#: src/ladspa/plugin.c:575
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
-msgstr "用逗點區隔不同的路徑。\n系統除了 LADSPA_PATH 之外也會搜尋這些路徑。\n加入新路徑之後請按 Enter 掃描新的外掛。"
+msgstr ""
+"用逗點區隔不同的路徑。\n"
+"系統除了 LADSPA_PATH 之外也會搜尋這些路徑。\n"
+"加入新路徑之後請按 Enter 掃描新的外掛。"
 
-#: src/ladspa/plugin.c:592
+#: src/ladspa/plugin.c:591
 msgid "Available plugins:"
-msgstr "可用的外掛:"
+msgstr "可用的外掛："
 
-#: src/ladspa/plugin.c:605
+#: src/ladspa/plugin.c:604 src/modplug/plugin_main.c:115
+#: src/modplug/plugin_main.c:119 src/modplug/plugin_main.c:123
+#: src/modplug/plugin_main.c:127
 msgid "Enable"
 msgstr "啟用"
 
-#: src/ladspa/plugin.c:611
+#: src/ladspa/plugin.c:610
 msgid "Enabled plugins:"
-msgstr "啟用外掛:"
+msgstr "啟用外掛："
 
-#: src/ladspa/plugin.c:627
+#: src/ladspa/plugin.c:626
 msgid "Settings"
 msgstr "設定"
 
-#: src/ladspa/plugin.c:646
+#: src/ladspa/plugin.c:645
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
 
-#: src/ladspa/plugin.c:651
+#: src/ladspa/plugin.c:650
 msgid "LADSPA Host"
-msgstr ""
+msgstr "LADSPA 主控端"
 
-#: src/lirc/lirc.c:77
+#: src/lirc/lirc.c:76
 #, c-format
 msgid "%s: could not init LIRC support\n"
-msgstr ""
+msgstr "%s：無法初始化 LIRC 支援\n"
 
-#: src/lirc/lirc.c:84
+#: src/lirc/lirc.c:83
 #, c-format
 msgid ""
 "%s: could not read LIRC config file\n"
 "%s: please read the documentation of LIRC\n"
 "%s: how to create a proper config file\n"
 msgstr ""
+"%s：無法讀取 LIRC 組態檔\n"
+"%s：請閱讀 LIRC 的相關文件\n"
+"%s：如何建立一個適合的組態檔\n"
 
-#: src/lirc/lirc.c:115
+#: src/lirc/lirc.c:114
 #, c-format
 msgid "%s: trying to reconnect...\n"
-msgstr ""
+msgstr "%s：嘗試重新連線中...\n"
 
-#: src/lirc/lirc.c:373
+#: src/lirc/lirc.c:354
 #, c-format
 msgid "%s: unknown command \"%s\"\n"
-msgstr ""
+msgstr "%s：未知的命令「%s」\n"
 
-#: src/lirc/lirc.c:384
+#: src/lirc/lirc.c:365
 #, c-format
 msgid "%s: disconnected from LIRC\n"
-msgstr ""
+msgstr "%s：已從 LIRC 離線\n"
 
-#: src/lirc/lirc.c:390
+#: src/lirc/lirc.c:371
 #, c-format
 msgid "%s: will try reconnect every %d seconds...\n"
-msgstr ""
+msgstr "%s：將每 %d 秒嘗試重新連線一次...\n"
 
-#: src/lirc/lirc.c:400
+#: src/lirc/lirc.c:381
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2093,68 +2343,80 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
+"A simple plugin to control Audacious using the LIRC remote control daemon\n"
+"\n"
+"Adapted for Audacious by:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Based on the XMMS LIRC plugin by:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"For more information about LIRC, see http://lirc.org."
 
-#: src/lirc/lirc.c:411
+#: src/lirc/lirc.c:392
 msgid "Connection"
-msgstr ""
+msgstr "連線"
 
-#: src/lirc/lirc.c:412
+#: src/lirc/lirc.c:393
 msgid "Reconnect to LIRC server"
-msgstr ""
+msgstr "重新連線至 LIRC 伺服器"
 
-#: src/lirc/lirc.c:414
+#: src/lirc/lirc.c:395
 msgid "Wait before reconnecting:"
-msgstr ""
+msgstr "重新連線前的等待時間："
 
-#: src/lirc/lirc.c:424
+#: src/lirc/lirc.c:405
 msgid "LIRC Plugin"
-msgstr ""
+msgstr "Linux 紅外線遙控器外掛"
 
-#: src/lyricwiki/lyricwiki.c:119
+#: src/lyricwiki/lyricwiki.c:117
 msgid "No lyrics available"
-msgstr ""
+msgstr "無可用的歌詞"
 
-#: src/lyricwiki/lyricwiki.c:189 src/lyricwiki/lyricwiki.c:215
+#: src/lyricwiki/lyricwiki.c:207 src/lyricwiki/lyricwiki.c:241
 #, c-format
 msgid "Unable to fetch %s"
-msgstr ""
+msgstr "無法取得 %s"
 
-#: src/lyricwiki/lyricwiki.c:199 src/lyricwiki/lyricwiki.c:225
+#: src/lyricwiki/lyricwiki.c:217 src/lyricwiki/lyricwiki.c:251
 #, c-format
 msgid "Unable to parse %s"
-msgstr ""
+msgstr "無法分析 %s"
 
-#: src/lyricwiki/lyricwiki.c:234
+#: src/lyricwiki/lyricwiki.c:260
 msgid "Looking for lyrics ..."
-msgstr ""
+msgstr "尋找歌詞中 ..."
 
-#: src/lyricwiki/lyricwiki.c:245
+#: src/lyricwiki/lyricwiki.c:271
 msgid "Missing song metadata"
-msgstr ""
+msgstr "找不到歌曲詮釋資料"
 
-#: src/lyricwiki/lyricwiki.c:258
+#: src/lyricwiki/lyricwiki.c:284
 msgid "Connecting to lyrics.wikia.com ..."
-msgstr ""
+msgstr "連線至 lyrics.wikia.com 中 ..."
 
-#: src/lyricwiki/lyricwiki.c:387
+#: src/lyricwiki/lyricwiki.c:411
 msgid "LyricWiki Plugin"
-msgstr ""
+msgstr "LyricWiki 歌詞外掛"
 
-#: src/m3u/m3u.c:123
+#: src/m3u/m3u.c:121
 msgid "M3U Playlists"
-msgstr ""
+msgstr "M3U 播放清單"
 
-#: src/metronom/metronom.c:129
+#: src/metronom/metronom.c:127
 #, c-format
 msgid "Tact generator: %d bpm"
-msgstr ""
+msgstr "節拍產生器：%d bpm"
 
-#: src/metronom/metronom.c:131
+#: src/metronom/metronom.c:129
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
-msgstr ""
+msgstr "節拍產生器：%d bpm %d／%d"
 
-#: src/metronom/metronom.c:248
+#: src/metronom/metronom.c:246
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2162,125 +2424,288 @@
 "e.g. tact://77 to play 77 beats per minute\n"
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
+"A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"用法：加入網址：tact://beats*num/den\n"
+"範例：tact://77 播放 77 BPM\n"
+"或 tact://60*3/4 以 3/4 拍播放 60 BPM"
 
-#: src/metronom/metronom.c:257
+#: src/metronom/metronom.c:255
 msgid "Tact Generator"
-msgstr ""
+msgstr "節拍產生器"
 
-#: src/mixer/mixer.c:171
+#: src/mixer/mixer.c:169
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.c:175
+#: src/mixer/mixer.c:173
 msgid "Channel Mixer"
-msgstr ""
+msgstr "聲道混合"
 
-#: src/mixer/mixer.c:176
+#: src/mixer/mixer.c:174
 msgid "Output channels:"
-msgstr "輸出聲道數目:"
+msgstr "輸出聲道數目："
 
-#: src/mixer/mixer.c:186
+#: src/mixer/mixer.c:184
 msgid "Channel Mixer"
-msgstr ""
+msgstr "聲道混合"
 
-#: src/mms/mms.c:226
+#: src/mms/mms.c:224
 msgid "MMS Plugin"
-msgstr ""
+msgstr "MMS 外掛"
+
+#: src/modplug/plugin_main.c:57
+msgid "Resolution"
+msgstr "解析度"
+
+#: src/modplug/plugin_main.c:58
+msgid "8-bit"
+msgstr "8-bit"
+
+#: src/modplug/plugin_main.c:60
+msgid "16-bit"
+msgstr "16-bit"
+
+#: src/modplug/plugin_main.c:62
+msgid "Channels"
+msgstr "聲道"
+
+#: src/modplug/plugin_main.c:67
+msgid "Resampling"
+msgstr "重取樣"
+
+#: src/modplug/plugin_main.c:68
+msgid "Nearest (fastest)"
+msgstr "最近點取樣(最快)"
+
+#: src/modplug/plugin_main.c:70
+msgid "Linear (fast)"
+msgstr "線性取樣(快)"
+
+#: src/modplug/plugin_main.c:72
+msgid "Spline (good)"
+msgstr "曲線函數(佳)"
+
+#: src/modplug/plugin_main.c:74
+msgid "Polyphase (best)"
+msgstr "多相位取樣(最佳)"
+
+#: src/modplug/plugin_main.c:76
+msgid "Sampling rate"
+msgstr "取樣率"
+
+#: src/modplug/plugin_main.c:77
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.c:79
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.c:81
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.c:83
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.c:88 src/modplug/plugin_main.c:95
+#: src/modplug/plugin_main.c:102
+msgid "Level:"
+msgstr "強度："
+
+#: src/modplug/plugin_main.c:97
+msgid "Cutoff:"
+msgstr "裁切："
+
+#: src/modplug/plugin_main.c:114
+msgid "Reverb"
+msgstr "回音"
+
+#: src/modplug/plugin_main.c:118
+msgid "Bass Boost"
+msgstr "重低音強化"
+
+#: src/modplug/plugin_main.c:122
+msgid "Surround"
+msgstr "環繞音效"
+
+#: src/modplug/plugin_main.c:126
+msgid "Preamp"
+msgstr "前置放大"
+
+#: src/modplug/plugin_main.c:133
+msgid "Miscellaneous"
+msgstr "其他選項"
+
+#: src/modplug/plugin_main.c:134
+msgid "Oversample"
+msgstr "超取樣"
+
+#: src/modplug/plugin_main.c:136
+msgid "Noise reduction"
+msgstr "降噪"
+
+#: src/modplug/plugin_main.c:138
+msgid "Play Amiga MODs"
+msgstr "播放 Amiga MOD 檔案"
+
+#: src/modplug/plugin_main.c:140
+msgid "Repeat"
+msgstr "重複"
+
+#: src/modplug/plugin_main.c:141
+msgid "Repeat count:"
+msgstr "重複次數："
+
+#: src/modplug/plugin_main.c:143
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "將重複次數設定為 -1 表示永遠重複播放。"
 
-#: src/modplug/plugin_main.c:13
+#: src/modplug/plugin_main.c:238
 msgid "ModPlug (Module Player)"
-msgstr ""
+msgstr "ModPlug (MOD 播放器)"
 
-#: src/mpg123/mpg123.c:197
+#: src/mpg123/mpg123.c:213
 msgid "Surround"
 msgstr "環繞"
 
-#: src/mpg123/mpg123.c:554
+#: src/mpg123/mpg123.c:569
 msgid "MPG123 Plugin"
-msgstr ""
+msgstr "MPG123 外掛"
 
-#: src/mpris2/plugin.c:412
+#: src/mpris2/plugin.c:403
 msgid "MPRIS 2 Server"
-msgstr ""
+msgstr "MPRIS 2 伺服器"
 
-#: src/neon/neon.c:1230
+#: src/neon/neon.c:1228
 msgid "Neon HTTP/HTTPS Plugin"
-msgstr ""
+msgstr "Neon HTTP／HTTPS 外掛"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Stopped"
 msgstr "已停止"
 
-#: src/notify/event.c:49
+#: src/notify/event.c:64
 msgid "Audacious is not playing."
-msgstr ""
+msgstr "Audacious 非播放中。"
 
-#: src/notify/notify.c:35
+#: src/notify/notify.c:33
 msgid ""
-"Based on libnotify-aosd by Maximilian Bogner:\n"
-"http://www.mbogner.de/projects/libnotify-aosd/\n"
-"\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011 John Lindgren\n"
-"\n"
-"This plugin is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
 "\n"
-"This plugin is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>."
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
+"Desktop Notifications Plugin for Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"This plugin is free software: you can redistribute it and/or modify it under "
+"the terms of the GNU General Public License as published by the Free "
+"Software Foundation, either version 3 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This plugin is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program. If not, see <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.c:77
+msgid "Show playback controls"
+msgstr "顯示播放控制元件"
+
+#: src/notify/notify.c:80
+msgid "Always show notification"
+msgstr "永遠顯示通知"
 
-#: src/notify/notify.c:52
+#: src/notify/notify.c:92
 msgid "Desktop Notifications"
-msgstr ""
+msgstr "桌面通知"
+
+#: src/notify/osd.c:57
+msgid "Show"
+msgstr "顯示"
+
+#: src/notify/osd.c:65 src/skins/ui_manager.c:180 src/skins/ui_manager.c:181
+msgid "Pause"
+msgstr "暫停"
+
+#: src/notify/osd.c:72 src/skins/ui_manager.c:189 src/skins/ui_manager.c:190
+msgid "Next"
+msgstr "下一個"
 
 #: src/oss4/plugin.c:36
 msgid "1. Default device"
 msgstr "1. 預設裝置"
 
-#: src/oss4/plugin.c:75 src/sndio/sndio.c:414
+#: src/oss4/plugin.c:75 src/sndio/sndio.c:393
 msgid "Audio device:"
-msgstr "音訊裝置:"
+msgstr "音訊裝置："
 
 #: src/oss4/plugin.c:77
 msgid "Use alternate device:"
-msgstr "使用替代裝置:"
+msgstr "使用替代裝置："
 
 #: src/oss4/plugin.c:81
 msgid "Save volume between sessions."
-msgstr ""
+msgstr "儲存不同工作階段的音量。"
 
 #: src/oss4/plugin.c:83
 msgid "Enable format conversions made by the OSS software."
-msgstr ""
+msgstr "啟用格式轉換 (使用 OSS 軟體)。"
 
 #: src/oss4/plugin.c:85
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr ""
+msgstr "啟用獨占模式以防止虛擬混音。"
 
 #: src/oss4/plugin.c:108
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"I would like to thank people on #audacious, especially Tony Vroon and John Lindgren and of course the authors of the previous OSS plugin."
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
+"OSS4 Output Plugin for Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"I would like to thank people on #audacious, especially Tony Vroon and John "
+"Lindgren and of course the authors of the previous OSS plugin."
 
 #: src/oss4/plugin.c:115
 msgid "OSS4 Output"
-msgstr ""
+msgstr "OSS4 輸出"
 
-#: src/pls/pls.c:114
+#: src/pls/pls.c:113
 msgid "PLS Playlists"
-msgstr ""
+msgstr "PLS 播放清單"
 
-#: src/psf/plugin.c:263
+#: src/psf/plugin.c:264
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr ""
+msgstr "OpenPSF PSF1／PSF2 解碼器"
 
-#: src/pulse_audio/pulse_audio.c:646
+#: src/pulse_audio/pulse_audio.c:644
 msgid ""
 "Audacious PulseAudio Output Plugin\n"
 "\n"
@@ -2299,160 +2724,235 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 msgstr ""
+"Audacious PulseAudio Output Plugin\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation; either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program; if not, write to the Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
 
-#: src/pulse_audio/pulse_audio.c:664
+#: src/pulse_audio/pulse_audio.c:662
 msgid "PulseAudio Output"
-msgstr ""
+msgstr "PulseAudio 輸出"
 
-#: src/resample/resample.c:163
+#: src/resample/resample.c:161
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/resample/resample.c:167
+#: src/resample/resample.c:165
 msgid "Skip/repeat samples"
-msgstr ""
+msgstr "跳過／重複取樣"
 
-#: src/resample/resample.c:168
+#: src/resample/resample.c:166
 msgid "Linear interpolation"
-msgstr ""
+msgstr "線性內插"
 
-#: src/resample/resample.c:169
+#: src/resample/resample.c:167
 msgid "Fast sinc interpolation"
-msgstr ""
+msgstr "快速 sinc 內插"
 
-#: src/resample/resample.c:170
+#: src/resample/resample.c:168
 msgid "Medium sinc interpolation"
-msgstr ""
+msgstr "中等 sinc 內插"
 
-#: src/resample/resample.c:171
+#: src/resample/resample.c:169
 msgid "Best sinc interpolation"
-msgstr ""
+msgstr "最佳 sinc 內插"
 
-#: src/resample/resample.c:174
+#: src/resample/resample.c:172
 msgid "Conversion"
-msgstr ""
+msgstr "轉換"
 
-#: src/resample/resample.c:175
+#: src/resample/resample.c:173
 msgid "Method:"
-msgstr "演算法:"
+msgstr "演算法："
 
-#: src/resample/resample.c:178
+#: src/resample/resample.c:176 src/sox-resampler/sox-resampler.c:151
 msgid "Rate:"
-msgstr ""
+msgstr "取樣率："
 
-#: src/resample/resample.c:181
+#: src/resample/resample.c:179
 msgid "Rate Mappings"
-msgstr ""
+msgstr "取樣率映射"
 
-#: src/resample/resample.c:182
+#: src/resample/resample.c:180
 msgid "Use rate mappings"
-msgstr ""
+msgstr "使用取樣率映射"
 
-#: src/resample/resample.c:184
+#: src/resample/resample.c:182
 msgid "8 kHz:"
-msgstr ""
+msgstr "8 kHz："
 
-#: src/resample/resample.c:187
+#: src/resample/resample.c:185
 msgid "16 kHz:"
-msgstr ""
+msgstr "16 kHz："
 
-#: src/resample/resample.c:190
+#: src/resample/resample.c:188
 msgid "22.05 kHz:"
-msgstr ""
+msgstr "22.05 kHz："
 
-#: src/resample/resample.c:193
+#: src/resample/resample.c:191
 msgid "44.1 kHz:"
-msgstr ""
+msgstr "44.1 kHz："
 
-#: src/resample/resample.c:196
+#: src/resample/resample.c:194
 msgid "48 kHz:"
-msgstr ""
+msgstr "48 kHz："
 
-#: src/resample/resample.c:199
+#: src/resample/resample.c:197
 msgid "96 kHz:"
-msgstr ""
+msgstr "96 kHz："
 
-#: src/resample/resample.c:202
+#: src/resample/resample.c:200
 msgid "192 kHz:"
-msgstr ""
+msgstr "192 kHz："
 
-#: src/resample/resample.c:212
+#: src/resample/resample.c:210
 msgid "Sample Rate Converter"
-msgstr ""
+msgstr "取樣率轉換"
+
+#: src/scrobbler2/config_window.c:41
+#, c-format
+msgid "OK. Scrobbling for user: %s"
+msgstr "確認。上傳使用者 %s 的播放資訊"
 
-#: src/scrobbler/configure.c:121 src/scrobbler/configure.c:169
-msgid "Change password"
-msgstr "變更密碼"
+#: src/scrobbler2/config_window.c:52
+msgid "Permission Denied"
+msgstr "存取被拒"
 
-#: src/scrobbler/configure.c:138
-msgid "Services"
-msgstr "服務"
+#: src/scrobbler2/config_window.c:54
+msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgstr "點選下列連結允許 Audacious 上傳您的播放資訊："
 
-#: src/scrobbler/configure.c:143
-msgid "Last.fm"
+#: src/scrobbler2/config_window.c:63
+msgid "Keep this window open and click 'Check Permission' again.\n"
+msgstr "請保持這個視窗的開啟並再次點選「檢查權限」。\n"
+
+#: src/scrobbler2/config_window.c:66 src/scrobbler2/config_window.c:77
+msgid ""
+"Don't worry. Your scrobbles are saved on your computer.\n"
+"They will be submitted as soon as Audacious is allowed to do so."
 msgstr ""
+"別擔心。您的資訊已經儲存在電腦上。\n"
+"Audacious 會在狀況允許下盡快地將它們上傳。"
+
+#: src/scrobbler2/config_window.c:74
+msgid "Network Problem."
+msgstr "網路發生問題。"
+
+#: src/scrobbler2/config_window.c:75
+msgid "There was a problem contacting Last.fm. Please try again later."
+msgstr "存取 Last.fm 時發生問題。請稍候再試。"
 
-#: src/scrobbler/configure.c:147
-msgid "Username:"
-msgstr "使用者名稱:"
+#: src/scrobbler2/config_window.c:107
+msgid "Checking..."
+msgstr "檢查中..."
 
-#: src/scrobbler/configure.c:151
-msgid "Password:"
-msgstr "密碼:"
+#: src/scrobbler2/config_window.c:173
+msgid "C_heck Permission"
+msgstr "檢查權限(_H)"
+
+#: src/scrobbler2/config_window.c:174
+msgid "_Revoke Permission"
+msgstr "撤銷授權(_R)"
+
+#: src/scrobbler2/config_window.c:221
+msgid ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+msgstr "您需要允許 Audacious 上傳音軌的播放資訊至您的 Last.fm 帳號。\n"
 
-#: src/scrobbler/configure.c:155
-msgid "Scrobbler URL:"
+#: src/scrobbler2/scrobbler.c:233
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
 msgstr ""
+"無法啟動 Scrobbler 外掛。\n"
+"您的安裝可能有些問題。"
 
-#: src/scrobbler/plugin.c:180
+#: src/scrobbler2/scrobbler.c:311
 msgid ""
-"Audacious AudioScrobbler Plugin\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
 "\n"
-"Originally created by Audun Hove <audun@nlc.no> and Pipian <pipian@pipian.com>"
 msgstr ""
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Thanks to John Lindgren for giving me a hand at the beginning of this "
+"project.\n"
+"\n"
+
+#: src/scrobbler2/scrobbler.c:317
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
 
-#: src/scrobbler/plugin.c:185
-msgid "Scrobbler"
+#: src/scrobbler2/scrobbler_communication.c:743
+msgid ""
+"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
+"Please check the Preferences for the Scrobbler plugin."
 msgstr ""
+"Audacious 現在使用改良版的 Last.fm 播放資訊上傳功能。\n"
+"請參閱偏好設定中的播放資訊外掛。"
 
-#: src/sdlout/plugin.c:27
+#: src/sdlout/plugin.c:26
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/sdlout/plugin.c:32
+#: src/sdlout/plugin.c:31
 msgid "SDL Output"
-msgstr ""
+msgstr "SDL 輸出"
 
-#: src/search-tool/search-tool.c:113 src/search-tool/search-tool.c:123
+#: src/search-tool/search-tool.c:111 src/search-tool/search-tool.c:121
 msgid "Library"
 msgstr "媒體櫃"
 
-#: src/search-tool/search-tool.c:221
+#: src/search-tool/search-tool.c:219
 msgid "Unknown Artist"
-msgstr ""
+msgstr "未知的藝人"
 
-#: src/search-tool/search-tool.c:223
+#: src/search-tool/search-tool.c:221
 msgid "Unknown Album"
-msgstr ""
+msgstr "未知的專輯"
 
-#: src/search-tool/search-tool.c:627
+#: src/search-tool/search-tool.c:632
 #, c-format
 msgid ""
 "%s\n"
 " on %s by %s"
 msgstr ""
+"%s\n"
+" 於「%s」由「%s」演唱"
 
-#: src/search-tool/search-tool.c:633
+#: src/search-tool/search-tool.c:638
 #, c-format
 msgid "%d album"
 msgid_plural "%d albums"
-msgstr[0] ""
+msgstr[0] "%d 張專輯"
 
-#: src/search-tool/search-tool.c:635
+#: src/search-tool/search-tool.c:640
 #, c-format
 msgid ""
 "%s\n"
@@ -2461,8 +2961,10 @@
 "%s\n"
 " %s, %d songs"
 msgstr[0] ""
+"%s\n"
+" %s，%d 首歌曲"
 
-#: src/search-tool/search-tool.c:641
+#: src/search-tool/search-tool.c:646
 #, c-format
 msgid ""
 "%s\n"
@@ -2471,74 +2973,77 @@
 "%s\n"
 " %d songs by %s"
 msgstr[0] ""
+"%s\n"
+" %d 首歌曲由「%s」演唱"
 
-#: src/search-tool/search-tool.c:682
+#: src/search-tool/search-tool.c:687
 msgid "_Create Playlist"
 msgstr "建立播放清單(_C)"
 
-#: src/search-tool/search-tool.c:689
+#: src/search-tool/search-tool.c:694
 msgid "_Add to Playlist"
-msgstr "加入至播放清單(_A):"
+msgstr "加入至播放清單(_A)"
 
-#: src/search-tool/search-tool.c:729
+#: src/search-tool/search-tool.c:734
 msgid "Search library"
 msgstr "搜尋媒體櫃"
 
-#: src/search-tool/search-tool.c:734
+#: src/search-tool/search-tool.c:739
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
-msgstr "要將您的媒體櫃匯入至 Audacious，請選擇目標資料夾並且按下 \"重新整理\" 圖示。"
+msgstr ""
+"要將您的媒體櫃匯入至 Audacious，請選擇目標資料夾並且按下 \"重新整理\" 圖示。"
 
-#: src/search-tool/search-tool.c:742
+#: src/search-tool/search-tool.c:747
 msgid "Please wait ..."
 msgstr "請稍候 ..."
 
-#: src/search-tool/search-tool.c:764
+#: src/search-tool/search-tool.c:769
 msgid "Choose Folder"
 msgstr "選擇資料夾"
 
-#: src/search-tool/search-tool.c:803
+#: src/search-tool/search-tool.c:808
 msgid "Search Tool"
-msgstr ""
+msgstr "搜尋工具"
 
-#: src/skins/plugin.c:50
+#: src/skins/plugin.c:49
 msgid "Winamp Classic Interface"
-msgstr ""
+msgstr "Winamp 傳統介面"
 
-#: src/skins/skins_cfg.c:207
+#: src/skins/skins_cfg.c:204
 msgid "_Player:"
-msgstr "播放器(_P):"
+msgstr "播放器(_P)："
 
-#: src/skins/skins_cfg.c:208
+#: src/skins/skins_cfg.c:205
 msgid "Select main player window font:"
-msgstr "選擇播放器主視窗字型:"
+msgstr "選擇播放器主視窗字型："
 
-#: src/skins/skins_cfg.c:210
+#: src/skins/skins_cfg.c:207
 msgid "_Playlist:"
-msgstr "播放清單(_P):"
+msgstr "播放清單(_P)："
 
-#: src/skins/skins_cfg.c:211
+#: src/skins/skins_cfg.c:208
 msgid "Select playlist font:"
-msgstr "選擇播放清單字型:"
+msgstr "選擇播放清單字型："
 
-#: src/skins/skins_cfg.c:215
+#: src/skins/skins_cfg.c:212
 msgid "_Fonts"
 msgstr "字型(_F)"
 
-#: src/skins/skins_cfg.c:218
+#: src/skins/skins_cfg.c:215
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "使用點陣字型 (只支援 ASCII)"
 
-#: src/skins/skins_cfg.c:220
+#: src/skins/skins_cfg.c:217
 msgid "Scroll song title in both directions"
 msgstr "雙向捲動歌曲標題"
 
-#: src/skins/skins_cfg.c:298
+#: src/skins/skins_cfg.c:295
 msgid "_Skin"
 msgstr "面板"
 
-#: src/skins/skins_cfg.c:345
+#: src/skins/skins_cfg.c:342
 msgid "Interface Preferences"
 msgstr "介面偏好設定"
 
@@ -2594,7 +3099,7 @@
 msgid "Presets"
 msgstr "樣式"
 
-#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:452
+#: src/skins/ui_equalizer.c:971 src/skins/ui_manager.c:451
 msgid "Load preset"
 msgstr "載入樣式"
 
@@ -2607,7 +3112,7 @@
 msgid "Load equalizer preset"
 msgstr "載入等化器樣式"
 
-#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:473
+#: src/skins/ui_equalizer.c:1071 src/skins/ui_manager.c:472
 msgid "Save preset"
 msgstr "儲存樣式"
 
@@ -2619,7 +3124,7 @@
 msgid "Save equalizer preset"
 msgstr "儲存等化器樣式"
 
-#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:488
+#: src/skins/ui_equalizer.c:1173 src/skins/ui_manager.c:487
 msgid "Delete preset"
 msgstr "刪除樣式"
 
@@ -2627,742 +3132,753 @@
 msgid "Delete auto-preset"
 msgstr "刪除自動載入樣式"
 
-#: src/skins/ui_main.c:440
+#: src/skins/ui_main.c:414
 msgid "kbps"
 msgstr "kbps"
 
-#: src/skins/ui_main.c:448
+#: src/skins/ui_main.c:422
 msgid "kHz"
 msgstr "kHz"
 
-#: src/skins/ui_main.c:805
+#: src/skins/ui_main.c:770
 #, c-format
 msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "移動至 %d:%-2.2d / %d:%-2.2d"
+msgstr "移動至 %d:%-2.2d／%d:%-2.2d"
 
-#: src/skins/ui_main.c:826
+#: src/skins/ui_main.c:791
 #, c-format
 msgid "Volume: %d%%"
-msgstr "音量: %d%%"
+msgstr "音量：%d％"
 
-#: src/skins/ui_main.c:849
+#: src/skins/ui_main.c:814
 #, c-format
 msgid "Balance: %d%% left"
-msgstr "平衡: %d%% 偏左"
+msgstr "平衡：%d％ 偏左"
 
-#: src/skins/ui_main.c:851
+#: src/skins/ui_main.c:816
 msgid "Balance: center"
-msgstr "平衡: 中間"
+msgstr "平衡：中間"
 
-#: src/skins/ui_main.c:853
+#: src/skins/ui_main.c:818
 #, c-format
 msgid "Balance: %d%% right"
-msgstr "平衡: %d%% 偏右"
+msgstr "平衡：%d％ 偏右"
 
-#: src/skins/ui_main.c:979
+#: src/skins/ui_main.c:942
 msgid "Options Menu"
 msgstr "選單選項"
 
-#: src/skins/ui_main.c:983
+#: src/skins/ui_main.c:946
 msgid "Disable 'Always On Top'"
 msgstr "關閉置頂"
 
-#: src/skins/ui_main.c:985
+#: src/skins/ui_main.c:948
 msgid "Enable 'Always On Top'"
 msgstr "啟用置頂"
 
-#: src/skins/ui_main.c:988
+#: src/skins/ui_main.c:951
 msgid "File Info Box"
 msgstr "檔案資訊視窗"
 
-#: src/skins/ui_main.c:993
+#: src/skins/ui_main.c:956
 msgid "Visualization Menu"
 msgstr "視覺特效選單"
 
-#: src/skins/ui_main.c:1643
+#: src/skins/ui_main.c:1591
 msgid "Single mode."
 msgstr "單一模式。"
 
-#: src/skins/ui_main.c:1645
+#: src/skins/ui_main.c:1593
 msgid "Playlist mode."
 msgstr "播放清單模式。"
 
-#: src/skins/ui_main.c:1667
+#: src/skins/ui_main.c:1615
 msgid "Stopping after song."
-msgstr ""
+msgstr "播放完成後停止。"
 
-#: src/skins/ui_main.c:1669
+#: src/skins/ui_main.c:1617
 msgid "Not stopping after song."
-msgstr ""
+msgstr "播放完成後不停止。"
+
+#: src/skins/ui_main.c:1752
+msgid "Repeat point A set."
+msgstr "已設定重複點 A。"
+
+#: src/skins/ui_main.c:1757
+msgid "Repeat point B set."
+msgstr "已設定重複點 B。"
+
+#: src/skins/ui_main.c:1766
+msgid "Repeat points cleared."
+msgstr "已清除重複點。"
 
-#: src/skins/ui_manager.c:67 src/skins/ui_manager.c:68
+#: src/skins/ui_manager.c:66 src/skins/ui_manager.c:67
 msgid "Autoscroll Song Name"
-msgstr ""
+msgstr "自動捲動歌名"
 
-#: src/skins/ui_manager.c:70 src/skins/ui_manager.c:71
+#: src/skins/ui_manager.c:69 src/skins/ui_manager.c:70
 msgid "Stop after Current Song"
 msgstr "播放完目前歌曲後停止"
 
-#: src/skins/ui_manager.c:73 src/skins/ui_manager.c:74
+#: src/skins/ui_manager.c:72 src/skins/ui_manager.c:73
 msgid "Peaks"
 msgstr "峰值"
 
-#: src/skins/ui_manager.c:76 src/skins/ui_manager.c:77
+#: src/skins/ui_manager.c:75 src/skins/ui_manager.c:76
 msgid "Repeat"
 msgstr "重複"
 
-#: src/skins/ui_manager.c:79 src/skins/ui_manager.c:80
+#: src/skins/ui_manager.c:78 src/skins/ui_manager.c:79
 msgid "Shuffle"
 msgstr "隨機"
 
-#: src/skins/ui_manager.c:82 src/skins/ui_manager.c:83
+#: src/skins/ui_manager.c:81 src/skins/ui_manager.c:82
 msgid "No Playlist Advance"
 msgstr "不要切換播放清單"
 
-#: src/skins/ui_manager.c:85 src/skins/ui_manager.c:86
+#: src/skins/ui_manager.c:84 src/skins/ui_manager.c:85
 msgid "Show Player"
 msgstr "顯示播放器"
 
-#: src/skins/ui_manager.c:88 src/skins/ui_manager.c:89
+#: src/skins/ui_manager.c:87 src/skins/ui_manager.c:88
 msgid "Show Playlist Editor"
 msgstr "顯示播放清單編輯器"
 
-#: src/skins/ui_manager.c:91 src/skins/ui_manager.c:92
+#: src/skins/ui_manager.c:90 src/skins/ui_manager.c:91
 msgid "Show Equalizer"
 msgstr "顯示等化器"
 
-#: src/skins/ui_manager.c:94 src/skins/ui_manager.c:95
+#: src/skins/ui_manager.c:93 src/skins/ui_manager.c:94
 msgid "Always on Top"
 msgstr "永遠在最上層"
 
-#: src/skins/ui_manager.c:97 src/skins/ui_manager.c:98
+#: src/skins/ui_manager.c:96 src/skins/ui_manager.c:97
 msgid "Put on All Workspaces"
 msgstr "在所有工作區顯示"
 
-#: src/skins/ui_manager.c:100 src/skins/ui_manager.c:101
+#: src/skins/ui_manager.c:99 src/skins/ui_manager.c:100
 msgid "Roll up Player"
 msgstr "捲起播放器"
 
-#: src/skins/ui_manager.c:103 src/skins/ui_manager.c:104
+#: src/skins/ui_manager.c:102 src/skins/ui_manager.c:103
 msgid "Roll up Playlist Editor"
 msgstr "捲起播放清單編輯器"
 
-#: src/skins/ui_manager.c:106 src/skins/ui_manager.c:107
+#: src/skins/ui_manager.c:105 src/skins/ui_manager.c:106
 msgid "Roll up Equalizer"
 msgstr "捲起等化器"
 
-#: src/skins/ui_manager.c:115
+#: src/skins/ui_manager.c:114
 msgid "Analyzer"
 msgstr "分析儀"
 
-#: src/skins/ui_manager.c:116
+#: src/skins/ui_manager.c:115
 msgid "Scope"
 msgstr "示波器"
 
-#: src/skins/ui_manager.c:117
+#: src/skins/ui_manager.c:116
 msgid "Voiceprint"
 msgstr "聲紋"
 
-#: src/skins/ui_manager.c:118
+#: src/skins/ui_manager.c:117
 msgid "Off"
 msgstr "關閉"
 
-#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
-#: src/skins/ui_manager.c:145
+#: src/skins/ui_manager.c:121 src/skins/ui_manager.c:138
+#: src/skins/ui_manager.c:144
 msgid "Normal"
 msgstr "標準"
 
-#: src/skins/ui_manager.c:123 src/skins/ui_manager.c:140
+#: src/skins/ui_manager.c:122 src/skins/ui_manager.c:139
 msgid "Fire"
 msgstr "火焰"
 
-#: src/skins/ui_manager.c:124
+#: src/skins/ui_manager.c:123
 msgid "Vertical Lines"
 msgstr "垂直線條"
 
-#: src/skins/ui_manager.c:128
+#: src/skins/ui_manager.c:127
 msgid "Lines"
 msgstr "線條"
 
-#: src/skins/ui_manager.c:129
+#: src/skins/ui_manager.c:128
 msgid "Bars"
 msgstr "棒狀"
 
-#: src/skins/ui_manager.c:133
+#: src/skins/ui_manager.c:132
 msgid "Dot Scope"
 msgstr "點狀"
 
-#: src/skins/ui_manager.c:134
+#: src/skins/ui_manager.c:133
 msgid "Line Scope"
 msgstr "線狀"
 
-#: src/skins/ui_manager.c:135
+#: src/skins/ui_manager.c:134
 msgid "Solid Scope"
 msgstr "實心"
 
-#: src/skins/ui_manager.c:141
+#: src/skins/ui_manager.c:140
 msgid "Ice"
 msgstr "冰霜"
 
-#: src/skins/ui_manager.c:146
+#: src/skins/ui_manager.c:145
 msgid "Smooth"
 msgstr "平滑"
 
-#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
+#: src/skins/ui_manager.c:149 src/skins/ui_manager.c:157
 msgid "Slowest"
 msgstr "最慢"
 
-#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/skins/ui_manager.c:150 src/skins/ui_manager.c:158
 msgid "Slow"
 msgstr "慢"
 
-#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
+#: src/skins/ui_manager.c:151 src/skins/ui_manager.c:159
+#: src/sox-resampler/sox-resampler.c:143
 msgid "Medium"
 msgstr "中等"
 
-#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
+#: src/skins/ui_manager.c:152 src/skins/ui_manager.c:160
 msgid "Fast"
 msgstr "快"
 
-#: src/skins/ui_manager.c:154 src/skins/ui_manager.c:162
+#: src/skins/ui_manager.c:153 src/skins/ui_manager.c:161
 msgid "Fastest"
 msgstr "最快"
 
-#: src/skins/ui_manager.c:166
+#: src/skins/ui_manager.c:165
 msgid "Time Elapsed"
 msgstr "經過時間"
 
-#: src/skins/ui_manager.c:167
+#: src/skins/ui_manager.c:166
 msgid "Time Remaining"
 msgstr "剩餘時間"
 
-#: src/skins/ui_manager.c:181 src/skins/ui_manager.c:182
-msgid "Pause"
-msgstr "暫停"
-
-#: src/skins/ui_manager.c:187 src/skins/ui_manager.c:188
+#: src/skins/ui_manager.c:186 src/skins/ui_manager.c:187
 msgid "Previous"
 msgstr "上一個"
 
-#: src/skins/ui_manager.c:190 src/skins/ui_manager.c:191
-msgid "Next"
-msgstr "下一個"
-
-#: src/skins/ui_manager.c:196
+#: src/skins/ui_manager.c:195
 msgid "Visualization"
 msgstr "視覺特效"
 
-#: src/skins/ui_manager.c:197
+#: src/skins/ui_manager.c:196
 msgid "Visualization Mode"
 msgstr "視覺特效模式"
 
-#: src/skins/ui_manager.c:198
+#: src/skins/ui_manager.c:197
 msgid "Analyzer Mode"
 msgstr "分析儀模式"
 
-#: src/skins/ui_manager.c:199
+#: src/skins/ui_manager.c:198
 msgid "Scope Mode"
 msgstr "示波器模式"
 
-#: src/skins/ui_manager.c:200
+#: src/skins/ui_manager.c:199
 msgid "Voiceprint Mode"
 msgstr "聲紋模式"
 
-#: src/skins/ui_manager.c:201
+#: src/skins/ui_manager.c:200
 msgid "WindowShade VU Mode"
 msgstr "百葉窗音量計模式"
 
-#: src/skins/ui_manager.c:202
+#: src/skins/ui_manager.c:201
 msgid "Analyzer Falloff"
 msgstr "分析儀陷落"
 
-#: src/skins/ui_manager.c:203
+#: src/skins/ui_manager.c:202
 msgid "Peaks Falloff"
 msgstr "峰值陷落"
 
-#: src/skins/ui_manager.c:208
+#: src/skins/ui_manager.c:207
 msgid "Playlist"
 msgstr "播放清單"
 
-#: src/skins/ui_manager.c:210 src/skins/ui_manager.c:211
+#: src/skins/ui_manager.c:209 src/skins/ui_manager.c:210
 msgid "Play Playlist"
-msgstr ""
+msgstr "播放播放清單"
 
-#: src/skins/ui_manager.c:213 src/skins/ui_manager.c:214
+#: src/skins/ui_manager.c:212 src/skins/ui_manager.c:213
 msgid "New Playlist"
 msgstr "新增播放清單"
 
-#: src/skins/ui_manager.c:216 src/skins/ui_manager.c:217
+#: src/skins/ui_manager.c:215 src/skins/ui_manager.c:216
 msgid "Select Next Playlist"
 msgstr "選擇下一個播放清單"
 
-#: src/skins/ui_manager.c:219 src/skins/ui_manager.c:220
+#: src/skins/ui_manager.c:218 src/skins/ui_manager.c:219
 msgid "Select Previous Playlist"
 msgstr "選擇上一個播放清單"
 
-#: src/skins/ui_manager.c:222 src/skins/ui_manager.c:223
+#: src/skins/ui_manager.c:221 src/skins/ui_manager.c:222
 msgid "Delete Playlist"
 msgstr "刪除播放清單"
 
-#: src/skins/ui_manager.c:225
+#: src/skins/ui_manager.c:224
 msgid "Import Playlist"
 msgstr "匯入播放清單"
 
-#: src/skins/ui_manager.c:226
+#: src/skins/ui_manager.c:225
 msgid "Loads a playlist file into the selected playlist."
-msgstr ""
+msgstr "載入一個播放清單檔案並加入至選擇的播放清單。"
 
-#: src/skins/ui_manager.c:229
+#: src/skins/ui_manager.c:228
 msgid "Export Playlist"
 msgstr "匯出播放清單"
 
-#: src/skins/ui_manager.c:230
+#: src/skins/ui_manager.c:229
 msgid "Saves the selected playlist."
 msgstr "儲存選擇的播放清單。"
 
-#: src/skins/ui_manager.c:232
+#: src/skins/ui_manager.c:231
 msgid "Refresh List"
 msgstr "重整清單"
 
-#: src/skins/ui_manager.c:233
+#: src/skins/ui_manager.c:232
 msgid "Refreshes metadata associated with a playlist entry."
-msgstr ""
+msgstr "重新整理與播放清單項目有關的詮釋資料。"
 
-#: src/skins/ui_manager.c:236
+#: src/skins/ui_manager.c:235
 msgid "Playlist Manager"
 msgstr "播放清單管理"
 
-#: src/skins/ui_manager.c:239
+#: src/skins/ui_manager.c:238
 msgid "Queue Manager"
 msgstr "佇列管理"
 
-#: src/skins/ui_manager.c:244
+#: src/skins/ui_manager.c:243
 msgid "View"
 msgstr "檢視"
 
-#: src/skins/ui_manager.c:245
+#: src/skins/ui_manager.c:244
 msgid "Interface"
 msgstr "介面"
 
-#: src/skins/ui_manager.c:246
+#: src/skins/ui_manager.c:245
 msgid "Interface Preferences ..."
 msgstr "介面偏好設定 ..."
 
-#: src/skins/ui_manager.c:251
+#: src/skins/ui_manager.c:250
 msgid "Add Internet Address..."
 msgstr "加入網路位址..."
 
-#: src/skins/ui_manager.c:252
+#: src/skins/ui_manager.c:251
 msgid "Adds a remote track to the playlist."
 msgstr "加入一個遠端音軌到播放清單。"
 
-#: src/skins/ui_manager.c:255
+#: src/skins/ui_manager.c:254
 msgid "Add Files..."
 msgstr "加入檔案..."
 
-#: src/skins/ui_manager.c:256
+#: src/skins/ui_manager.c:255
 msgid "Adds files to the playlist."
 msgstr "加入檔案到播放清單。"
 
-#: src/skins/ui_manager.c:261
+#: src/skins/ui_manager.c:260
 msgid "Search and Select"
 msgstr "搜尋並選擇"
 
-#: src/skins/ui_manager.c:262
+#: src/skins/ui_manager.c:261
 msgid ""
 "Searches the playlist and selects playlist entries based on specific "
 "criteria."
-msgstr ""
+msgstr "搜尋播放清單，並基於指定的條件選擇播放清單中的項目。"
 
-#: src/skins/ui_manager.c:265
+#: src/skins/ui_manager.c:264
 msgid "Invert Selection"
 msgstr "反向選擇"
 
-#: src/skins/ui_manager.c:266
+#: src/skins/ui_manager.c:265
 msgid "Inverts the selected and unselected entries."
-msgstr ""
+msgstr "反向選擇項目。"
 
-#: src/skins/ui_manager.c:269
+#: src/skins/ui_manager.c:268
 msgid "Select All"
 msgstr "選擇全部"
 
-#: src/skins/ui_manager.c:270
+#: src/skins/ui_manager.c:269
 msgid "Selects all of the playlist entries."
 msgstr "選擇所有的播放清單項目。"
 
-#: src/skins/ui_manager.c:273
+#: src/skins/ui_manager.c:272
 msgid "Select None"
 msgstr "取消選擇"
 
-#: src/skins/ui_manager.c:274
+#: src/skins/ui_manager.c:273
 msgid "Deselects all of the playlist entries."
 msgstr "取消選擇所有的播放清單項目。"
 
-#: src/skins/ui_manager.c:279
+#: src/skins/ui_manager.c:278
 msgid "Remove All"
 msgstr "全部移除"
 
-#: src/skins/ui_manager.c:280
+#: src/skins/ui_manager.c:279
 msgid "Removes all entries from the playlist."
 msgstr "從播放清單中移除所有的項目。"
 
-#: src/skins/ui_manager.c:283
+#: src/skins/ui_manager.c:282
 msgid "Clear Queue"
 msgstr "清除佇列"
 
-#: src/skins/ui_manager.c:284
+#: src/skins/ui_manager.c:283
 msgid "Clears the queue associated with this playlist."
-msgstr ""
+msgstr "清除與此播放清單有關的佇列。"
 
-#: src/skins/ui_manager.c:287
+#: src/skins/ui_manager.c:286
 msgid "Remove Unavailable Files"
 msgstr "移除無法使用的檔案"
 
-#: src/skins/ui_manager.c:288
+#: src/skins/ui_manager.c:287
 msgid "Removes unavailable files from the playlist."
 msgstr "從播放清單中移除無法使用的檔案。"
 
-#: src/skins/ui_manager.c:291
+#: src/skins/ui_manager.c:290
 msgid "Remove Duplicates"
 msgstr "移除重複的項目"
 
-#: src/skins/ui_manager.c:293 src/skins/ui_manager.c:325
-#: src/skins/ui_manager.c:355
+#: src/skins/ui_manager.c:292 src/skins/ui_manager.c:324
+#: src/skins/ui_manager.c:354
 msgid "By Title"
 msgstr "標題"
 
-#: src/skins/ui_manager.c:294
+#: src/skins/ui_manager.c:293
 msgid "Removes duplicate entries from the playlist by title."
-msgstr ""
+msgstr "移除播放清單中標題重複的項目"
 
-#: src/skins/ui_manager.c:297 src/skins/ui_manager.c:337
-#: src/skins/ui_manager.c:367
+#: src/skins/ui_manager.c:296 src/skins/ui_manager.c:336
+#: src/skins/ui_manager.c:366
 msgid "By Filename"
 msgstr "檔案名稱"
 
-#: src/skins/ui_manager.c:298
+#: src/skins/ui_manager.c:297
 msgid "Removes duplicate entries from the playlist by filename."
-msgstr ""
+msgstr "移除播放清單中檔案名稱重複的項目"
 
-#: src/skins/ui_manager.c:301 src/skins/ui_manager.c:341
-#: src/skins/ui_manager.c:371
+#: src/skins/ui_manager.c:300 src/skins/ui_manager.c:340
+#: src/skins/ui_manager.c:370
 msgid "By Path + Filename"
 msgstr "路徑 + 檔案名稱"
 
-#: src/skins/ui_manager.c:302
+#: src/skins/ui_manager.c:301
 msgid "Removes duplicate entries from the playlist by their full path."
-msgstr ""
+msgstr "移除播放清單中完整路徑重複的項目"
 
-#: src/skins/ui_manager.c:305
+#: src/skins/ui_manager.c:304
 msgid "Remove Unselected"
 msgstr "移除未選擇的項目"
 
-#: src/skins/ui_manager.c:306
+#: src/skins/ui_manager.c:305
 msgid "Remove unselected entries from the playlist."
-msgstr ""
+msgstr "從播放清單中移除未選擇的項目。"
 
-#: src/skins/ui_manager.c:309
+#: src/skins/ui_manager.c:308
 msgid "Remove Selected"
 msgstr "移除選擇的項目"
 
-#: src/skins/ui_manager.c:310
+#: src/skins/ui_manager.c:309
 msgid "Remove selected entries from the playlist."
-msgstr ""
+msgstr "從播放清單中移除選擇的項目。"
 
-#: src/skins/ui_manager.c:315
+#: src/skins/ui_manager.c:314
 msgid "Randomize List"
 msgstr "清單隨機排序"
 
-#: src/skins/ui_manager.c:316
+#: src/skins/ui_manager.c:315
 msgid "Randomizes the playlist."
 msgstr "隨機排序播放清單。"
 
-#: src/skins/ui_manager.c:319
+#: src/skins/ui_manager.c:318
 msgid "Reverse List"
 msgstr "清單反向排序"
 
-#: src/skins/ui_manager.c:320
+#: src/skins/ui_manager.c:319
 msgid "Reverses the playlist."
 msgstr "反向排序播放清單。"
 
-#: src/skins/ui_manager.c:323
+#: src/skins/ui_manager.c:322
 msgid "Sort List"
 msgstr "排序清單"
 
-#: src/skins/ui_manager.c:326 src/skins/ui_manager.c:356
+#: src/skins/ui_manager.c:325 src/skins/ui_manager.c:355
 msgid "Sorts the list by title."
 msgstr "以標題排序清單。"
 
-#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
+#: src/skins/ui_manager.c:328 src/skins/ui_manager.c:358
 msgid "By Album"
 msgstr "專輯"
 
-#: src/skins/ui_manager.c:330 src/skins/ui_manager.c:360
+#: src/skins/ui_manager.c:329 src/skins/ui_manager.c:359
 msgid "Sorts the list by album."
 msgstr "以專輯排序清單。"
 
-#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
+#: src/skins/ui_manager.c:332 src/skins/ui_manager.c:362
 msgid "By Artist"
 msgstr "藝人"
 
-#: src/skins/ui_manager.c:334 src/skins/ui_manager.c:364
+#: src/skins/ui_manager.c:333 src/skins/ui_manager.c:363
 msgid "Sorts the list by artist."
 msgstr "以藝人排序清單"
 
-#: src/skins/ui_manager.c:338 src/skins/ui_manager.c:368
+#: src/skins/ui_manager.c:337 src/skins/ui_manager.c:367
 msgid "Sorts the list by filename."
 msgstr "以檔名排序清單。"
 
-#: src/skins/ui_manager.c:342 src/skins/ui_manager.c:372
+#: src/skins/ui_manager.c:341 src/skins/ui_manager.c:371
 msgid "Sorts the list by full pathname."
 msgstr "以完整路徑排序清單。"
 
-#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
+#: src/skins/ui_manager.c:344 src/skins/ui_manager.c:374
 msgid "By Date"
 msgstr "日期"
 
-#: src/skins/ui_manager.c:346 src/skins/ui_manager.c:376
+#: src/skins/ui_manager.c:345 src/skins/ui_manager.c:375
 msgid "Sorts the list by modification time."
 msgstr "以修改時間排序清單"
 
-#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
+#: src/skins/ui_manager.c:348 src/skins/ui_manager.c:378
 msgid "By Track Number"
 msgstr "音軌編號"
 
-#: src/skins/ui_manager.c:350 src/skins/ui_manager.c:380
+#: src/skins/ui_manager.c:349 src/skins/ui_manager.c:379
 msgid "Sorts the list by track number."
 msgstr "以音軌編號排序清單"
 
-#: src/skins/ui_manager.c:353
+#: src/skins/ui_manager.c:352
 msgid "Sort Selected"
 msgstr "排序選擇的項目"
 
-#: src/skins/ui_manager.c:389
+#: src/skins/ui_manager.c:388
 msgid "File"
 msgstr "檔案"
 
-#: src/skins/ui_manager.c:392
+#: src/skins/ui_manager.c:391
 msgid "Plugin Services"
 msgstr "外掛服務"
 
-#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
+#: src/skins/ui_manager.c:393 src/skins/ui_manager.c:396
 msgid "View Track Details"
 msgstr "檢視音軌詳細資料"
 
-#: src/skins/ui_manager.c:395 src/skins/ui_manager.c:398
+#: src/skins/ui_manager.c:394 src/skins/ui_manager.c:397
 msgid "View track details"
 msgstr "檢視音軌詳細資料"
 
-#: src/skins/ui_manager.c:400 src/skins/ui_manager.c:401
+#: src/skins/ui_manager.c:399 src/skins/ui_manager.c:400
 msgid "About Audacious"
 msgstr "關於 Audacious"
 
-#: src/skins/ui_manager.c:403
+#: src/skins/ui_manager.c:402
 msgid "Play File"
 msgstr "播放檔案"
 
-#: src/skins/ui_manager.c:404
+#: src/skins/ui_manager.c:403
 msgid "Load and play a file"
 msgstr "載入並播放檔案"
 
-#: src/skins/ui_manager.c:406
+#: src/skins/ui_manager.c:405
 msgid "Play Location"
 msgstr "播放位址"
 
-#: src/skins/ui_manager.c:407
+#: src/skins/ui_manager.c:406
 msgid "Play media from the selected location"
 msgstr "從選定的位址播放媒體"
 
-#: src/skins/ui_manager.c:409
+#: src/skins/ui_manager.c:408
 msgid "Plugin services"
 msgstr "外掛服務"
 
-#: src/skins/ui_manager.c:411
+#: src/skins/ui_manager.c:410
 msgid "Preferences"
 msgstr "偏好設定"
 
-#: src/skins/ui_manager.c:412
+#: src/skins/ui_manager.c:411
 msgid "Open preferences window"
 msgstr "開啟偏好設定視窗"
 
-#: src/skins/ui_manager.c:415
+#: src/skins/ui_manager.c:414
 msgid "Quit Audacious"
 msgstr "離開 Audacious"
 
-#: src/skins/ui_manager.c:417 src/skins/ui_manager.c:418
+#: src/skins/ui_manager.c:416 src/skins/ui_manager.c:417
 msgid "Set A-B"
 msgstr "設定 A-B"
 
-#: src/skins/ui_manager.c:420 src/skins/ui_manager.c:421
+#: src/skins/ui_manager.c:419 src/skins/ui_manager.c:420
 msgid "Clear A-B"
 msgstr "清除 A-B"
 
-#: src/skins/ui_manager.c:426 src/skins/ui_manager.c:427
+#: src/skins/ui_manager.c:422 src/skins/ui_manager.c:423
+msgid "Jump to File"
+msgstr "跳至檔案"
+
+#: src/skins/ui_manager.c:425 src/skins/ui_manager.c:426
 msgid "Jump to Time"
 msgstr "跳至時間"
 
-#: src/skins/ui_manager.c:429
+#: src/skins/ui_manager.c:428
 msgid "Queue Toggle"
 msgstr "切換佇列"
 
-#: src/skins/ui_manager.c:430
+#: src/skins/ui_manager.c:429
 msgid "Enables/disables the entry in the playlist's queue."
-msgstr "啟用/停用在播放清單佇列中的項目。"
+msgstr "啟用／停用在播放清單佇列中的項目。"
 
-#: src/skins/ui_manager.c:433
+#: src/skins/ui_manager.c:432
 msgid "Copy"
 msgstr "複製"
 
-#: src/skins/ui_manager.c:436
+#: src/skins/ui_manager.c:435
 msgid "Cut"
 msgstr "剪下"
 
-#: src/skins/ui_manager.c:439
+#: src/skins/ui_manager.c:438
 msgid "Paste"
 msgstr "貼上"
 
-#: src/skins/ui_manager.c:446
+#: src/skins/ui_manager.c:445
 msgid "Load"
 msgstr "載入"
 
-#: src/skins/ui_manager.c:447
+#: src/skins/ui_manager.c:446
 msgid "Import"
 msgstr "匯入"
 
-#: src/skins/ui_manager.c:448
+#: src/skins/ui_manager.c:447
 msgid "Save"
 msgstr "儲存"
 
-#: src/skins/ui_manager.c:449
+#: src/skins/ui_manager.c:448
 msgid "Delete"
 msgstr "刪除"
 
-#: src/skins/ui_manager.c:451 src/skins/ui_manager.c:472
-#: src/skins/ui_manager.c:487
+#: src/skins/ui_manager.c:450 src/skins/ui_manager.c:471
+#: src/skins/ui_manager.c:486
 msgid "Preset"
 msgstr "樣式"
 
-#: src/skins/ui_manager.c:454 src/skins/ui_manager.c:475
-#: src/skins/ui_manager.c:490
+#: src/skins/ui_manager.c:453 src/skins/ui_manager.c:474
+#: src/skins/ui_manager.c:489
 msgid "Auto-load preset"
 msgstr "自動載入樣式"
 
-#: src/skins/ui_manager.c:455
+#: src/skins/ui_manager.c:454
 msgid "Load auto-load preset"
 msgstr "讀取自動載入樣式"
 
-#: src/skins/ui_manager.c:458
+#: src/skins/ui_manager.c:457
 msgid "Load default preset into equalizer"
 msgstr "載入預設等化器樣式"
 
-#: src/skins/ui_manager.c:460
+#: src/skins/ui_manager.c:459
 msgid "Zero"
 msgstr "歸零"
 
-#: src/skins/ui_manager.c:461
+#: src/skins/ui_manager.c:460
 msgid "Set equalizer preset levels to zero"
 msgstr "將等化器重置"
 
-#: src/skins/ui_manager.c:463
+#: src/skins/ui_manager.c:462
 msgid "From file"
 msgstr "從檔案"
 
-#: src/skins/ui_manager.c:464
+#: src/skins/ui_manager.c:463
 msgid "Load preset from file"
 msgstr "從檔案載入樣式"
 
-#: src/skins/ui_manager.c:466
+#: src/skins/ui_manager.c:465
 msgid "From WinAMP EQF file"
 msgstr "從 WinAMP EQF 檔"
 
-#: src/skins/ui_manager.c:467
+#: src/skins/ui_manager.c:466
 msgid "Load preset from WinAMP EQF file"
 msgstr "從 WinAMP EQF 檔載入樣式"
 
-#: src/skins/ui_manager.c:469
+#: src/skins/ui_manager.c:468
 msgid "WinAMP Presets"
 msgstr "WinAMP 樣式"
 
-#: src/skins/ui_manager.c:470
+#: src/skins/ui_manager.c:469
 msgid "Import WinAMP presets"
 msgstr "匯入 WinAMP 樣式"
 
-#: src/skins/ui_manager.c:476
+#: src/skins/ui_manager.c:475
 msgid "Save auto-load preset"
 msgstr "儲存自動載入樣式"
 
-#: src/skins/ui_manager.c:479
+#: src/skins/ui_manager.c:478
 msgid "Save default preset"
 msgstr "儲存預設樣式"
 
-#: src/skins/ui_manager.c:481
+#: src/skins/ui_manager.c:480
 msgid "To file"
 msgstr "至檔案"
 
-#: src/skins/ui_manager.c:482
+#: src/skins/ui_manager.c:481
 msgid "Save preset to file"
 msgstr "儲存樣式到檔案"
 
-#: src/skins/ui_manager.c:484
+#: src/skins/ui_manager.c:483
 msgid "To WinAMP EQF file"
 msgstr "至 WinAMP EQF 檔"
 
-#: src/skins/ui_manager.c:485
+#: src/skins/ui_manager.c:484
 msgid "Save preset to WinAMP EQF file"
 msgstr "儲存樣式到 WinAMP EQF 檔"
 
-#: src/skins/ui_manager.c:491
+#: src/skins/ui_manager.c:490
 msgid "Delete auto-load preset"
 msgstr "刪除自動載入樣式"
 
-#: src/skins/ui_playlist.c:245
+#: src/skins/ui_playlist.c:244
 msgid "Search entries in active playlist"
 msgstr "在使用中的播放清單裡搜尋播放項目"
 
-#: src/skins/ui_playlist.c:252
+#: src/skins/ui_playlist.c:251
 msgid ""
-"Select entries in playlist by filling one or more fields. Fields use regular"
-" expressions syntax, case-insensitive. If you don't know how regular "
+"Select entries in playlist by filling one or more fields. Fields use regular "
+"expressions syntax, case-insensitive. If you don't know how regular "
 "expressions work, simply insert a literal portion of what you're searching "
 "for."
 msgstr ""
+"填入一個或多個欄位以選擇播放清單中的項目。欄位使用正規表示法，大小寫視為不同"
+"字元。若您不知道如何使用正規表示法，請輸入您想搜尋的部分文字。"
 
-#: src/skins/ui_playlist.c:260
+#: src/skins/ui_playlist.c:259
 msgid "Title: "
-msgstr "標題: "
+msgstr "標題："
 
-#: src/skins/ui_playlist.c:268
+#: src/skins/ui_playlist.c:267
 msgid "Album: "
-msgstr "專輯: "
+msgstr "專輯："
 
-#: src/skins/ui_playlist.c:276
+#: src/skins/ui_playlist.c:275
 msgid "Artist: "
-msgstr "藝人: "
+msgstr "藝人："
 
-#: src/skins/ui_playlist.c:284
+#: src/skins/ui_playlist.c:283
 msgid "Filename: "
-msgstr "檔名: "
+msgstr "檔名："
 
-#: src/skins/ui_playlist.c:293
+#: src/skins/ui_playlist.c:292
 msgid "Clear previous selection before searching"
-msgstr ""
+msgstr "進行搜尋前清空上次的選擇項目"
 
-#: src/skins/ui_playlist.c:296
+#: src/skins/ui_playlist.c:295
 msgid "Automatically toggle queue for matching entries"
-msgstr ""
+msgstr "自動切換至符合項目的佇列"
 
-#: src/skins/ui_playlist.c:299
+#: src/skins/ui_playlist.c:298
 msgid "Create a new playlist with matching entries"
-msgstr ""
+msgstr "以符合的項目建立新的播放清單"
 
-#: src/skins/ui_playlist.c:742
+#: src/skins/ui_playlist.c:738
 msgid "Audacious Playlist Editor"
 msgstr "Audacious 播放清單編輯器"
 
-#: src/skins/ui_playlist.c:776
+#: src/skins/ui_playlist.c:772
 #, c-format
 msgid "%s (%d of %d)"
-msgstr ""
+msgstr "%s (%d／%d)"
 
 #: src/skins/ui_skinselector.c:162
 msgid "Archived Winamp 2.x skin"
@@ -3375,83 +3891,123 @@
 #: src/skins/util.c:773
 #, c-format
 msgid "Could not create directory (%s): %s\n"
-msgstr "無法建立資料夾 (%s): %s\n"
+msgstr "無法建立資料夾 (%s)：%s\n"
 
-#: src/sndfile/plugin.c:418
+#: src/sndfile/plugin.c:416
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+msgstr ""
+"Based on the xmms_sndfile plugin:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-msgstr ""
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2 of the License, or (at your option) "
+"any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndfile/plugin.c:437
+#: src/sndfile/plugin.c:435
 msgid "Sndfile Plugin"
-msgstr ""
+msgstr "Sndfile 外掛"
 
-#: src/sndio/sndio.c:189
+#: src/sndio/sndio.c:172
 msgid "About Sndio Output Plugin"
-msgstr ""
+msgstr "關於 Sndio 輸出外掛"
 
-#: src/sndio/sndio.c:190
+#: src/sndio/sndio.c:173
 msgid ""
 "Sndio Output Plugin\n"
 "\n"
 "Written by Thomas Pfaff <tpfaff@tp76.info>\n"
 msgstr ""
+"Sndio 輸出外掛\n"
+"\n"
+"作者：Thomas Pfaff <tpfaff@tp76.info>\n"
 
-#: src/sndio/sndio.c:261
+#: src/sndio/sndio.c:248
 msgid "Unsupported format"
-msgstr ""
+msgstr "未支援的格式"
 
-#: src/sndio/sndio.c:262
+#: src/sndio/sndio.c:249
 msgid ""
 "A format not supported by the audio device was requested.\n"
 "\n"
 "Please try again with the sndiod(1) server running."
 msgstr ""
+"要求了未被音訊裝置支援的格式。\n"
+"\n"
+"請確認 sndiod(1) 伺服器已執行後重試。"
 
-#: src/sndio/sndio.c:405
+#: src/sndio/sndio.c:384
 msgid "sndio device"
-msgstr ""
+msgstr "sndio 裝置"
 
-#: src/sndio/sndio.c:421
+#: src/sndio/sndio.c:400
 msgid "(empty means default)"
-msgstr ""
+msgstr "(空白表示使用預設值)"
+
+#: src/sndio/sndio.c:416
+msgid "OK"
+msgstr "確認"
+
+#: src/sndio/sndio.c:424
+msgid "Cancel"
+msgstr "取消"
 
-#: src/song_change/song_change.c:56
+#: src/song_change/song_change.c:54
 msgid "Song Change"
 msgstr "歌曲切換"
 
-#: src/song_change/song_change.c:438
+#: src/song_change/song_change.c:436
 msgid "Command to run when Audacious starts a new song."
 msgstr "當 Audacious 開始播放新的歌曲時執行的指令。"
 
-#: src/song_change/song_change.c:440 src/song_change/song_change.c:446
-#: src/song_change/song_change.c:452 src/song_change/song_change.c:458
+#: src/song_change/song_change.c:438 src/song_change/song_change.c:444
+#: src/song_change/song_change.c:450 src/song_change/song_change.c:456
 msgid "Command:"
-msgstr "命令:"
+msgstr "命令："
 
-#: src/song_change/song_change.c:444
+#: src/song_change/song_change.c:442
 msgid "Command to run toward the end of a song."
 msgstr "每當一首歌曲播放完時執行命令"
 
-#: src/song_change/song_change.c:450
+#: src/song_change/song_change.c:448
 msgid "Command to run when Audacious reaches the end of the playlist."
 msgstr "每當 Audacious 播放達到清單尾端時執行命令"
 
-#: src/song_change/song_change.c:456
+#: src/song_change/song_change.c:454
 msgid ""
 "Command to run when title changes for a song (i.e. network streams titles)."
-msgstr "當一首歌的標題改變時執行命令。（網路串流的標題）"
+msgstr "當一首歌的標題改變時執行命令。(網路串流的標題)"
 
-#: src/song_change/song_change.c:462
+#: src/song_change/song_change.c:460
 msgid ""
 "You can use the following format strings which\n"
 "will be substituted before calling the command\n"
@@ -3469,34 +4025,89 @@
 "%b: Album\n"
 "%T: Track title"
 msgstr ""
+"您可以在命令中使用下列的格式字串。\n"
+"它們會在執行命令前被實際值取代。\n"
+"(不是全部都能在播放清單結束命令中使用)\n"
+"\n"
+"%F：頻率 (赫茲)\n"
+"%c：聲道數目\n"
+"%f：檔名 (完整路徑)\n"
+"%l：長度 (毫秒)\n"
+"%n 或 %s：歌曲名稱\n"
+"%r：位元率 (bps)\n"
+"%t：播放清單位置 (%02d)\n"
+"%p：播放中 (1 或 0)\n"
+"%a：藝人\n"
+"%b：專輯\n"
+"%T：音軌標題"
 
-#: src/song_change/song_change.c:489
+#: src/song_change/song_change.c:487
 msgid ""
 "Parameters passed to the shell should be encapsulated in "
 "quotes. Doing otherwise is a security risk."
-msgstr "傳給 shell 的參數應該用雙引號包起來，否則會有安全風險。"
+msgstr ""
+"傳給 shell 的參數應該用雙引號包起來，否則會有安全風險。</"
+"span>"
 
-#: src/song_change/song_change.c:500
+#: src/song_change/song_change.c:498
 msgid "Commands"
 msgstr "命令"
 
-#: src/speed-pitch/speed-pitch.c:227
-msgid "Speed and Pitch"
+#: src/sox-resampler/sox-resampler.c:135
+msgid ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
 msgstr ""
+"SoX Resampler Plugin for Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Based on Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/speed-pitch/speed-pitch.c:228
+#: src/sox-resampler/sox-resampler.c:141
+msgid "Quick"
+msgstr "快速"
+
+#: src/sox-resampler/sox-resampler.c:142
+msgid "Low"
+msgstr "低"
+
+#: src/sox-resampler/sox-resampler.c:144
+msgid "High"
+msgstr "高"
+
+#: src/sox-resampler/sox-resampler.c:145
+msgid "Very High"
+msgstr "非常高"
+
+#: src/sox-resampler/sox-resampler.c:148
+msgid "Quality:"
+msgstr "品質："
+
+#: src/sox-resampler/sox-resampler.c:162
+msgid "SoX Resampler"
+msgstr "SoX 重取樣"
+
+#: src/speed-pitch/speed-pitch.c:225
+msgid "Speed and Pitch"
+msgstr "速度與音高"
+
+#: src/speed-pitch/speed-pitch.c:226
 msgid "Speed:"
-msgstr ""
+msgstr "速度："
 
-#: src/speed-pitch/speed-pitch.c:231
+#: src/speed-pitch/speed-pitch.c:229
 msgid "Pitch:"
-msgstr ""
+msgstr "音高："
 
-#: src/speed-pitch/speed-pitch.c:266
+#: src/speed-pitch/speed-pitch.c:264
 msgid "Speed and Pitch"
-msgstr ""
+msgstr "速度與音高"
 
-#: src/statusicon/statusicon.c:392
+#: src/statusicon/statusicon.c:390
 msgid ""
 "Status Icon Plugin\n"
 "\n"
@@ -3506,64 +4117,73 @@
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"這個外掛提供一個狀態圖示並放在系統通知區。"
 
-#: src/statusicon/statusicon.c:399
+#: src/statusicon/statusicon.c:397
 msgid "Mouse Scroll Action"
-msgstr ""
+msgstr "滑鼠滾輪動作"
 
-#: src/statusicon/statusicon.c:400
+#: src/statusicon/statusicon.c:398
 msgid "Change volume"
 msgstr "調整音量"
 
-#: src/statusicon/statusicon.c:403
+#: src/statusicon/statusicon.c:401
 msgid "Change playing song"
 msgstr "切換播放歌曲"
 
-#: src/statusicon/statusicon.c:406
+#: src/statusicon/statusicon.c:404
 msgid "Other Settings"
-msgstr ""
+msgstr "其他設定"
 
-#: src/statusicon/statusicon.c:407
+#: src/statusicon/statusicon.c:405
 msgid "Disable the popup window"
 msgstr "關閉彈出式視窗"
 
-#: src/statusicon/statusicon.c:409
+#: src/statusicon/statusicon.c:407
 msgid "Close to the system tray"
-msgstr ""
+msgstr "縮到系統列"
 
-#: src/statusicon/statusicon.c:411
+#: src/statusicon/statusicon.c:409
 msgid "Advance in playlist when scrolling upward"
 msgstr "以與滑鼠滾輪的反方向切換歌曲"
 
-#: src/statusicon/statusicon.c:420
+#: src/statusicon/statusicon.c:418
 msgid "Status Icon"
-msgstr ""
+msgstr "狀態圖示"
 
-#: src/stereo_plugin/stereo.c:19
+#: src/stereo_plugin/stereo.c:17
 msgid ""
 "Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
 
-#: src/stereo_plugin/stereo.c:27
+#: src/stereo_plugin/stereo.c:25
 msgid "Extra Stereo"
-msgstr ""
+msgstr "額外立體聲效果"
 
-#: src/stereo_plugin/stereo.c:38
+#: src/stereo_plugin/stereo.c:36
 msgid "Extra Stereo"
-msgstr ""
+msgstr "額外立體聲效果"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.c:86
+#: src/tonegen/tonegen.c:84
 msgid "Tone Generator: "
-msgstr ""
+msgstr "音調產生器："
 
-#: src/tonegen/tonegen.c:199
+#: src/tonegen/tonegen.c:197
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3571,28 +4191,37 @@
 "To use it, add a URL: tone://frequency1;frequency2;frequency3;...\n"
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
+"Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
+"Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"用法：加入網址：tone://frequency1;frequency2;frequency3;...\n"
+"範例：tone://2000;2005 會播放 2000 HZ 和 2005HZ 的正弦波"
 
-#: src/tonegen/tonegen.c:208
+#: src/tonegen/tonegen.c:206
 msgid "Tone Generator"
-msgstr ""
+msgstr "音調產生器"
 
-#: src/unix-io/unix-io.c:245
+#: src/unix-io/unix-io.c:243
 msgid ""
 "File I/O Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
 "THIS PLUGIN IS REQUIRED. DO NOT DISABLE IT."
 msgstr ""
+"File I/O Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"這個外掛是必須的，請勿關閉。"
 
-#: src/unix-io/unix-io.c:268
+#: src/unix-io/unix-io.c:266
 msgid "File I/O Plugin"
-msgstr ""
+msgstr "檔案 I/O 外掛"
 
-#: src/voice_removal/voice_removal.c:60
+#: src/voice_removal/voice_removal.c:58
 msgid "Voice Removal"
-msgstr ""
+msgstr "人聲移除"
 
-#: src/vorbis/vorbis.c:554
+#: src/vorbis/vorbis.c:562
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3612,45 +4241,74 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Based on the Xiph.org Foundation's Ogg Vorbis Plugin:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Original code by:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contributions from:\n"
+"Chris Montgomery <monty@xiph.org>\n"
+"Peter Alm <peter@xmms.org>\n"
+"Michael Smith <msmith@labyrinth.edu.au>\n"
+"Jack Moffitt <jack@icecast.org>\n"
+"Jorn Baayen <jorn@nl.linux.org>\n"
+"Håvard Kvålen <havardk@xmms.org>\n"
+"Gian-Carlo Pascutto <gcp@sjeng.org>\n"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
-#: src/vorbis/vorbis.c:574
+#: src/vorbis/vorbis.c:582
 msgid "Ogg Vorbis Decoder"
-msgstr ""
+msgstr "Ogg Vorbis 解碼器"
 
-#: src/vtx/vtx.c:241
+#: src/vtx/vtx.c:242
 msgid ""
 "Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 msgstr ""
+"Vortex file format player by Sashnov Alexander <sashnov@ngs.ru>\n"
+"Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/vtx/vtx.c:247
+#: src/vtx/vtx.c:248
 msgid "VTX Decoder"
-msgstr ""
+msgstr "VTX 解碼器"
 
-#: src/wavpack/wavpack.c:284
+#: src/wavpack/wavpack.c:282
 msgid "lossy (hybrid)"
-msgstr ""
+msgstr "失真 (混合)"
 
-#: src/wavpack/wavpack.c:286
+#: src/wavpack/wavpack.c:284
 msgid "lossy"
-msgstr ""
+msgstr "失真"
 
-#: src/wavpack/wavpack.c:336
+#: src/wavpack/wavpack.c:334
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
 
-#: src/wavpack/wavpack.c:343
+#: src/wavpack/wavpack.c:341
 msgid "WavPack Decoder"
-msgstr ""
+msgstr "WavPack 解碼器"
 
-#: src/xsf/plugin.c:273
+#: src/xsf/plugin.c:274
 msgid "2SF Decoder"
-msgstr ""
+msgstr "2SF 解碼器"
 
-#: src/xspf/xspf.c:442
+#: src/xspf/xspf.c:440
 msgid "XML Shareable Playlists (XSPF)"
-msgstr ""
+msgstr "XML 可分享式播放清單 (XSPF)"
+
+#~ msgid "AMIDI-Plug - select file"
+#~ msgstr "AMIDI-Plug - 選擇檔案"
+
+#~ msgid "Sort S_elected"
+#~ msgstr "排序選擇的項目(_E)"

audacious-plugins-3.3.4.tar.bz2/src/aac/Makefile -> audacious-plugins-3.4.2.tar.bz2/src/aac/Makefile Changed

audacious-plugins-3.3.4.tar.bz2/src/aac/libmp4.c -> audacious-plugins-3.4.2.tar.bz2/src/aac/libmp4.c Changed

audacious-plugins-3.3.4.tar.bz2/src/aac/mp4ff/mp4ff.c -> audacious-plugins-3.4.2.tar.bz2/src/aac/mp4ff/mp4ff.c Changed

@@ -82,10 +82,10 @@
 free(ff->track[i]->stco_chunk_offset);
 if (ff->track[i]->decoderConfig)
 free(ff->track[i]->decoderConfig);
-			if (ff->track[i]->ctts_sample_count)
-				free(ff->track[i]->ctts_sample_count);
-			if (ff->track[i]->ctts_sample_offset)
-				free(ff->track[i]->ctts_sample_offset);
+ if (ff->track[i]->ctts_sample_count)
+ free(ff->track[i]->ctts_sample_count);
+ if (ff->track[i]->ctts_sample_offset)
+ free(ff->track[i]->ctts_sample_offset);
 #ifdef ITUNES_DRM
 if (ff->track[i]->p_drms)
 drms_free(ff->track[i]->p_drms);
@@ -98,7 +98,7 @@
 mp4ff_tag_delete(&(ff->tags));
 #endif
 
- if (ff) free(ff);
+ free(ff);
 }
 
 void mp4ff_track_add(mp4ff_t *f)
@@ -112,29 +112,29 @@
 
 static int need_parse_when_meta_only(uint8_t atom_type)
 {
-	switch(atom_type)
-	{
-	case ATOM_EDTS:
-//	case ATOM_MDIA:
-//	case ATOM_MINF:
-	case ATOM_DRMS:
-	case ATOM_SINF:
-	case ATOM_SCHI:
-//	case ATOM_STBL:
-//	case ATOM_STSD:
-	case ATOM_STTS:
-	case ATOM_STSZ:
-	case ATOM_STZ2:
-	case ATOM_STCO:
-	case ATOM_STSC:
-//	case ATOM_CTTS:
-	case ATOM_FRMA:
-	case ATOM_IVIV:
-	case ATOM_PRIV:
-		return 0;
-	default:
-		return 1;
-	}
+ switch(atom_type)
+ {
+ case ATOM_EDTS:
+// case ATOM_MDIA:
+// case ATOM_MINF:
+ case ATOM_DRMS:
+ case ATOM_SINF:
+ case ATOM_SCHI:
+// case ATOM_STBL:
+// case ATOM_STSD:
+ case ATOM_STTS:
+ case ATOM_STSZ:
+ case ATOM_STZ2:
+ case ATOM_STCO:
+ case ATOM_STSC:
+// case ATOM_CTTS:
+ case ATOM_FRMA:
+ case ATOM_IVIV:
+ case ATOM_PRIV:
+ return 0;
+ default:
+ return 1;
+ }
 }
 
 /* parse atoms that are sub atoms of other atoms */
@@ -163,10 +163,10 @@
 }
 
 /* parse subatoms */
-		if (meta_only && !need_parse_when_meta_only(atom_type))
-		{
-			mp4ff_set_position(f, mp4ff_position(f)+size-header_size);
-		} else if (atom_type < SUBATOMIC)
+ if (meta_only && !need_parse_when_meta_only(atom_type))
+ {
+ mp4ff_set_position(f, mp4ff_position(f)+size-header_size);
+ } else if (atom_type < SUBATOMIC)
 {
 parse_sub_atoms(f, size-header_size,meta_only);
 } else {
@@ -206,21 +206,21 @@
 }
 
 /* parse subatoms */
-		if (meta_only && !need_parse_when_meta_only(atom_type))
-		{
-			if(mp4ff_set_position(f, mp4ff_position(f) + size - header_size) != 0)
-				break;
-		}
-		else if (atom_type < SUBATOMIC)
-		{
-			parse_sub_atoms(f, size-header_size,meta_only);
-		}
-		else
-		{
-			/* skip this atom */
-			if(mp4ff_set_position(f, mp4ff_position(f) + size - header_size) != 0)
-				break;
-		}
+ if (meta_only && !need_parse_when_meta_only(atom_type))
+ {
+ if(mp4ff_set_position(f, mp4ff_position(f) + size - header_size) != 0)
+ break;
+ }
+ else if (atom_type < SUBATOMIC)
+ {
+ parse_sub_atoms(f, size-header_size,meta_only);
+ }
+ else
+ {
+ /* skip this atom */
+ if(mp4ff_set_position(f, mp4ff_position(f) + size - header_size) != 0)
+ break;
+ }
 }
 
 return 0;
@@ -256,7 +256,7 @@
 
 int32_t mp4ff_get_track_type(const mp4ff_t *f, const int track)
 {
-	return f->track[track]->type;
+ return f->track[track]->type;
 }
 
 int32_t mp4ff_total_tracks(const mp4ff_t *f)
@@ -271,73 +271,73 @@
 
 uint32_t mp4ff_get_avg_bitrate(const mp4ff_t *f, const int32_t track)
 {
-	return f->track[track]->avgBitrate;
+ return f->track[track]->avgBitrate;
 }
 
 uint32_t mp4ff_get_max_bitrate(const mp4ff_t *f, const int32_t track)
 {
-	return f->track[track]->maxBitrate;
+ return f->track[track]->maxBitrate;
 }
 
 int64_t mp4ff_get_track_duration(const mp4ff_t *f, const int32_t track)
 {
-	return f->track[track]->duration;
+ return f->track[track]->duration;
 }
 
 int64_t mp4ff_get_track_duration_use_offsets(const mp4ff_t *f, const int32_t track)
 {
-	int64_t duration = mp4ff_get_track_duration(f,track);
-	if (duration!=-1)
-	{
-		int64_t offset = mp4ff_get_sample_offset(f,track,0);
-		if (offset > duration) duration = 0;
-		else duration -= offset;
-	}
-	return duration;
+ int64_t duration = mp4ff_get_track_duration(f,track);
+ if (duration!=-1)
+ {
+ int64_t offset = mp4ff_get_sample_offset(f,track,0);
+ if (offset > duration) duration = 0;
+ else duration -= offset;
+ }
+ return duration;
 }
 
 int32_t mp4ff_num_samples(const mp4ff_t *f, const int32_t track)
 {
-	int32_t i;
-	int32_t total = 0;
+ int32_t i;
+ int32_t total = 0;
 
-	if (track < 0)
-		return -1;
+ if (track < 0)
+ return -1;
 
-	for (i = 0; i < f->track[track]->stts_entry_count; i++)
-	{
-		total += f->track[track]->stts_sample_count[i];
-	}
+ for (i = 0; i < f->track[track]->stts_entry_count; i++)
+ {
+ total += f->track[track]->stts_sample_count[i];
+ }
 
-	return total;
+ return total;
 }
 
 uint32_t mp4ff_get_sample_rate(const mp4ff_t *f, const int32_t track)
 {
-	return f->track[track]->sampleRate;
+ return f->track[track]->sampleRate;
 }
 
 uint32_t mp4ff_get_channel_count(const mp4ff_t * f,const int32_t track)
 {
-	return f->track[track]->channelCount;
+ return f->track[track]->channelCount;
 }
 
 uint32_t mp4ff_get_audio_type(const mp4ff_t * f,const int32_t track)
 {
-	return f->track[track]->audioType;
+ return f->track[track]->audioType;
 }
 
 int32_t mp4ff_get_sample_duration_use_offsets(const mp4ff_t *f, const int32_t track, const int32_t sample)
 {
-	int32_t d,o;
-	d = mp4ff_get_sample_duration(f,track,sample);
-	if (d!=-1)
-	{
-		o = mp4ff_get_sample_offset(f,track,sample);
-		if (o>d) d = 0;
-		else d -= o;
-	}
-	return d;
+ int32_t d,o;
+ d = mp4ff_get_sample_duration(f,track,sample);
+ if (d!=-1)
+ {
+ o = mp4ff_get_sample_offset(f,track,sample);
+ if (o>d) d = 0;
+ else d -= o;
+ }
+ return d;
 }
 
 int32_t mp4ff_get_sample_duration(const mp4ff_t *f, const int32_t track, const int32_t sample)
@@ -346,10 +346,10 @@
 
 for (i = 0; i < f->track[track]->stts_entry_count; i++)
 {
-		int32_t delta = f->track[track]->stts_sample_count[i];
-		if (sample < co + delta)
-			return f->track[track]->stts_sample_delta[i];
-		co += delta;
+ int32_t delta = f->track[track]->stts_sample_count[i];
+ if (sample < co + delta)
+ return f->track[track]->stts_sample_delta[i];
+ co += delta;
 }
 return (int32_t)(-1);
 }
@@ -357,21 +357,21 @@
 int64_t mp4ff_get_sample_position(const mp4ff_t *f, const int32_t track, const int32_t sample)
 {
 int32_t i, co = 0;
-	int64_t acc = 0;
+ int64_t acc = 0;
 
 for (i = 0; i < f->track[track]->stts_entry_count; i++)
 {
-		int32_t delta = f->track[track]->stts_sample_count[i];
-		if (sample < co + delta)
-		{
-			acc += f->track[track]->stts_sample_delta[i] * (sample - co);
-			return acc;
-		}
-		else
-		{
-			acc += f->track[track]->stts_sample_delta[i] * delta;
-		}
-		co += delta;
+ int32_t delta = f->track[track]->stts_sample_count[i];
+ if (sample < co + delta)
+ {
+ acc += f->track[track]->stts_sample_delta[i] * (sample - co);
+ return acc;
+ }
+ else
+ {
+ acc += f->track[track]->stts_sample_delta[i] * delta;
+ }
+ co += delta;
 }
 return (int64_t)(-1);
 }
@@ -382,43 +382,43 @@
 
 for (i = 0; i < f->track[track]->ctts_entry_count; i++)
 {
-		int32_t delta = f->track[track]->ctts_sample_count[i];
-		if (sample < co + delta)
-			return f->track[track]->ctts_sample_offset[i];
-		co += delta;
+ int32_t delta = f->track[track]->ctts_sample_count[i];
+ if (sample < co + delta)
+ return f->track[track]->ctts_sample_offset[i];
+ co += delta;
 }
 return 0;
 }
 
 int32_t mp4ff_find_sample(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip)
 {
-	int32_t i, co = 0;
-	int64_t offset_total = 0;
-	mp4ff_track_t * p_track = f->track[track];
-
-	for (i = 0; i < p_track->stts_entry_count; i++)
-	{
-		int32_t sample_count = p_track->stts_sample_count[i];
-		int32_t sample_delta = p_track->stts_sample_delta[i];
-		int64_t offset_delta = (int64_t)sample_delta * (int64_t)sample_count;
-		if (offset < offset_total + offset_delta)
-		{
-			int64_t offset_fromstts = offset - offset_total;
-			if (toskip) *toskip = (int32_t)(offset_fromstts % sample_delta);
-			return co + (int32_t)(offset_fromstts / sample_delta);
-		}
-		else
-		{
-			offset_total += offset_delta;
-		}
-		co += sample_count;
-	}
-	return (int32_t)(-1);
+ int32_t i, co = 0;
+ int64_t offset_total = 0;
+ mp4ff_track_t * p_track = f->track[track];
+
+ for (i = 0; i < p_track->stts_entry_count; i++)
+ {
+ int32_t sample_count = p_track->stts_sample_count[i];
+ int32_t sample_delta = p_track->stts_sample_delta[i];
+ int64_t offset_delta = (int64_t)sample_delta * (int64_t)sample_count;
+ if (offset < offset_total + offset_delta)
+ {
+ int64_t offset_fromstts = offset - offset_total;
+ if (toskip) *toskip = (int32_t)(offset_fromstts % sample_delta);
+ return co + (int32_t)(offset_fromstts / sample_delta);
+ }
+ else
+ {
+ offset_total += offset_delta;
+ }
+ co += sample_count;
+ }
+ return (int32_t)(-1);
 }
 
 int32_t mp4ff_find_sample_use_offsets(const mp4ff_t *f, const int32_t track, const int64_t offset,int32_t * toskip)
 {
-	return mp4ff_find_sample(f,track,offset + mp4ff_get_sample_offset(f,track,0),toskip);
+ return mp4ff_find_sample(f,track,offset + mp4ff_get_sample_offset(f,track,0),toskip);
 }
 
 int32_t mp4ff_read_sample(mp4ff_t *f, const int32_t track, const int32_t sample,
@@ -428,7 +428,7 @@
 
 *bytes = mp4ff_audio_frame_size(f, track, sample);
 
-	if (*bytes==0) return 0;
+ if (*bytes==0) return 0;
 
 *audio_buffer = (uint8_t*)malloc(*bytes);
 
@@ -437,11 +437,11 @@
 result = mp4ff_read_data(f, *audio_buffer, *bytes);
 
 if (!result)
-	{
-		free(*audio_buffer);
-		*audio_buffer = 0;
+ {
+ free(*audio_buffer);
+ *audio_buffer = 0;
 return 0;
-	}
+ }
 
 #ifdef ITUNES_DRM
 if (f->track[track]->p_drms != NULL)
@@ -457,10 +457,10 @@
 int32_t mp4ff_read_sample_v2(mp4ff_t *f, const int track, const int sample,unsigned char *buffer)
 {
 int32_t result = 0;
-	int32_t size = mp4ff_audio_frame_size(f,track,sample);
-	if (size<=0) return 0;
-	mp4ff_set_sample_position(f, track, sample);
-	result = mp4ff_read_data(f,buffer,size);
+ int32_t size = mp4ff_audio_frame_size(f,track,sample);
+ if (size<=0) return 0;
+ mp4ff_set_sample_position(f, track, sample);
+ result = mp4ff_read_data(f,buffer,size);
 
 #ifdef ITUNES_DRM
 if (f->track[track]->p_drms != NULL)
@@ -474,7 +474,7 @@
 
 int32_t mp4ff_read_sample_getsize(mp4ff_t *f, const int track, const int sample)
 {
-	int32_t temp = mp4ff_audio_frame_size(f, track, sample);
-	if (temp<0) temp = 0;
-	return temp;
+ int32_t temp = mp4ff_audio_frame_size(f, track, sample);
+ if (temp<0) temp = 0;
+ return temp;
 }

audacious-plugins-3.3.4.tar.bz2/src/aac/mp4ff/mp4ff.h -> audacious-plugins-3.4.2.tar.bz2/src/aac/mp4ff/mp4ff.h Changed

@@ -1,19 +1,19 @@
 /*
 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
 ** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
+**
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
 ** the Free Software Foundation; either version 2 of the License, or
 ** (at your option) any later version.
-** 
+**
 ** This program is distributed in the hope that it will be useful,
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
-** 
+**
 ** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
+** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
@@ -47,7 +47,7 @@
     uint32_t (*read)(void *user_data, void *buffer, uint32_t length);
     uint32_t (*write)(void *udata, void *buffer, uint32_t length);
     uint32_t (*seek)(void *user_data, uint64_t position);
-	uint32_t (*truncate)(void *user_data);
+    uint32_t (*truncate)(void *user_data);
     void *user_data;
 } mp4ff_callback_t;

audacious-plugins-3.3.4.tar.bz2/src/aac/mp4ff/mp4ffint.h -> audacious-plugins-3.4.2.tar.bz2/src/aac/mp4ff/mp4ffint.h Changed

@@ -1,19 +1,19 @@
 /*
 ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
 ** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com
-**  
+**
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
 ** the Free Software Foundation; either version 2 of the License, or
 ** (at your option) any later version.
-** 
+**
 ** This program is distributed in the hope that it will be useful,
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
-** 
+**
 ** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
+** along with this program; if not, write to the Free Software
 ** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 **
 ** Any non-GPL usage of this software or parts of this software is strictly
@@ -77,7 +77,7 @@
 #define ATOM_USER 155
 #define ATOM_KEY  156
 
-#define ATOM_ALBUM_ARTIST	157
+#define ATOM_ALBUM_ARTIST   157
 #define ATOM_CONTENTGROUP   158
 #define ATOM_LYRICS         159
 #define ATOM_DESCRIPTION    160
@@ -125,17 +125,6 @@
 #define ATOM_SINF 24
 #define ATOM_SCHI 25
 
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"   
-#endif
-
-#if !(defined(_WIN32) || defined(_WIN32_WCE))
-#define stricmp strcasecmp
-#else
-#define stricmp _stricmp
-#define strdup _strdup
-#endif
-
 /* file callback structure */
 typedef struct
 {

audacious-plugins-3.3.4.tar.bz2/src/aac/mp4ff/mp4meta.c -> audacious-plugins-3.4.2.tar.bz2/src/aac/mp4ff/mp4meta.c Changed

@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include "mp4ffint.h"
 
 
@@ -75,10 +76,10 @@
 
 for (i = 0; i < tags->count; i++)
 {
- if (!stricmp(tags->tags[i].item, item))
+ if (!strcasecmp(tags->tags[i].item, item))
 {
-			free(tags->tags[i].value);
-			tags->tags[i].value = strdup(value);
+ free(tags->tags[i].value);
+ tags->tags[i].value = strdup(value);
 return 1;
 }
 }
@@ -136,32 +137,32 @@
 
 uint32_t mp4ff_meta_genre_to_index(const char * genrestr)
 {
-	unsigned n;
-	for(n=0;n<sizeof(ID3v1GenreList)/sizeof(ID3v1GenreList[0]);n++)
-	{
-		if (!stricmp(genrestr,ID3v1GenreList[n])) return n+1;
-	}
-	return 0;
+ unsigned n;
+ for(n=0;n<sizeof(ID3v1GenreList)/sizeof(ID3v1GenreList[0]);n++)
+ {
+ if (!strcasecmp(genrestr,ID3v1GenreList[n])) return n+1;
+ }
+ return 0;
 }
 
 const char * mp4ff_meta_index_to_genre(uint32_t idx)
 {
-	if (idx>0 && idx<=sizeof(ID3v1GenreList)/sizeof(ID3v1GenreList[0]))
-	{
-		return ID3v1GenreList[idx-1];
-	}
-	else
-	{
-		return 0;
-	}
+ if (idx>0 && idx<=sizeof(ID3v1GenreList)/sizeof(ID3v1GenreList[0]))
+ {
+ return ID3v1GenreList[idx-1];
+ }
+ else
+ {
+ return 0;
+ }
 }
 
 /* GCC4 says: unused!
 static int32_t TrackToString(char** str, const uint16_t track, const uint16_t totalTracks)
 {
-	char temp[32];
+ char temp[32];
 sprintf(temp, "%.5u of %.5u", track, totalTracks);
-	*str = strdup(temp);
+ *str = strdup(temp);
 return 0;
 }
 */
@@ -172,7 +173,7 @@
 "unknown", "title", "artist", "writer", "album",
 "date", "tool", "comment", "genre", "track",
 "disc", "compilation", "genre", "tempo", "cover",
-		"album_artist", "contentgroup", "lyrics", "description",
+ "album_artist", "contentgroup", "lyrics", "description",
 "network", "show", "episodename",
 "sorttitle", "sortalbum", "sortartist", "sortalbumartist",
 "sortwriter", "sortshow",
@@ -197,7 +198,7 @@
 case ATOM_GENRE2: tag_idx = 12; break;
 case ATOM_TEMPO: tag_idx = 13; break;
 case ATOM_COVER: tag_idx = 14; break;
-	case ATOM_ALBUM_ARTIST: tag_idx = 15; break;
+ case ATOM_ALBUM_ARTIST: tag_idx = 15; break;
 case ATOM_CONTENTGROUP: tag_idx = 16; break;
 case ATOM_LYRICS: tag_idx = 17; break;
 case ATOM_DESCRIPTION: tag_idx = 18; break;
@@ -216,7 +217,7 @@
 default: tag_idx = 0; break;
 }
 
-	*name = strdup(tag_names[tag_idx]);
+ *name = strdup(tag_names[tag_idx]);
 
 return 0;
 }
@@ -227,103 +228,106 @@
 uint8_t header_size = 0;
 uint64_t subsize, sumsize = 0;
 char * name = NULL;
-	char * data = NULL;
-	uint32_t done = 0;
+ char * data = NULL;
+ uint32_t done = 0;
 
 
 while (sumsize < size)
 {
-		uint64_t destpos;
+ uint64_t destpos;
 subsize = mp4ff_atom_read_header(f, &atom_type, &header_size);
-		destpos = mp4ff_position(f)+subsize-header_size;
-		if (!done)
-		{
-			if (atom_type == ATOM_DATA)
-			{
-				mp4ff_read_char(f); /* version */
-				mp4ff_read_int24(f); /* flags */
-				mp4ff_read_int32(f); /* reserved */
-
-				/* some need special attention */
-				if (parent_atom_type == ATOM_GENRE2 || parent_atom_type == ATOM_TEMPO)
-				{
-					if (subsize - header_size >= 8 + 2)
-					{
-						uint16_t val = mp4ff_read_int16(f);
-
-						if (parent_atom_type == ATOM_TEMPO)
-						{
-							char temp[16];
-							sprintf(temp, "%.5u BPM", val);
-							mp4ff_tag_add_field(&(f->tags), "tempo", temp);
-						}
-						else
-						{
-							const char * temp = mp4ff_meta_index_to_genre(val);
-							if (temp)
-							{
-								mp4ff_tag_add_field(&(f->tags), "genre", temp);
-							}
-						}
-						done = 1;
-					}
-				} else if (parent_atom_type == ATOM_TRACK || parent_atom_type == ATOM_DISC) {
-					/* if (!done && subsize - header_size >= 8 + 8) */
-					/* modified by AJS */
-					if ( !done && (subsize - header_size) >=
-						(sizeof(char) + sizeof(uint8_t)*3 + sizeof(uint32_t) + /* version + flags + reserved */
-						+ sizeof(uint16_t) /* leading uint16_t */
-						+ sizeof(uint16_t) /* track / disc */
-						+ sizeof(uint16_t)) /* totaltracks / totaldiscs */
-						)
-					{
-						uint16_t index,total;
-						char temp[32];
-						mp4ff_read_int16(f);
-						index = mp4ff_read_int16(f);
-						total = mp4ff_read_int16(f);
- 						/* modified by AJS */
-						/* mp4ff_read_int16(f); */
-
-						sprintf(temp,"%d",index);
-						mp4ff_tag_add_field(&(f->tags), parent_atom_type == ATOM_TRACK ? "track" : "disc", temp);
-						if (total>0)
-						{
-							sprintf(temp,"%d",total);
-							mp4ff_tag_add_field(&(f->tags), parent_atom_type == ATOM_TRACK ? "totaltracks" : "totaldiscs", temp);
-						}
-						done = 1;
-					}
-				} else
-				{
-					if (data) {free(data);data = NULL;}
-					data = mp4ff_read_string(f,(uint32_t)(subsize-(header_size+8)));
-				}
-			} else if (atom_type == ATOM_NAME) {
-				if (!done)
-				{
-					mp4ff_read_char(f); /* version */
-					mp4ff_read_int24(f); /* flags */
-					if (name) free(name);
-					name = mp4ff_read_string(f,(uint32_t)(subsize-(header_size+4)));
-				}
-			}
-			mp4ff_set_position(f, destpos);
-			sumsize += subsize;
-		}
+ if (!subsize)
+ break;
+
+ destpos = mp4ff_position(f)+subsize-header_size;
+ if (!done)
+ {
+ if (atom_type == ATOM_DATA)
+ {
+ mp4ff_read_char(f); /* version */
+ mp4ff_read_int24(f); /* flags */
+ mp4ff_read_int32(f); /* reserved */
+
+ /* some need special attention */
+ if (parent_atom_type == ATOM_GENRE2 || parent_atom_type == ATOM_TEMPO)
+ {
+ if (subsize - header_size >= 8 + 2)
+ {
+ uint16_t val = mp4ff_read_int16(f);
+
+ if (parent_atom_type == ATOM_TEMPO)
+ {
+ char temp[16];
+ sprintf(temp, "%.5u BPM", val);
+ mp4ff_tag_add_field(&(f->tags), "tempo", temp);
+ }
+ else
+ {
+ const char * temp = mp4ff_meta_index_to_genre(val);
+ if (temp)
+ {
+ mp4ff_tag_add_field(&(f->tags), "genre", temp);
+ }
+ }
+ done = 1;
+ }
+ } else if (parent_atom_type == ATOM_TRACK || parent_atom_type == ATOM_DISC) {
+ /* if (!done && subsize - header_size >= 8 + 8) */
+ /* modified by AJS */
+ if ( !done && (subsize - header_size) >=
+ (sizeof(char) + sizeof(uint8_t)*3 + sizeof(uint32_t) + /* version + flags + reserved */
+ + sizeof(uint16_t) /* leading uint16_t */
+ + sizeof(uint16_t) /* track / disc */
+ + sizeof(uint16_t)) /* totaltracks / totaldiscs */
+ )
+ {
+ uint16_t index,total;
+ char temp[32];
+ mp4ff_read_int16(f);
+ index = mp4ff_read_int16(f);
+ total = mp4ff_read_int16(f);
+ /* modified by AJS */
+ /* mp4ff_read_int16(f); */
+
+ sprintf(temp,"%d",index);
+ mp4ff_tag_add_field(&(f->tags), parent_atom_type == ATOM_TRACK ? "track" : "disc", temp);
+ if (total>0)
+ {
+ sprintf(temp,"%d",total);
+ mp4ff_tag_add_field(&(f->tags), parent_atom_type == ATOM_TRACK ? "totaltracks" : "totaldiscs", temp);
+ }
+ done = 1;
+ }
+ } else
+ {
+ if (data) {free(data);data = NULL;}
+ data = mp4ff_read_string(f,(uint32_t)(subsize-(header_size+8)));
+ }
+ } else if (atom_type == ATOM_NAME) {
+ if (!done)
+ {
+ mp4ff_read_char(f); /* version */
+ mp4ff_read_int24(f); /* flags */
+ if (name) free(name);
+ name = mp4ff_read_string(f,(uint32_t)(subsize-(header_size+4)));
+ }
+ }
+ mp4ff_set_position(f, destpos);
+ sumsize += subsize;
+ }
 }
 
-	if (data)
-	{
-		if (!done)
-		{
-			if (name == NULL) mp4ff_set_metadata_name(f, parent_atom_type, &name);
-			if (name) mp4ff_tag_add_field(&(f->tags), name, data);
-		}
-
-		free(data);
-	}
-	if (name) free(name);
+ if (data)
+ {
+ if (!done)
+ {
+ if (name == NULL) mp4ff_set_metadata_name(f, parent_atom_type, &name);
+ if (name) mp4ff_tag_add_field(&(f->tags), name, data);
+ }
+
+ free(data);
+ }
+ if (name) free(name);
 return 1;
 }
 
@@ -353,9 +357,9 @@
 
 for (i = 0; i < f->tags.count; i++)
 {
- if (!stricmp(f->tags.tags[i].item, item))
+ if (!strcasecmp(f->tags.tags[i].item, item))
 {
-			*value = strdup(f->tags.tags[i].value);
+ *value = strdup(f->tags.tags[i].value);
 return 1;
 }
 }
@@ -380,9 +384,9 @@
 *value = NULL;
 return 0;
 } else {
-		*item = strdup(f->tags.tags[index].item);
-		*value = strdup(f->tags.tags[index].value);
-		return 1;
+ *item = strdup(f->tags.tags[index].item);
+ *value = strdup(f->tags.tags[index].value);
+ return 1;
 }
 }

audacious-plugins-3.3.4.tar.bz2/src/aac/mp4ff/mp4sample.c -> audacious-plugins-3.4.2.tar.bz2/src/aac/mp4ff/mp4sample.c Changed

audacious-plugins-3.3.4.tar.bz2/src/aac/mp4ff/mp4tagupdate.c -> audacious-plugins-3.4.2.tar.bz2/src/aac/mp4ff/mp4tagupdate.c Changed

@@ -1,5 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "mp4ffint.h"
 
 #ifdef USE_TAGGING
@@ -9,7 +10,7 @@
 uint32_t result;
 uint32_t a, b, c, d;
 int8_t data[4];
- 
+
 memcpy(data,&src,sizeof(src));
 a = (uint8_t)data[0];
 b = (uint8_t)data[1];
@@ -26,7 +27,7 @@
 uint16_t result;
 uint16_t a, b;
 int8_t data[2];
- 
+
 memcpy(data,&src,sizeof(src));
 a = (uint8_t)data[0];
 b = (uint8_t)data[1];
@@ -38,155 +39,155 @@
 
 typedef struct
 {
-	void * data;
-	unsigned written;
-	unsigned allocated;
-	unsigned error;
+ void * data;
+ unsigned written;
+ unsigned allocated;
+ unsigned error;
 } membuffer;
 
 unsigned membuffer_write(membuffer * buf,const void * ptr,unsigned bytes)
 {
-	unsigned dest_size = buf->written + bytes;
-
-	if (buf->error) return 0;
-	if (dest_size > buf->allocated)
-	{
-		do
-		{
-			buf->allocated <<= 1;
-		} while(dest_size > buf->allocated);
-		
-		{
-			void * newptr = realloc(buf->data,buf->allocated);
-			if (newptr==0)
-			{
-				free(buf->data);
-				buf->data = 0;
-				buf->error = 1;
-				return 0;
-			}
-			buf->data = newptr;
-		}
-	}
-
-	if (ptr) memcpy((char*)buf->data + buf->written,ptr,bytes);
-	buf->written += bytes;
-	return bytes;
+ unsigned dest_size = buf->written + bytes;
+
+ if (buf->error) return 0;
+ if (dest_size > buf->allocated)
+ {
+ do
+ {
+ buf->allocated <<= 1;
+ } while(dest_size > buf->allocated);
+
+ {
+ void * newptr = realloc(buf->data,buf->allocated);
+ if (newptr==0)
+ {
+ free(buf->data);
+ buf->data = 0;
+ buf->error = 1;
+ return 0;
+ }
+ buf->data = newptr;
+ }
+ }
+
+ if (ptr) memcpy((char*)buf->data + buf->written,ptr,bytes);
+ buf->written += bytes;
+ return bytes;
 }
 
 #define membuffer_write_data membuffer_write
 
 unsigned membuffer_write_int32(membuffer * buf,uint32_t data)
 {
-	uint8_t temp[4] = {(uint8_t)(data>>24),(uint8_t)(data>>16),(uint8_t)(data>>8),(uint8_t)data};	
-	return membuffer_write_data(buf,temp,4);
+ uint8_t temp[4] = {(uint8_t)(data>>24),(uint8_t)(data>>16),(uint8_t)(data>>8),(uint8_t)data};
+ return membuffer_write_data(buf,temp,4);
 }
 
 unsigned membuffer_write_int24(membuffer * buf,uint32_t data)
 {
-	uint8_t temp[3] = {(uint8_t)(data>>16),(uint8_t)(data>>8),(uint8_t)data};
-	return membuffer_write_data(buf,temp,3);
+ uint8_t temp[3] = {(uint8_t)(data>>16),(uint8_t)(data>>8),(uint8_t)data};
+ return membuffer_write_data(buf,temp,3);
 }
 
 unsigned membuffer_write_int16(membuffer * buf,uint16_t data)
 {
-	uint8_t temp[2] = {(uint8_t)(data>>8),(uint8_t)data};
-	return membuffer_write_data(buf,temp,2);
+ uint8_t temp[2] = {(uint8_t)(data>>8),(uint8_t)data};
+ return membuffer_write_data(buf,temp,2);
 }
 
 unsigned membuffer_write_atom_name(membuffer * buf,const char * data)
 {
-	return membuffer_write_data(buf,data,4)==4 ? 1 : 0;
+ return membuffer_write_data(buf,data,4)==4 ? 1 : 0;
 }
 
 void membuffer_write_atom(membuffer * buf,const char * name,unsigned size,const void * data)
 {
-	membuffer_write_int32(buf,size + 8);
-	membuffer_write_atom_name(buf,name);
-	membuffer_write_data(buf,data,size);
+ membuffer_write_int32(buf,size + 8);
+ membuffer_write_atom_name(buf,name);
+ membuffer_write_data(buf,data,size);
 }
 
 unsigned membuffer_write_string(membuffer * buf,const char * data)
 {
-	return membuffer_write_data(buf,data,strlen(data));
+ return membuffer_write_data(buf,data,strlen(data));
 }
 
 unsigned membuffer_write_int8(membuffer * buf,uint8_t data)
 {
-	return membuffer_write_data(buf,&data,1);
+ return membuffer_write_data(buf,&data,1);
 }
 
 void * membuffer_get_ptr(const membuffer * buf)
 {
-	return buf->data;
+ return buf->data;
 }
 
 unsigned membuffer_get_size(const membuffer * buf)
 {
-	return buf->written;
+ return buf->written;
 }
 
 unsigned membuffer_error(const membuffer * buf)
 {
-	return buf->error;
+ return buf->error;
 }
 
 void membuffer_set_error(membuffer * buf) {buf->error = 1;}
 
 unsigned membuffer_transfer_from_file(membuffer * buf,mp4ff_t * src,unsigned bytes)
 {
-	unsigned oldsize;
-	void * bufptr;
-	
-	oldsize = membuffer_get_size(buf);
-	if (membuffer_write_data(buf,0,bytes) != bytes) return 0;
-
-	bufptr = membuffer_get_ptr(buf);
-	if (bufptr==0) return 0;
-	
-	if ((unsigned)mp4ff_read_data(src,(unsigned char*)bufptr + oldsize,bytes)!=bytes)
-	{
-		membuffer_set_error(buf);
-		return 0;
-	}
-	
-	return bytes;
+ unsigned oldsize;
+ void * bufptr;
+
+ oldsize = membuffer_get_size(buf);
+ if (membuffer_write_data(buf,0,bytes) != bytes) return 0;
+
+ bufptr = membuffer_get_ptr(buf);
+ if (bufptr==0) return 0;
+
+ if ((unsigned)mp4ff_read_data(src,(unsigned char*)bufptr + oldsize,bytes)!=bytes)
+ {
+ membuffer_set_error(buf);
+ return 0;
+ }
+
+ return bytes;
 }
 
 
 membuffer * membuffer_create()
 {
-	const unsigned initial_size = 256;
+ const unsigned initial_size = 256;
 
-	membuffer * buf = (membuffer *) malloc(sizeof(membuffer));
-	buf->data = malloc(initial_size);
-	buf->written = 0;
-	buf->allocated = initial_size;
-	buf->error = buf->data == 0 ? 1 : 0;
+ membuffer * buf = (membuffer *) malloc(sizeof(membuffer));
+ buf->data = malloc(initial_size);
+ buf->written = 0;
+ buf->allocated = initial_size;
+ buf->error = buf->data == 0 ? 1 : 0;
 
-	return buf;
+ return buf;
 }
 
 void membuffer_free(membuffer * buf)
 {
-	if (buf->data) free(buf->data);
-	free(buf);
+ if (buf->data) free(buf->data);
+ free(buf);
 }
 
 void * membuffer_detach(membuffer * buf)
 {
-	void * ret;
+ void * ret;
+
+ if (buf->error) return 0;
+
+ ret = realloc(buf->data,buf->written);
 
-	if (buf->error) return 0;
+ if (ret == 0) free(buf->data);
 
-	ret = realloc(buf->data,buf->written);
-	
-	if (ret == 0) free(buf->data);
+ buf->data = 0;
+ buf->error = 1;
 
-	buf->data = 0;
-	buf->error = 1;
-	
-	return ret;
+ return ret;
 }
 
 #if 0
@@ -207,425 +208,425 @@
 
 typedef struct
 {
-	const char * atom;
-	const char * name;	
+ const char * atom;
+ const char * name;
 } stdmeta_entry;
 
-static stdmeta_entry stdmetas[] = 
-{
-	{"\xA9" "nam","title"},
-	{"\xA9" "ART","artist"},
-	{"\xA9" "wrt","writer"},
-	{"\xA9" "alb","album"},
-	{"\xA9" "day","date"},
-	{"\xA9" "too","tool"},
-	{"\xA9" "cmt","comment"},
-//	{"\xA9" "gen","genre"},
-	{"cpil","compilation"},
-//	{"trkn","track"},
-//	{"disk","disc"},
-//	{"gnre","genre"},
-	{"covr","cover"},
-	/* added by AJS */
-	{"aART","album_artist"},
+static stdmeta_entry stdmetas[] =
+{
+ {"\xA9" "nam","title"},
+ {"\xA9" "ART","artist"},
+ {"\xA9" "wrt","writer"},
+ {"\xA9" "alb","album"},
+ {"\xA9" "day","date"},
+ {"\xA9" "too","tool"},
+ {"\xA9" "cmt","comment"},
+// {"\xA9" "gen","genre"},
+ {"cpil","compilation"},
+// {"trkn","track"},
+// {"disk","disc"},
+// {"gnre","genre"},
+ {"covr","cover"},
+ /* added by AJS */
+ {"aART","album_artist"},
 };
 
 
 static const char* find_standard_meta(const char * name) //returns atom name if found, 0 if not
 {
-	unsigned n;
-	for(n=0;n<sizeof(stdmetas)/sizeof(stdmetas[0]);n++)
-	{
-		if (!stricmp(name,stdmetas[n].name)) return stdmetas[n].atom;
-	}
+ unsigned n;
+ for(n=0;n<sizeof(stdmetas)/sizeof(stdmetas[0]);n++)
+ {
+ if (!strcasecmp(name,stdmetas[n].name)) return stdmetas[n].atom;
+ }
 return 0;
 }
 
 static void membuffer_write_track_tag(membuffer * buf,const char * name,uint32_t index,uint32_t total)
 {
-	membuffer_write_int32(buf,8 /*atom header*/ + 8 /*data atom header*/ + 8 /*flags + reserved*/ + 8 /*actual data*/ );
-	membuffer_write_atom_name(buf,name);
-	membuffer_write_int32(buf,8 /*data atom header*/ + 8 /*flags + reserved*/ + 8 /*actual data*/ );
-	membuffer_write_atom_name(buf,"data");
-	membuffer_write_int32(buf,0);//flags
-	membuffer_write_int32(buf,0);//reserved
-	membuffer_write_int16(buf,0);
-	membuffer_write_int16(buf,(uint16_t)index);//track number
-	membuffer_write_int16(buf,(uint16_t)total);//total tracks
-	membuffer_write_int16(buf,0);
+ membuffer_write_int32(buf,8 /*atom header*/ + 8 /*data atom header*/ + 8 /*flags + reserved*/ + 8 /*actual data*/ );
+ membuffer_write_atom_name(buf,name);
+ membuffer_write_int32(buf,8 /*data atom header*/ + 8 /*flags + reserved*/ + 8 /*actual data*/ );
+ membuffer_write_atom_name(buf,"data");
+ membuffer_write_int32(buf,0);//flags
+ membuffer_write_int32(buf,0);//reserved
+ membuffer_write_int16(buf,0);
+ membuffer_write_int16(buf,(uint16_t)index);//track number
+ membuffer_write_int16(buf,(uint16_t)total);//total tracks
+ membuffer_write_int16(buf,0);
 }
 
 static void membuffer_write_int16_tag(membuffer * buf,const char * name,uint16_t value)
 {
-	membuffer_write_int32(buf,8 /*atom header*/ + 8 /*data atom header*/ + 8 /*flags + reserved*/ + 2 /*actual data*/ );
-	membuffer_write_atom_name(buf,name);
-	membuffer_write_int32(buf,8 /*data atom header*/ + 8 /*flags + reserved*/ + 2 /*actual data*/ );
-	membuffer_write_atom_name(buf,"data");
-	membuffer_write_int32(buf,0);//flags
-	membuffer_write_int32(buf,0);//reserved
-	membuffer_write_int16(buf,value);//value
+ membuffer_write_int32(buf,8 /*atom header*/ + 8 /*data atom header*/ + 8 /*flags + reserved*/ + 2 /*actual data*/ );
+ membuffer_write_atom_name(buf,name);
+ membuffer_write_int32(buf,8 /*data atom header*/ + 8 /*flags + reserved*/ + 2 /*actual data*/ );
+ membuffer_write_atom_name(buf,"data");
+ membuffer_write_int32(buf,0);//flags
+ membuffer_write_int32(buf,0);//reserved
+ membuffer_write_int16(buf,value);//value
 }
 
 static void membuffer_write_std_tag(membuffer * buf,const char * name,const char * value)
 {
-	/* added by AJS */
-	uint32_t flags = 1;
-
-	/* special check for compilation flag */
-	if ( strcmp(name, "cpil") == 0)
-	{
-		flags = 21;
-	}
-
-	membuffer_write_int32(buf,8 /*atom header*/ + 8 /*data atom header*/ + 8 /*flags + reserved*/ + strlen(value) );
-	membuffer_write_atom_name(buf,name);
-	membuffer_write_int32(buf,8 /*data atom header*/ + 8 /*flags + reserved*/ + strlen(value));
-	membuffer_write_atom_name(buf,"data");
-	membuffer_write_int32(buf,flags);//flags
-	membuffer_write_int32(buf,0);//reserved
-	membuffer_write_data(buf,value,strlen(value));
+ /* added by AJS */
+ uint32_t flags = 1;
+
+ /* special check for compilation flag */
+ if ( strcmp(name, "cpil") == 0)
+ {
+ flags = 21;
+ }
+
+ membuffer_write_int32(buf,8 /*atom header*/ + 8 /*data atom header*/ + 8 /*flags + reserved*/ + strlen(value) );
+ membuffer_write_atom_name(buf,name);
+ membuffer_write_int32(buf,8 /*data atom header*/ + 8 /*flags + reserved*/ + strlen(value));
+ membuffer_write_atom_name(buf,"data");
+ membuffer_write_int32(buf,flags);//flags
+ membuffer_write_int32(buf,0);//reserved
+ membuffer_write_data(buf,value,strlen(value));
 }
 
 static void membuffer_write_custom_tag(membuffer * buf,const char * name,const char * value)
 {
-	membuffer_write_int32(buf,8 /*atom header*/ + 0x1C /*weirdo itunes atom*/ + 12 /*name atom header*/ + strlen(name) + 16 /*data atom header + flags*/ + strlen(value) );
-	membuffer_write_atom_name(buf,"----");
-	membuffer_write_int32(buf,0x1C);//weirdo itunes atom
-	membuffer_write_atom_name(buf,"mean");
-	membuffer_write_int32(buf,0);
-	membuffer_write_data(buf,"com.apple.iTunes",16);
-	membuffer_write_int32(buf,12 + strlen(name));
-	membuffer_write_atom_name(buf,"name");
-	membuffer_write_int32(buf,0);
-	membuffer_write_data(buf,name,strlen(name));
-	membuffer_write_int32(buf,8 /*data atom header*/ + 8 /*flags + reserved*/ + strlen(value));
-	membuffer_write_atom_name(buf,"data");
-	membuffer_write_int32(buf,1);//flags
-	membuffer_write_int32(buf,0);//reserved
-	membuffer_write_data(buf,value,strlen(value));
+ membuffer_write_int32(buf,8 /*atom header*/ + 0x1C /*weirdo itunes atom*/ + 12 /*name atom header*/ + strlen(name) + 16 /*data atom header + flags*/ + strlen(value) );
+ membuffer_write_atom_name(buf,"----");
+ membuffer_write_int32(buf,0x1C);//weirdo itunes atom
+ membuffer_write_atom_name(buf,"mean");
+ membuffer_write_int32(buf,0);
+ membuffer_write_data(buf,"com.apple.iTunes",16);
+ membuffer_write_int32(buf,12 + strlen(name));
+ membuffer_write_atom_name(buf,"name");
+ membuffer_write_int32(buf,0);
+ membuffer_write_data(buf,name,strlen(name));
+ membuffer_write_int32(buf,8 /*data atom header*/ + 8 /*flags + reserved*/ + strlen(value));
+ membuffer_write_atom_name(buf,"data");
+ membuffer_write_int32(buf,1);//flags
+ membuffer_write_int32(buf,0);//reserved
+ membuffer_write_data(buf,value,strlen(value));
 
 }
 
 static uint32_t myatoi(const char * param)
 {
-	return param ? atoi(param) : 0;
+ return param ? atoi(param) : 0;
 }
 
 static uint32_t create_ilst(const mp4ff_metadata_t * data,void ** out_buffer,uint32_t * out_size)
 {
-	membuffer * buf = membuffer_create();
-	unsigned metaptr;
-	char * mask = (char*)malloc(data->count);
-	memset(mask,0,data->count);
-
-	{
-		const char * tracknumber_ptr = 0, * totaltracks_ptr = 0;
-		const char * discnumber_ptr = 0, * totaldiscs_ptr = 0;
-		const char * genre_ptr = 0, * tempo_ptr = 0;
-		for(metaptr = 0; metaptr < data->count; metaptr++)
-		{
-			mp4ff_tag_t * tag = &data->tags[metaptr];
-			if (!stricmp(tag->item,"tracknumber") || !stricmp(tag->item,"track"))
-			{
-				if (tracknumber_ptr==0) tracknumber_ptr = tag->value;
-				mask[metaptr] = 1;
-			}
-			else if (!stricmp(tag->item,"totaltracks"))
-			{
-				if (totaltracks_ptr==0) totaltracks_ptr = tag->value;
-				mask[metaptr] = 1;
-			}
-			else if (!stricmp(tag->item,"discnumber") || !stricmp(tag->item,"disc"))
-			{
-				if (discnumber_ptr==0) discnumber_ptr = tag->value;
-				mask[metaptr] = 1;
-			}
-			else if (!stricmp(tag->item,"totaldiscs"))
-			{
-				if (totaldiscs_ptr==0) totaldiscs_ptr = tag->value;
-				mask[metaptr] = 1;
-			}
-			else if (!stricmp(tag->item,"genre"))
-			{
-				if (genre_ptr==0) genre_ptr = tag->value;
-				mask[metaptr] = 1;
-			}
-			else if (!stricmp(tag->item,"tempo"))
-			{
-				if (tempo_ptr==0) tempo_ptr = tag->value;
-				mask[metaptr] = 1;
-			}
-
-		}
-
-		if (tracknumber_ptr) membuffer_write_track_tag(buf,"trkn",myatoi(tracknumber_ptr),myatoi(totaltracks_ptr));
-		if (discnumber_ptr) membuffer_write_track_tag(buf,"disk",myatoi(discnumber_ptr),myatoi(totaldiscs_ptr));
-		if (tempo_ptr) membuffer_write_int16_tag(buf,"tmpo",(uint16_t)myatoi(tempo_ptr));
-
-		if (genre_ptr)
-		{
-			uint32_t index = mp4ff_meta_genre_to_index(genre_ptr);
-			if (index==0)
-				membuffer_write_std_tag(buf,"\xa9""gen",genre_ptr);
-			else
-				membuffer_write_int16_tag(buf,"gnre",(uint16_t)index);
-		}
-	}
-	
-	for(metaptr = 0; metaptr < data->count; metaptr++)
-	{
-		if (!mask[metaptr])
-		{
-			mp4ff_tag_t * tag = &data->tags[metaptr];
-			const char * std_meta_atom = find_standard_meta(tag->item);
-			if (std_meta_atom)
-			{
-				membuffer_write_std_tag(buf,std_meta_atom,tag->value);
-			}
-			else
-			{
-				membuffer_write_custom_tag(buf,tag->item,tag->value);
-			}
-		}
-	}
-
-	free(mask);
-
-	if (membuffer_error(buf))
-	{
-		membuffer_free(buf);
-		return 0;
-	}
-
-	*out_size = membuffer_get_size(buf);
-	*out_buffer = membuffer_detach(buf);
-	membuffer_free(buf);
-
-	return 1;
+ membuffer * buf = membuffer_create();
+ unsigned metaptr;
+ char * mask = (char*)malloc(data->count);
+ memset(mask,0,data->count);
+
+ {
+ const char * tracknumber_ptr = 0, * totaltracks_ptr = 0;
+ const char * discnumber_ptr = 0, * totaldiscs_ptr = 0;
+ const char * genre_ptr = 0, * tempo_ptr = 0;
+ for(metaptr = 0; metaptr < data->count; metaptr++)
+ {
+ mp4ff_tag_t * tag = &data->tags[metaptr];
+ if (!strcasecmp(tag->item,"tracknumber") || !strcasecmp(tag->item,"track"))
+ {
+ if (tracknumber_ptr==0) tracknumber_ptr = tag->value;
+ mask[metaptr] = 1;
+ }
+ else if (!strcasecmp(tag->item,"totaltracks"))
+ {
+ if (totaltracks_ptr==0) totaltracks_ptr = tag->value;
+ mask[metaptr] = 1;
+ }
+ else if (!strcasecmp(tag->item,"discnumber") || !strcasecmp(tag->item,"disc"))
+ {
+ if (discnumber_ptr==0) discnumber_ptr = tag->value;
+ mask[metaptr] = 1;
+ }
+ else if (!strcasecmp(tag->item,"totaldiscs"))
+ {
+ if (totaldiscs_ptr==0) totaldiscs_ptr = tag->value;
+ mask[metaptr] = 1;
+ }
+ else if (!strcasecmp(tag->item,"genre"))
+ {
+ if (genre_ptr==0) genre_ptr = tag->value;
+ mask[metaptr] = 1;
+ }
+ else if (!strcasecmp(tag->item,"tempo"))
+ {
+ if (tempo_ptr==0) tempo_ptr = tag->value;
+ mask[metaptr] = 1;
+ }
+
+ }
+
+ if (tracknumber_ptr) membuffer_write_track_tag(buf,"trkn",myatoi(tracknumber_ptr),myatoi(totaltracks_ptr));
+ if (discnumber_ptr) membuffer_write_track_tag(buf,"disk",myatoi(discnumber_ptr),myatoi(totaldiscs_ptr));
+ if (tempo_ptr) membuffer_write_int16_tag(buf,"tmpo",(uint16_t)myatoi(tempo_ptr));
+
+ if (genre_ptr)
+ {
+ uint32_t index = mp4ff_meta_genre_to_index(genre_ptr);
+ if (index==0)
+ membuffer_write_std_tag(buf,"\xa9""gen",genre_ptr);
+ else
+ membuffer_write_int16_tag(buf,"gnre",(uint16_t)index);
+ }
+ }
+
+ for(metaptr = 0; metaptr < data->count; metaptr++)
+ {
+ if (!mask[metaptr])
+ {
+ mp4ff_tag_t * tag = &data->tags[metaptr];
+ const char * std_meta_atom = find_standard_meta(tag->item);
+ if (std_meta_atom)
+ {
+ membuffer_write_std_tag(buf,std_meta_atom,tag->value);
+ }
+ else
+ {
+ membuffer_write_custom_tag(buf,tag->item,tag->value);
+ }
+ }
+ }
+
+ free(mask);
+
+ if (membuffer_error(buf))
+ {
+ membuffer_free(buf);
+ return 0;
+ }
+
+ *out_size = membuffer_get_size(buf);
+ *out_buffer = membuffer_detach(buf);
+ membuffer_free(buf);
+
+ return 1;
 }
 
 static uint32_t find_atom(mp4ff_t * f,uint64_t base,uint32_t size,const char * name)
 {
-	uint32_t remaining = size;
-	uint64_t atom_offset = base;
-	for(;;)
-	{
-		unsigned char atom_name[4];
-		uint32_t atom_size;
-
-		mp4ff_set_position(f,atom_offset);
-		
-		if (remaining < 8) break;
-		atom_size = mp4ff_read_int32(f);
-		if (atom_size > remaining || atom_size < 8) break;
-		mp4ff_read_data(f,atom_name,4);
-		
-		if (!memcmp(atom_name,name,4))
-		{
-			mp4ff_set_position(f,atom_offset);
-			return 1;
-		}
-		
-		remaining -= atom_size;
-		atom_offset += atom_size;
-	}
-	return 0;
+ uint32_t remaining = size;
+ uint64_t atom_offset = base;
+ for(;;)
+ {
+ unsigned char atom_name[4];
+ uint32_t atom_size;
+
+ mp4ff_set_position(f,atom_offset);
+
+ if (remaining < 8) break;
+ atom_size = mp4ff_read_int32(f);
+ if (atom_size > remaining || atom_size < 8) break;
+ mp4ff_read_data(f,atom_name,4);
+
+ if (!memcmp(atom_name,name,4))
+ {
+ mp4ff_set_position(f,atom_offset);
+ return 1;
+ }
+
+ remaining -= atom_size;
+ atom_offset += atom_size;
+ }
+ return 0;
 }
 
 static uint32_t find_atom_v2(mp4ff_t * f,uint64_t base,uint32_t size,const char * name,uint32_t extraheaders,const char * name_inside)
 {
-	uint64_t first_base = (uint64_t)(-1);
-	while(find_atom(f,base,size,name))//try to find atom <name> with atom <name_inside> in it
-	{
-		uint64_t mybase = mp4ff_position(f);
-		uint32_t mysize = mp4ff_read_int32(f);
-
-		if (first_base == (uint64_t)(-1)) first_base = mybase;
-
-		if (mysize < 8 + extraheaders) break;
-
-		if (find_atom(f,mybase+(8+extraheaders),mysize-(8+extraheaders),name_inside))
-		{
-			mp4ff_set_position(f,mybase);
-			return 2;
-		}
-		base += mysize;
-		if (size<=mysize) {size=0;break;}
-		size -= mysize;
-	}
-
-	if (first_base != (uint64_t)(-1))//wanted atom inside not found
-	{
-		mp4ff_set_position(f,first_base);
-		return 1;
-	}
-	else return 0;	
+ uint64_t first_base = (uint64_t)(-1);
+ while(find_atom(f,base,size,name))//try to find atom <name> with atom <name_inside> in it
+ {
+ uint64_t mybase = mp4ff_position(f);
+ uint32_t mysize = mp4ff_read_int32(f);
+
+ if (first_base == (uint64_t)(-1)) first_base = mybase;
+
+ if (mysize < 8 + extraheaders) break;
+
+ if (find_atom(f,mybase+(8+extraheaders),mysize-(8+extraheaders),name_inside))
+ {
+ mp4ff_set_position(f,mybase);
+ return 2;
+ }
+ base += mysize;
+ if (size<=mysize) {size=0;break;}
+ size -= mysize;
+ }
+
+ if (first_base != (uint64_t)(-1))//wanted atom inside not found
+ {
+ mp4ff_set_position(f,first_base);
+ return 1;
+ }
+ else return 0;
 }
 
 static uint32_t create_meta(const mp4ff_metadata_t * data,void ** out_buffer,uint32_t * out_size)
 {
-	membuffer * buf;
-	uint32_t ilst_size;
-	void * ilst_buffer;
+ membuffer * buf;
+ uint32_t ilst_size;
+ void * ilst_buffer;
 
-	if (!create_ilst(data,&ilst_buffer,&ilst_size)) return 0;
+ if (!create_ilst(data,&ilst_buffer,&ilst_size)) return 0;
 
-	buf = membuffer_create();
+ buf = membuffer_create();
 
-	membuffer_write_int32(buf,0);
-	membuffer_write_atom(buf,"ilst",ilst_size,ilst_buffer);
-	free(ilst_buffer);
+ membuffer_write_int32(buf,0);
+ membuffer_write_atom(buf,"ilst",ilst_size,ilst_buffer);
+ free(ilst_buffer);
 
-	*out_size = membuffer_get_size(buf);
-	*out_buffer = membuffer_detach(buf);
-	membuffer_free(buf);
-	return 1;
+ *out_size = membuffer_get_size(buf);
+ *out_buffer = membuffer_detach(buf);
+ membuffer_free(buf);
+ return 1;
 }
 
 static uint32_t create_udta(const mp4ff_metadata_t * data,void ** out_buffer,uint32_t * out_size)
 {
-	membuffer * buf;
-	uint32_t meta_size;
-	void * meta_buffer;
+ membuffer * buf;
+ uint32_t meta_size;
+ void * meta_buffer;
 
-	if (!create_meta(data,&meta_buffer,&meta_size)) return 0;
+ if (!create_meta(data,&meta_buffer,&meta_size)) return 0;
 
-	buf = membuffer_create();
+ buf = membuffer_create();
 
-	membuffer_write_atom(buf,"meta",meta_size,meta_buffer);
+ membuffer_write_atom(buf,"meta",meta_size,meta_buffer);
 
-	free(meta_buffer);
+ free(meta_buffer);
 
-	*out_size = membuffer_get_size(buf);
-	*out_buffer = membuffer_detach(buf);
-	membuffer_free(buf);
-	return 1;
+ *out_size = membuffer_get_size(buf);
+ *out_buffer = membuffer_detach(buf);
+ membuffer_free(buf);
+ return 1;
 }
 
 static uint32_t modify_moov(mp4ff_t * f,const mp4ff_metadata_t * data,void ** out_buffer,uint32_t * out_size)
 {
-	uint64_t total_base = f->moov_offset + 8;
-	uint32_t total_size = (uint32_t)(f->moov_size - 8);
-
-	uint64_t udta_offset,meta_offset,ilst_offset;
-	uint32_t udta_size, meta_size, ilst_size;
-	
-	uint32_t new_ilst_size;
-	void * new_ilst_buffer;
-	
-	uint8_t * p_out;
-	int32_t size_delta;
-	
-	
-	if (!find_atom_v2(f,total_base,total_size,"udta",0,"meta"))
-	{
-		membuffer * buf;
-		void * new_udta_buffer;
-		uint32_t new_udta_size;
-		if (!create_udta(data,&new_udta_buffer,&new_udta_size)) return 0;
-		
-		buf = membuffer_create();
-		mp4ff_set_position(f,total_base);
-		membuffer_transfer_from_file(buf,f,total_size);
-		
-		membuffer_write_atom(buf,"udta",new_udta_size,new_udta_buffer);
-
-		free(new_udta_buffer);
-	
-		*out_size = membuffer_get_size(buf);
-		*out_buffer = membuffer_detach(buf);
-		membuffer_free(buf);
-		return 1;		
-	}
-	else
-	{
-		udta_offset = mp4ff_position(f);
-		udta_size = mp4ff_read_int32(f);
-		if (!find_atom_v2(f,udta_offset+8,udta_size-8,"meta",4,"ilst"))
-		{
-			membuffer * buf;
-			void * new_meta_buffer;
-			uint32_t new_meta_size;
-			if (!create_meta(data,&new_meta_buffer,&new_meta_size)) return 0;
-			
-			buf = membuffer_create();
-			mp4ff_set_position(f,total_base);
-			membuffer_transfer_from_file(buf,f,(uint32_t)(udta_offset - total_base));
-			
-			membuffer_write_int32(buf,udta_size + 8 + new_meta_size);
-			membuffer_write_atom_name(buf,"udta");
-			membuffer_transfer_from_file(buf,f,udta_size);
-						
-			membuffer_write_atom(buf,"meta",new_meta_size,new_meta_buffer);
-			free(new_meta_buffer);
-		
-			*out_size = membuffer_get_size(buf);
-			*out_buffer = membuffer_detach(buf);
-			membuffer_free(buf);
-			return 1;		
-		}
-		meta_offset = mp4ff_position(f);
-		meta_size = mp4ff_read_int32(f);
-		if (!find_atom(f,meta_offset+12,meta_size-12,"ilst")) return 0;//shouldn't happen, find_atom_v2 above takes care of it
-		ilst_offset = mp4ff_position(f);
-		ilst_size = mp4ff_read_int32(f);
-
-		if (!create_ilst(data,&new_ilst_buffer,&new_ilst_size)) return 0;
-		
-		size_delta = new_ilst_size - (ilst_size - 8);
-
-		*out_size = total_size + size_delta;
-		*out_buffer = malloc(*out_size);
-		if (*out_buffer == 0)
-		{
-			free(new_ilst_buffer);
-			return 0;
-		}
-
-		p_out = (uint8_t*)*out_buffer;
-		
-		mp4ff_set_position(f,total_base);
-		mp4ff_read_data(f,p_out,(uint32_t)(udta_offset - total_base )); p_out += (uint32_t)(udta_offset - total_base );
-		*(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
-		mp4ff_read_data(f,p_out,4); p_out += 4;
-		mp4ff_read_data(f,p_out,(uint32_t)(meta_offset - udta_offset - 8)); p_out += (uint32_t)(meta_offset - udta_offset - 8);
-		*(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
-		mp4ff_read_data(f,p_out,4); p_out += 4;
-		mp4ff_read_data(f,p_out,(uint32_t)(ilst_offset - meta_offset - 8)); p_out += (uint32_t)(ilst_offset - meta_offset - 8);
-		*(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
-		mp4ff_read_data(f,p_out,4); p_out += 4;
-
-		memcpy(p_out,new_ilst_buffer,new_ilst_size);
-		p_out += new_ilst_size;
-
-		mp4ff_set_position(f,ilst_offset + ilst_size);
-		mp4ff_read_data(f,p_out,(uint32_t)(total_size - (ilst_offset - total_base) - ilst_size));
-
-		free(new_ilst_buffer);
-	}
-	return 1;
+ uint64_t total_base = f->moov_offset + 8;
+ uint32_t total_size = (uint32_t)(f->moov_size - 8);
+
+ uint64_t udta_offset,meta_offset,ilst_offset;
+ uint32_t udta_size, meta_size, ilst_size;
+
+ uint32_t new_ilst_size;
+ void * new_ilst_buffer;
+
+ uint8_t * p_out;
+ int32_t size_delta;
+
+
+ if (!find_atom_v2(f,total_base,total_size,"udta",0,"meta"))
+ {
+ membuffer * buf;
+ void * new_udta_buffer;
+ uint32_t new_udta_size;
+ if (!create_udta(data,&new_udta_buffer,&new_udta_size)) return 0;
+
+ buf = membuffer_create();
+ mp4ff_set_position(f,total_base);
+ membuffer_transfer_from_file(buf,f,total_size);
+
+ membuffer_write_atom(buf,"udta",new_udta_size,new_udta_buffer);
+
+ free(new_udta_buffer);
+
+ *out_size = membuffer_get_size(buf);
+ *out_buffer = membuffer_detach(buf);
+ membuffer_free(buf);
+ return 1;
+ }
+ else
+ {
+ udta_offset = mp4ff_position(f);
+ udta_size = mp4ff_read_int32(f);
+ if (!find_atom_v2(f,udta_offset+8,udta_size-8,"meta",4,"ilst"))
+ {
+ membuffer * buf;
+ void * new_meta_buffer;
+ uint32_t new_meta_size;
+ if (!create_meta(data,&new_meta_buffer,&new_meta_size)) return 0;
+
+ buf = membuffer_create();
+ mp4ff_set_position(f,total_base);
+ membuffer_transfer_from_file(buf,f,(uint32_t)(udta_offset - total_base));
+
+ membuffer_write_int32(buf,udta_size + 8 + new_meta_size);
+ membuffer_write_atom_name(buf,"udta");
+ membuffer_transfer_from_file(buf,f,udta_size);
+
+ membuffer_write_atom(buf,"meta",new_meta_size,new_meta_buffer);
+ free(new_meta_buffer);
+
+ *out_size = membuffer_get_size(buf);
+ *out_buffer = membuffer_detach(buf);
+ membuffer_free(buf);
+ return 1;
+ }
+ meta_offset = mp4ff_position(f);
+ meta_size = mp4ff_read_int32(f);
+ if (!find_atom(f,meta_offset+12,meta_size-12,"ilst")) return 0;//shouldn't happen, find_atom_v2 above takes care of it
+ ilst_offset = mp4ff_position(f);
+ ilst_size = mp4ff_read_int32(f);
+
+ if (!create_ilst(data,&new_ilst_buffer,&new_ilst_size)) return 0;
+
+ size_delta = new_ilst_size - (ilst_size - 8);
+
+ *out_size = total_size + size_delta;
+ *out_buffer = malloc(*out_size);
+ if (*out_buffer == 0)
+ {
+ free(new_ilst_buffer);
+ return 0;
+ }
+
+ p_out = (uint8_t*)*out_buffer;
+
+ mp4ff_set_position(f,total_base);
+ mp4ff_read_data(f,p_out,(uint32_t)(udta_offset - total_base )); p_out += (uint32_t)(udta_offset - total_base );
+ *(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
+ mp4ff_read_data(f,p_out,4); p_out += 4;
+ mp4ff_read_data(f,p_out,(uint32_t)(meta_offset - udta_offset - 8)); p_out += (uint32_t)(meta_offset - udta_offset - 8);
+ *(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
+ mp4ff_read_data(f,p_out,4); p_out += 4;
+ mp4ff_read_data(f,p_out,(uint32_t)(ilst_offset - meta_offset - 8)); p_out += (uint32_t)(ilst_offset - meta_offset - 8);
+ *(uint32_t*)p_out = fix_byte_order_32(mp4ff_read_int32(f) + size_delta); p_out += 4;
+ mp4ff_read_data(f,p_out,4); p_out += 4;
+
+ memcpy(p_out,new_ilst_buffer,new_ilst_size);
+ p_out += new_ilst_size;
+
+ mp4ff_set_position(f,ilst_offset + ilst_size);
+ mp4ff_read_data(f,p_out,(uint32_t)(total_size - (ilst_offset - total_base) - ilst_size));
+
+ free(new_ilst_buffer);
+ }
+ return 1;
 
 }
 
 int32_t mp4ff_meta_update(mp4ff_callback_t *f,const mp4ff_metadata_t * data)
 {
-	void * new_moov_data;
-	uint32_t new_moov_size;
+ void * new_moov_data;
+ uint32_t new_moov_size;
 
 mp4ff_t *ff = malloc(sizeof(mp4ff_t));
 
 memset(ff, 0, sizeof(mp4ff_t));
 ff->stream = f;
-	mp4ff_set_position(ff,0);
+ mp4ff_set_position(ff,0);
 
 parse_atoms(ff,1);
 
 
-	if (!modify_moov(ff,data,&new_moov_data,&new_moov_size))
-	{
-		mp4ff_close(ff);
-		return 0;
-	}
+ if (!modify_moov(ff,data,&new_moov_data,&new_moov_size))
+ {
+ mp4ff_close(ff);
+ return 0;
+ }
 
 /* copy moov atom to end of the file */
 if (ff->last_atom != ATOM_MOOV)
@@ -635,23 +636,23 @@
 /* rename old moov to free */
 mp4ff_set_position(ff, ff->moov_offset + 4);
 mp4ff_write_data(ff, free_data, 4);
-	
+
 mp4ff_set_position(ff, ff->file_size);
-		mp4ff_write_int32(ff,new_moov_size + 8);
-		mp4ff_write_data(ff,"moov",4);
-		mp4ff_write_data(ff, new_moov_data, new_moov_size);
+ mp4ff_write_int32(ff,new_moov_size + 8);
+ mp4ff_write_data(ff,"moov",4);
+ mp4ff_write_data(ff, new_moov_data, new_moov_size);
 }
-	else
-	{
+ else
+ {
 mp4ff_set_position(ff, ff->moov_offset);
-		mp4ff_write_int32(ff,new_moov_size + 8);
-		mp4ff_write_data(ff,"moov",4);
-		mp4ff_write_data(ff, new_moov_data, new_moov_size);
-	}
+ mp4ff_write_int32(ff,new_moov_size + 8);
+ mp4ff_write_data(ff,"moov",4);
+ mp4ff_write_data(ff, new_moov_data, new_moov_size);
+ }
 
-	mp4ff_truncate(ff);
+ mp4ff_truncate(ff);
 
-	mp4ff_close(ff);
+ mp4ff_close(ff);
 return 1;
 }
 #endif

audacious-plugins-3.3.4.tar.bz2/src/aac/mp4ff/mp4util.c -> audacious-plugins-3.4.2.tar.bz2/src/aac/mp4ff/mp4util.c Changed

audacious-plugins-3.3.4.tar.bz2/src/adplug/adplug-xmms.cc -> audacious-plugins-3.4.2.tar.bz2/src/adplug/adplug-xmms.cc Changed

audacious-plugins-3.3.4.tar.bz2/src/adplug/core/adplug.cxx -> audacious-plugins-3.4.2.tar.bz2/src/adplug/core/adplug.cxx Changed

audacious-plugins-3.3.4.tar.bz2/src/adplug/core/amd.cxx -> audacious-plugins-3.4.2.tar.bz2/src/adplug/core/amd.cxx Changed

@@ -1,17 +1,17 @@
 /*
 * Adplug - Replayer for many OPL2/OPL3 audio file formats.
 * Copyright (C) 1999 - 2007 Simon Peter, <dn.tlp@gmx.net>, et al.
- * 
+ *
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * Lesser General Public License for more details.
- * 
+ *
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
@@ -69,7 +69,7 @@
 }
 
 // load section
- memset (inst, 0, sizeof (inst));
+ memset (inst, 0, 26 * sizeof (inst[0])); // memset (inst, 0, sizeof (inst));
 f->seek (0);
 f->readString (songname, sizeof (songname));
 f->readString (author, sizeof (author));

audacious-plugins-3.3.4.tar.bz2/src/adplug/core/mid.cxx -> audacious-plugins-3.4.2.tar.bz2/src/adplug/core/mid.cxx Changed

audacious-plugins-3.3.4.tar.bz2/src/adplug/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/adplug/plugin.c Changed

audacious-plugins-3.3.4.tar.bz2/src/alarm/alarm.c -> audacious-plugins-3.4.2.tar.bz2/src/alarm/alarm.c Changed

@@ -18,12 +18,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-/*
- * xmms-alarm.c - a XMMS plugin which allows you to set a time for it to
- * start playing a playlist with the volume fading up and more things
- * the next time I get bored
- */
-
 #include <stdlib.h>
 
 #include <time.h>
@@ -48,7 +42,6 @@
 #include <libaudgui/libaudgui-gtk.h>
 
 #include "alarm.h"
-#include "config.h"
 #include "interface.h"
 #include "callbacks.h"
 
@@ -89,7 +82,8 @@
 "sat_m", "30",
 NULL};
 
-typedef struct {
+typedef struct
+{
 pthread_t tid;
 volatile gboolean is_valid;
 } alarm_thread_t;
@@ -104,50 +98,50 @@
 
 /* string tokens to allow loops and shorten code */
 static char day_cb[7][7] = {"sun_cb", "mon_cb", "tue_cb",
- "wed_cb", "thu_cb", "fri_cb", "sat_cb"};
+ "wed_cb", "thu_cb", "fri_cb", "sat_cb"};
 
 static char day_flags[7][10] = {"sun_flags", "mon_flags", "tue_flags",
- "wed_flags", "thu_flags", "fri_flags", "sat_flags"};
+ "wed_flags", "thu_flags", "fri_flags", "sat_flags"};
 
 static char day_h[7][6] = {"sun_h", "mon_h", "tue_h",
- "wed_h", "thu_h", "fri_h", "sat_h"};
+ "wed_h", "thu_h", "fri_h", "sat_h"};
 
 static char day_m[7][6] = {"sun_m", "mon_m", "tue_m",
- "wed_m", "thu_m", "fri_m", "sat_m"};
+ "wed_m", "thu_m", "fri_m", "sat_m"};
 
 static char day_def[7][8] = {"sun_def", "mon_def", "tue_def",
- "wed_def", "thu_def", "fri_def", "sat_def"};
+ "wed_def", "thu_def", "fri_def", "sat_def"};
 
 static struct
 {
- GtkSpinButton *alarm_h;
- GtkSpinButton *alarm_m;
+ GtkSpinButton *alarm_h;
+ GtkSpinButton *alarm_m;
 
- GtkToggleButton *stop_on;
- GtkSpinButton *stop_h;
- GtkSpinButton *stop_m;
+ GtkToggleButton *stop_on;
+ GtkSpinButton *stop_h;
+ GtkSpinButton *stop_m;
 
- GtkRange *volume;
- GtkRange *quietvol;
+ GtkRange *volume;
+ GtkRange *quietvol;
 
- GtkSpinButton *fading;
+ GtkSpinButton *fading;
 
- GtkEntry *cmdstr;
- GtkToggleButton *cmd_on;
+ GtkEntry *cmdstr;
+ GtkToggleButton *cmd_on;
 
- GtkEntry *playlist;
+ GtkEntry *playlist;
 
- int default_hour;
- int default_min;
+ int default_hour;
+ int default_min;
 
- // array allows looping of days
- alarmday day[7];
+ // array allows looping of days
+ alarmday day[7];
 
 
- GtkEntry *reminder;
- GtkToggleButton *reminder_cb;
- gchar *reminder_msg;
- gboolean reminder_on;
+ GtkEntry *reminder;
+ GtkToggleButton *reminder_cb;
+ gchar *reminder_msg;
+ gboolean reminder_on;
 }
 alarm_conf;
 
@@ -170,88 +164,88 @@
 
 static GtkWidget *lookup_widget(GtkWidget *w, const gchar *name)
 {
- GtkWidget * widget = g_object_get_data ((GObject *) w, name);
- g_return_val_if_fail(widget != NULL, NULL);
+ GtkWidget * widget = g_object_get_data ((GObject *) w, name);
+ g_return_val_if_fail(widget != NULL, NULL);
 
- return widget;
+ return widget;
 }
 
 /*
 * the callback function that is called when the save button is
 * pressed saves configuration to ~/.bmp/alarmconfig
 */
-void alarm_save(GtkButton *w, gpointer data)
+void alarm_save(void)
 {
- int daynum = 0; // used to identify day number
-
- /*
- * update the live values and write them out
- */
- alarm_h = alarm_conf.default_hour = gtk_spin_button_get_value_as_int (alarm_conf.alarm_h);
- aud_set_int ("alarm", "alarm_h", alarm_h);
-
- alarm_m = alarm_conf.default_min = gtk_spin_button_get_value_as_int (alarm_conf.alarm_m);
- aud_set_int ("alarm", "alarm_m", alarm_m);
-
- stop_h = gtk_spin_button_get_value_as_int (alarm_conf.stop_h);
- stop_m = gtk_spin_button_get_value_as_int (alarm_conf.stop_m);
- stop_on = gtk_toggle_button_get_active (alarm_conf.stop_on);
-
- /* days of the week */
- for(; daynum < 7; daynum++)
- {
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(alarm_conf.day[daynum].cb)))
- alarm_conf.day[daynum].flags = 0;
- else
- alarm_conf.day[daynum].flags = ALARM_OFF;
-
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(alarm_conf.day[daynum].cb_def)))
- alarm_conf.day[daynum].flags |= ALARM_DEFAULT;
-
- alarm_conf.day[daynum].hour =
- gtk_spin_button_get_value_as_int(alarm_conf.day[daynum].spin_hr);
- alarm_conf.day[daynum].min =
- gtk_spin_button_get_value_as_int(alarm_conf.day[daynum].spin_min);
-
- aud_set_int ("alarm", day_flags[daynum], alarm_conf.day[daynum].flags);
- aud_set_int ("alarm", day_h[daynum], alarm_conf.day[daynum].hour);
- aud_set_int ("alarm", day_m[daynum], alarm_conf.day[daynum].min);
- }
+ int daynum = 0; // used to identify day number
 
- /* END: days of week */
+ /*
+ * update the live values and write them out
+ */
+ alarm_h = alarm_conf.default_hour = gtk_spin_button_get_value_as_int (alarm_conf.alarm_h);
+ aud_set_int ("alarm", "alarm_h", alarm_h);
+
+ alarm_m = alarm_conf.default_min = gtk_spin_button_get_value_as_int (alarm_conf.alarm_m);
+ aud_set_int ("alarm", "alarm_m", alarm_m);
+
+ stop_h = gtk_spin_button_get_value_as_int (alarm_conf.stop_h);
+ stop_m = gtk_spin_button_get_value_as_int (alarm_conf.stop_m);
+ stop_on = gtk_toggle_button_get_active (alarm_conf.stop_on);
 
- volume = gtk_range_get_value (alarm_conf.volume);
- aud_set_int ("alarm", "volume", volume);
+ /* days of the week */
+ for(; daynum < 7; daynum++)
+ {
+ if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(alarm_conf.day[daynum].cb)))
+ alarm_conf.day[daynum].flags = 0;
+ else
+ alarm_conf.day[daynum].flags = ALARM_OFF;
 
- quietvol = gtk_range_get_value (alarm_conf.quietvol);
- aud_set_int ("alarm", "quietvol", quietvol);
+ if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(alarm_conf.day[daynum].cb_def)))
+ alarm_conf.day[daynum].flags |= ALARM_DEFAULT;
 
- fading = gtk_spin_button_get_value_as_int (alarm_conf.fading);
+ alarm_conf.day[daynum].hour =
+ gtk_spin_button_get_value_as_int(alarm_conf.day[daynum].spin_hr);
+ alarm_conf.day[daynum].min =
+ gtk_spin_button_get_value_as_int(alarm_conf.day[daynum].spin_min);
 
- /* write the new values */
- aud_set_int ("alarm", "stop_h", stop_h);
- aud_set_int ("alarm", "stop_m", stop_m);
- aud_set_int ("alarm", "fading", fading);
- aud_set_bool ("alarm", "stop_on", stop_on);
+ aud_set_int ("alarm", day_flags[daynum], alarm_conf.day[daynum].flags);
+ aud_set_int ("alarm", day_h[daynum], alarm_conf.day[daynum].hour);
+ aud_set_int ("alarm", day_m[daynum], alarm_conf.day[daynum].min);
+ }
 
- g_free (cmdstr);
- cmdstr = gtk_editable_get_chars ((GtkEditable *) alarm_conf.cmdstr, 0, -1);
- aud_set_string ("alarm", "cmdstr", cmdstr);
+ /* END: days of week */
 
- cmd_on = gtk_toggle_button_get_active (alarm_conf.cmd_on);
- aud_set_bool ("alarm", "cmd_on", cmd_on);
+ volume = gtk_range_get_value (alarm_conf.volume);
+ aud_set_int ("alarm", "volume", volume);
 
- g_free (playlist);
- playlist = gtk_editable_get_chars ((GtkEditable *) alarm_conf.playlist, 0, -1);
- aud_set_string ("alarm", "playlist", playlist);
+ quietvol = gtk_range_get_value (alarm_conf.quietvol);
+ aud_set_int ("alarm", "quietvol", quietvol);
 
- /* reminder */
- g_free (alarm_conf.reminder_msg);
- alarm_conf.reminder_msg = gtk_editable_get_chars ((GtkEditable *) alarm_conf.reminder, 0, -1);
- aud_set_string ("alarm", "reminder_msg", alarm_conf.reminder_msg);
+ fading = gtk_spin_button_get_value_as_int (alarm_conf.fading);
 
- alarm_conf.reminder_on = gtk_toggle_button_get_active (alarm_conf.reminder_cb);
- aud_set_bool ("alarm", "reminder_on", alarm_conf.reminder_on);
+ /* write the new values */
+ aud_set_int ("alarm", "stop_h", stop_h);
+ aud_set_int ("alarm", "stop_m", stop_m);
+ aud_set_int ("alarm", "fading", fading);
+ aud_set_bool ("alarm", "stop_on", stop_on);
+
+ g_free (cmdstr);
+ cmdstr = gtk_editable_get_chars ((GtkEditable *) alarm_conf.cmdstr, 0, -1);
+ aud_set_string ("alarm", "cmdstr", cmdstr);
+
+ cmd_on = gtk_toggle_button_get_active (alarm_conf.cmd_on);
+ aud_set_bool ("alarm", "cmd_on", cmd_on);
+
+ g_free (playlist);
+ playlist = gtk_editable_get_chars ((GtkEditable *) alarm_conf.playlist, 0, -1);
+ aud_set_string ("alarm", "playlist", playlist);
+
+ /* reminder */
+ g_free (alarm_conf.reminder_msg);
+ alarm_conf.reminder_msg = gtk_editable_get_chars ((GtkEditable *) alarm_conf.reminder, 0, -1);
+ aud_set_string ("alarm", "reminder_msg", alarm_conf.reminder_msg);
+
+ alarm_conf.reminder_on = gtk_toggle_button_get_active (alarm_conf.reminder_cb);
+ aud_set_bool ("alarm", "reminder_on", alarm_conf.reminder_on);
 }
 
 /*
@@ -259,47 +253,47 @@
 */
 static void alarm_read_config(void)
 {
- int daynum = 0; // used for day number
+ int daynum = 0; // used for day number
 
- aud_config_set_defaults ("alarm", alarm_defaults);
+ aud_config_set_defaults ("alarm", alarm_defaults);
 
- alarm_h = aud_get_int ("alarm", "alarm_h");
- alarm_m = aud_get_int ("alarm", "alarm_m");
+ alarm_h = aud_get_int ("alarm", "alarm_h");
+ alarm_m = aud_get_int ("alarm", "alarm_m");
 
- /* save them here too */
- alarm_conf.default_hour = alarm_h;
- alarm_conf.default_min = alarm_m;
+ /* save them here too */
+ alarm_conf.default_hour = alarm_h;
+ alarm_conf.default_min = alarm_m;
 
- stop_h = aud_get_int ("alarm", "stop_h");
- stop_m = aud_get_int ("alarm", "stop_m");
- stop_on = aud_get_bool ("alarm", "stop_on");
+ stop_h = aud_get_int ("alarm", "stop_h");
+ stop_m = aud_get_int ("alarm", "stop_m");
+ stop_on = aud_get_bool ("alarm", "stop_on");
 
- volume = aud_get_int ("alarm", "volume");
- quietvol = aud_get_int ("alarm", "quietvol");
+ volume = aud_get_int ("alarm", "volume");
+ quietvol = aud_get_int ("alarm", "quietvol");
 
- fading = aud_get_int ("alarm", "fading");
+ fading = aud_get_int ("alarm", "fading");
 
- g_free (cmdstr);
- cmdstr = aud_get_string ("alarm", "cmdstr");
- cmd_on = aud_get_bool ("alarm", "cmd_on");
+ g_free (cmdstr);
+ cmdstr = aud_get_string ("alarm", "cmdstr");
+ cmd_on = aud_get_bool ("alarm", "cmd_on");
 
- g_free (playlist);
- playlist = aud_get_string ("alarm", "playlist");
+ g_free (playlist);
+ playlist = aud_get_string ("alarm", "playlist");
 
- g_free (alarm_conf.reminder_msg);
- alarm_conf.reminder_msg = aud_get_string ("alarm", "reminder_msg");
- alarm_conf.reminder_on = aud_get_bool ("alarm", "reminder_on");
+ g_free (alarm_conf.reminder_msg);
+ alarm_conf.reminder_msg = aud_get_string ("alarm", "reminder_msg");
+ alarm_conf.reminder_on = aud_get_bool ("alarm", "reminder_on");
 
- /* day flags and times */
- for(; daynum < 7; daynum++)
- {
- /* read the flags */
- alarm_conf.day[daynum].flags = aud_get_int ("alarm", day_flags[daynum]);
+ /* day flags and times */
+ for(; daynum < 7; daynum++)
+ {
+ /* read the flags */
+ alarm_conf.day[daynum].flags = aud_get_int ("alarm", day_flags[daynum]);
 
- /* read the times */
- alarm_conf.day[daynum].hour = aud_get_int ("alarm", day_h[daynum]);
- alarm_conf.day[daynum].min = aud_get_int ("alarm", day_m[daynum]);
- }
+ /* read the times */
+ alarm_conf.day[daynum].hour = aud_get_int ("alarm", day_h[daynum]);
+ alarm_conf.day[daynum].min = aud_get_int ("alarm", day_m[daynum]);
+ }
 }
 
 /*
@@ -307,227 +301,219 @@
 */
 static void alarm_configure(void)
 {
- int daynum = 0; // used to loop days
- GtkWidget *w;
-
- if (config_dialog)
- {
- gtk_window_present(GTK_WINDOW(config_dialog));
- return;
- }
-
- alarm_read_config();
-
- /*
- * Create the widgets
- */
- config_dialog = create_config_dialog();
-
- w = lookup_widget(config_dialog, "alarm_h_spin");
- alarm_conf.alarm_h = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.alarm_h, alarm_h);
-
- w = lookup_widget(config_dialog, "alarm_m_spin");
- alarm_conf.alarm_m = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.alarm_m, alarm_m);
-
- w = lookup_widget(config_dialog, "stop_h_spin");
- alarm_conf.stop_h = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.stop_h, stop_h);
-
- w = lookup_widget(config_dialog, "stop_m_spin");
- alarm_conf.stop_m = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.stop_m, stop_m);
-
- w = lookup_widget(config_dialog, "stop_checkb");
- alarm_conf.stop_on = GTK_TOGGLE_BUTTON(w);
- gtk_toggle_button_set_active(alarm_conf.stop_on, stop_on);
-
- w = lookup_widget(config_dialog, "vol_scale");
- alarm_conf.volume = GTK_RANGE(w);
- gtk_range_set_adjustment(alarm_conf.volume,
- GTK_ADJUSTMENT(gtk_adjustment_new(volume,
- 0,
- 100, 1,
- 5, 0)));
-
- w = lookup_widget(config_dialog, "quiet_vol_scale");
- alarm_conf.quietvol = GTK_RANGE(w);
- gtk_range_set_adjustment(alarm_conf.quietvol,
- GTK_ADJUSTMENT(gtk_adjustment_new(quietvol,
- 0,
- 100, 1,
- 5, 0)));
-
- /* days of week */
- for(; daynum < 7; daynum++)
- {
- w = lookup_widget(config_dialog, day_cb[daynum]);
- alarm_conf.day[daynum].cb = GTK_CHECK_BUTTON(w);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alarm_conf.day[daynum].cb),
- !(alarm_conf.day[daynum].flags & ALARM_OFF));
-
- w = lookup_widget(config_dialog, day_def[daynum]);
- alarm_conf.day[daynum].cb_def = GTK_CHECK_BUTTON(w);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alarm_conf.day[daynum].cb_def),
+ int daynum = 0; // used to loop days
+ GtkWidget *w;
+
+ if (config_dialog)
+ {
+ gtk_window_present(GTK_WINDOW(config_dialog));
+ return;
+ }
+
+ alarm_read_config();
+
+ /*
+ * Create the widgets
+ */
+ config_dialog = create_config_dialog();
+
+ w = lookup_widget(config_dialog, "alarm_h_spin");
+ alarm_conf.alarm_h = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.alarm_h, alarm_h);
+
+ w = lookup_widget(config_dialog, "alarm_m_spin");
+ alarm_conf.alarm_m = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.alarm_m, alarm_m);
+
+ w = lookup_widget(config_dialog, "stop_h_spin");
+ alarm_conf.stop_h = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.stop_h, stop_h);
+
+ w = lookup_widget(config_dialog, "stop_m_spin");
+ alarm_conf.stop_m = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.stop_m, stop_m);
+
+ w = lookup_widget(config_dialog, "stop_checkb");
+ alarm_conf.stop_on = GTK_TOGGLE_BUTTON(w);
+ gtk_toggle_button_set_active(alarm_conf.stop_on, stop_on);
+
+ w = lookup_widget(config_dialog, "vol_scale");
+ alarm_conf.volume = GTK_RANGE(w);
+ gtk_range_set_adjustment(alarm_conf.volume,
+ GTK_ADJUSTMENT(gtk_adjustment_new(volume, 0, 100, 1, 5, 0)));
+
+ w = lookup_widget(config_dialog, "quiet_vol_scale");
+ alarm_conf.quietvol = GTK_RANGE(w);
+ gtk_range_set_adjustment(alarm_conf.quietvol,
+ GTK_ADJUSTMENT(gtk_adjustment_new(quietvol, 0, 100, 1, 5, 0)));
+
+ /* days of week */
+ for(; daynum < 7; daynum++)
+ {
+ w = lookup_widget(config_dialog, day_cb[daynum]);
+ alarm_conf.day[daynum].cb = GTK_CHECK_BUTTON(w);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alarm_conf.day[daynum].cb),
+ !(alarm_conf.day[daynum].flags & ALARM_OFF));
+
+ w = lookup_widget(config_dialog, day_def[daynum]);
+ alarm_conf.day[daynum].cb_def = GTK_CHECK_BUTTON(w);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alarm_conf.day[daynum].cb_def),
 alarm_conf.day[daynum].flags & ALARM_DEFAULT);
 
 
- /* Changed to show default time instead of set time when ALARM_DEFAULT set,
- * as suggested by Mark Brown
- */
-/* w = lookup_widget(config_dialog, day_h[daynum]);
- alarm_conf.day[daynum].spin_hr = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.day[daynum].spin_hr, alarm_conf.day[daynum].hour);
+ /* Changed to show default time instead of set time when ALARM_DEFAULT set,
+ * as suggested by Mark Brown
+ */
+/* w = lookup_widget(config_dialog, day_h[daynum]);
+ alarm_conf.day[daynum].spin_hr = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.day[daynum].spin_hr, alarm_conf.day[daynum].hour);
 
- w = lookup_widget(config_dialog, day_m[daynum]);
- alarm_conf.day[daynum].spin_min = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.day[daynum].spin_min, alarm_conf.day[daynum].min);
+ w = lookup_widget(config_dialog, day_m[daynum]);
+ alarm_conf.day[daynum].spin_min = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.day[daynum].spin_min, alarm_conf.day[daynum].min);
 */
- if(alarm_conf.day[daynum].flags & ALARM_DEFAULT)
- {
- w = lookup_widget(config_dialog, day_h[daynum]);
- alarm_conf.day[daynum].spin_hr = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.day[daynum].spin_hr, alarm_conf.default_hour);
-
- w = lookup_widget(config_dialog, day_m[daynum]);
- alarm_conf.day[daynum].spin_min = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.day[daynum].spin_min, alarm_conf.default_min);
-
- gtk_widget_set_sensitive((GtkWidget *)alarm_conf.day[daynum].spin_hr, FALSE);
- gtk_widget_set_sensitive((GtkWidget *)alarm_conf.day[daynum].spin_min, FALSE);
- }
- else
- {
- w = lookup_widget(config_dialog, day_h[daynum]);
- alarm_conf.day[daynum].spin_hr = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.day[daynum].spin_hr, alarm_conf.day[daynum].hour);
-
- w = lookup_widget(config_dialog, day_m[daynum]);
- alarm_conf.day[daynum].spin_min = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.day[daynum].spin_min, alarm_conf.day[daynum].min);
-
- gtk_widget_set_sensitive((GtkWidget *)alarm_conf.day[daynum].spin_hr, TRUE);
- gtk_widget_set_sensitive((GtkWidget *)alarm_conf.day[daynum].spin_min, TRUE);
- }
- }
+ if(alarm_conf.day[daynum].flags & ALARM_DEFAULT)
+ {
+ w = lookup_widget(config_dialog, day_h[daynum]);
+ alarm_conf.day[daynum].spin_hr = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.day[daynum].spin_hr, alarm_conf.default_hour);
+
+ w = lookup_widget(config_dialog, day_m[daynum]);
+ alarm_conf.day[daynum].spin_min = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.day[daynum].spin_min, alarm_conf.default_min);
+
+ gtk_widget_set_sensitive((GtkWidget *)alarm_conf.day[daynum].spin_hr, FALSE);
+ gtk_widget_set_sensitive((GtkWidget *)alarm_conf.day[daynum].spin_min, FALSE);
+ }
+ else
+ {
+ w = lookup_widget(config_dialog, day_h[daynum]);
+ alarm_conf.day[daynum].spin_hr = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.day[daynum].spin_hr, alarm_conf.day[daynum].hour);
+
+ w = lookup_widget(config_dialog, day_m[daynum]);
+ alarm_conf.day[daynum].spin_min = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.day[daynum].spin_min, alarm_conf.day[daynum].min);
+
+ gtk_widget_set_sensitive((GtkWidget *)alarm_conf.day[daynum].spin_hr, TRUE);
+ gtk_widget_set_sensitive((GtkWidget *)alarm_conf.day[daynum].spin_min, TRUE);
+ }
+ }
 
 /* END: days of week */
 
- w = lookup_widget(config_dialog,"fading_spin");
- alarm_conf.fading = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.fading, fading);
-
- w = lookup_widget(config_dialog, "cmd_entry");
- alarm_conf.cmdstr = GTK_ENTRY(w);
- gtk_entry_set_text(alarm_conf.cmdstr, cmdstr);
+ w = lookup_widget(config_dialog,"fading_spin");
+ alarm_conf.fading = GTK_SPIN_BUTTON(w);
+ gtk_spin_button_set_value(alarm_conf.fading, fading);
 
- w = lookup_widget(config_dialog, "cmd_checkb");
- alarm_conf.cmd_on = GTK_TOGGLE_BUTTON(w);
- gtk_toggle_button_set_active(alarm_conf.cmd_on, cmd_on);
+ w = lookup_widget(config_dialog, "cmd_entry");
+ alarm_conf.cmdstr = GTK_ENTRY(w);
+ gtk_entry_set_text(alarm_conf.cmdstr, cmdstr);
 
- w = lookup_widget(config_dialog, "playlist");
- alarm_conf.playlist = GTK_ENTRY(w);
- gtk_entry_set_text(alarm_conf.playlist, playlist);
+ w = lookup_widget(config_dialog, "cmd_checkb");
+ alarm_conf.cmd_on = GTK_TOGGLE_BUTTON(w);
+ gtk_toggle_button_set_active(alarm_conf.cmd_on, cmd_on);
 
- w = lookup_widget(config_dialog, "reminder_text");
- alarm_conf.reminder = GTK_ENTRY(w);
- gtk_entry_set_text(alarm_conf.reminder, alarm_conf.reminder_msg);
+ w = lookup_widget(config_dialog, "playlist");
+ alarm_conf.playlist = GTK_ENTRY(w);
+ gtk_entry_set_text(alarm_conf.playlist, playlist);
 
- w = lookup_widget(config_dialog, "reminder_cb");
- alarm_conf.reminder_cb = GTK_TOGGLE_BUTTON(w);
- gtk_toggle_button_set_active(alarm_conf.reminder_cb, alarm_conf.reminder_on);
+ w = lookup_widget(config_dialog, "reminder_text");
+ alarm_conf.reminder = GTK_ENTRY(w);
+ gtk_entry_set_text(alarm_conf.reminder, alarm_conf.reminder_msg);
 
- g_signal_connect (config_dialog, "destroy", (GCallback) gtk_widget_destroyed,
- & config_dialog);
+ w = lookup_widget(config_dialog, "reminder_cb");
+ alarm_conf.reminder_cb = GTK_TOGGLE_BUTTON(w);
+ gtk_toggle_button_set_active(alarm_conf.reminder_cb, alarm_conf.reminder_on);
 
- gtk_widget_show_all(config_dialog);
+ g_signal_connect (config_dialog, "destroy", (GCallback) gtk_widget_destroyed,
+ & config_dialog);
 
- AUDDBG("END alarm_configure\n");
+ AUDDBG("END alarm_configure\n");
 }
 
 /* functions for greying out the time for days */
 void on_day_def_toggled(GtkToggleButton *togglebutton, gpointer user_data, int daynum)
 {
- GtkWidget *w;
-
- /* change the time shown too */
- w = lookup_widget(config_dialog, day_h[daynum]);
- if(w == NULL)
- return;
-
- if(gtk_toggle_button_get_active(togglebutton) == TRUE)
- {
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), alarm_conf.default_hour);
- gtk_widget_set_sensitive(w, FALSE);
- }
- else
- {
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), alarm_conf.day[daynum].hour);
- gtk_widget_set_sensitive(w, TRUE);
- }
-
- w = lookup_widget(config_dialog, day_m[daynum]);
- if(gtk_toggle_button_get_active(togglebutton) == TRUE)
- {
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), alarm_conf.default_min);
- gtk_widget_set_sensitive(w, FALSE);
- }
- else
- {
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), alarm_conf.day[daynum].min);
- gtk_widget_set_sensitive(w, TRUE);
- }
+ GtkWidget *w;
+
+ /* change the time shown too */
+ w = lookup_widget(config_dialog, day_h[daynum]);
+ if(w == NULL)
+ return;
+
+ if(gtk_toggle_button_get_active(togglebutton) == TRUE)
+ {
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), alarm_conf.default_hour);
+ gtk_widget_set_sensitive(w, FALSE);
+ }
+ else
+ {
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), alarm_conf.day[daynum].hour);
+ gtk_widget_set_sensitive(w, TRUE);
+ }
+
+ w = lookup_widget(config_dialog, day_m[daynum]);
+ if(gtk_toggle_button_get_active(togglebutton) == TRUE)
+ {
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), alarm_conf.default_min);
+ gtk_widget_set_sensitive(w, FALSE);
+ }
+ else
+ {
+ gtk_spin_button_set_value(GTK_SPIN_BUTTON(w), alarm_conf.day[daynum].min);
+ gtk_widget_set_sensitive(w, TRUE);
+ }
 }
 
 void on_sun_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- on_day_def_toggled(togglebutton, user_data, 0);
+ on_day_def_toggled(togglebutton, user_data, 0);
 }
 
 void on_mon_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- on_day_def_toggled(togglebutton, user_data, 1);
+ on_day_def_toggled(togglebutton, user_data, 1);
 }
 
 void on_tue_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- on_day_def_toggled(togglebutton, user_data, 2);
+ on_day_def_toggled(togglebutton, user_data, 2);
 }
 
 void on_wed_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- on_day_def_toggled(togglebutton, user_data, 3);
+ on_day_def_toggled(togglebutton, user_data, 3);
 }
 
 void on_thu_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- on_day_def_toggled(togglebutton, user_data, 4);
+ on_day_def_toggled(togglebutton, user_data, 4);
 }
 
 void on_fri_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- on_day_def_toggled(togglebutton, user_data, 5);
+ on_day_def_toggled(togglebutton, user_data, 5);
 }
 
 void on_sat_def_toggled(GtkToggleButton *togglebutton, gpointer user_data)
 {
- on_day_def_toggled(togglebutton, user_data, 6);
+ on_day_def_toggled(togglebutton, user_data, 6);
 }
 
 /* END: greying things */
 
 void alarm_current_volume(GtkButton *button, gpointer data)
 {
- gint vol;
- GtkAdjustment *adj;
+ gint vol;
+ GtkAdjustment *adj;
 
- AUDDBG("on_current_button_clicked\n");
+ AUDDBG("on_current_button_clicked\n");
 
- aud_drct_get_volume_main(&vol);
+ aud_drct_get_volume_main(&vol);
 
- adj = gtk_range_get_adjustment(alarm_conf.volume);
- gtk_adjustment_set_value(adj, (gfloat)vol);
+ adj = gtk_range_get_adjustment(alarm_conf.volume);
+ gtk_adjustment_set_value(adj, (gfloat)vol);
 }
 
 /*
@@ -536,252 +522,243 @@
 */
 static void threadsleep(float x)
 {
- AUDDBG("threadsleep: waiting %f seconds\n", x);
+ AUDDBG("threadsleep: waiting %f seconds\n", x);
 
- g_usleep((int) ((float) x * (float) 1000000.0));
+ g_usleep((int) ((float) x * (float) 1000000.0));
 
- return;
+ return;
 }
 
 static inline alarm_thread_t alarm_thread_create(void *(*start_routine)(void *), void *args, unsigned int detach)
 {
- alarm_thread_t thrd;
- pthread_attr_t attr;
+ alarm_thread_t thrd;
+ pthread_attr_t attr;
 
- pthread_attr_init(&attr);
+ pthread_attr_init(&attr);
 
- if(detach != 0)
- pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+ if(detach != 0)
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 
- pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
- pthread_attr_setschedpolicy(&attr, SCHED_OTHER);
- pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
+ pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
+ pthread_attr_setschedpolicy(&attr, SCHED_OTHER);
+ pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
 
- thrd.is_valid = (pthread_create(&thrd.tid, &attr, start_routine, args) == 0);
+ thrd.is_valid = (pthread_create(&thrd.tid, &attr, start_routine, args) == 0);
 
- return thrd;
+ return thrd;
 }
 
 static void *alarm_fade(void *arg)
 {
- fader *vols = (fader *)arg;
- guint i;
- gint v;
- gint inc, diff, adiff;
-
- /* lock */
- pthread_mutex_lock(&fader_lock);
-
- /* slide volume */
- /* the Kaspar Giger way of fading, check the current mixer volume and
- * increment from there so that if you have some other app lowering the
- * volume at the same time xmms-alarm will not ignore it. If you have some
- * other app increasing the volume, then it could get louder that you expect
- * though - because the loop does not recalculate the difference each time.
- */
-
- /* difference between the 2 volumes */
- diff = vols->end - vols->start;
- adiff = abs(diff);
-
- /* Are we going up or down? */
- if(diff < 0)
- inc = -1;
- else
- inc = 1;
-
- aud_drct_set_volume_main((gint)vols->start);
- //for(i=0;i<(vols->end - vols->start);i++)
- for(i=0;i<adiff;i++)
- {
- //threadsleep((gfloat)fading / (vols->end - vols->start));
- threadsleep((gfloat)fading / (gfloat)adiff);
- aud_drct_get_volume_main(&v);
- aud_drct_set_volume_main(v + inc);
- }
- /* Setting the volume to the end volume sort of defeats the point if having
- * the code in there to allow other apps to control volume too :)
- */
- //aud_drct_set_volume_main((gint)vols->end);
-
- /* and */
- pthread_mutex_unlock(&fader_lock);
-
- AUDDBG("volume = %f%%\n", (gdouble)vols->end);
- return(0);
+ fader *vols = (fader *)arg;
+ guint i;
+ gint v;
+ gint inc, diff, adiff;
+
+ /* lock */
+ pthread_mutex_lock(&fader_lock);
+
+ /* slide volume */
+ /* the Kaspar Giger way of fading, check the current mixer volume and
+ * increment from there so that if you have some other app lowering the
+ * volume at the same time, the alarm plugin will not ignore it. If you have
+ * some other app increasing the volume, then it could get louder than you expect
+ * though - because the loop does not recalculate the difference each time.
+ */
+
+ /* difference between the 2 volumes */
+ diff = vols->end - vols->start;
+ adiff = abs(diff);
+
+ /* Are we going up or down? */
+ if(diff < 0)
+ inc = -1;
+ else
+ inc = 1;
+
+ aud_drct_set_volume_main((gint)vols->start);
+ //for(i=0;i<(vols->end - vols->start);i++)
+ for(i=0;i<adiff;i++)
+ {
+ //threadsleep((gfloat)fading / (vols->end - vols->start));
+ threadsleep((gfloat)fading / (gfloat)adiff);
+ aud_drct_get_volume_main(&v);
+ aud_drct_set_volume_main(v + inc);
+ }
+ /* Setting the volume to the end volume sort of defeats the point if having
+ * the code in there to allow other apps to control volume too :)
+ */
+ //aud_drct_set_volume_main((gint)vols->end);
+
+ /* and */
+ pthread_mutex_unlock(&fader_lock);
+
+ AUDDBG("volume = %f%%\n", (gdouble)vols->end);
+ return 0;
 }
 
-static void *alarm_stop_thread( void *args )
+static void *alarm_stop_thread(void *args)
 {
- gint currvol;
- fader fade_vols;
- alarm_thread_t f;
+ gint currvol;
+ fader fade_vols;
+ alarm_thread_t f;
 
- AUDDBG("alarm_stop_thread\n");
+ AUDDBG("alarm_stop_thread\n");
 
 
- /* sleep for however long we are meant to be sleeping for until
- * its time to shut up
- */
- threadsleep(((stop_h * 60) + stop_m) * 60);
+ /* sleep for however long we are meant to be sleeping for until
+ * its time to shut up
+ */
+ threadsleep(((stop_h * 60) + stop_m) * 60);
 
- AUDDBG("alarm_stop triggered\n");
+ AUDDBG("alarm_stop triggered\n");
 
- if (alarm_dialog)
- gtk_widget_destroy(alarm_dialog);
+ if (alarm_dialog)
+ gtk_widget_destroy(alarm_dialog);
 
- aud_drct_get_volume_main(&currvol),
+ aud_drct_get_volume_main(&currvol),
 
- /* fade back to zero */
- fade_vols.start = currvol;
- fade_vols.end = 0;
+ /* fade back to zero */
+ fade_vols.start = currvol;
+ fade_vols.end = 0;
 
- /* The fader thread locks the fader_mutex now */
- f = alarm_thread_create(alarm_fade, &fade_vols, 0);
+ /* The fader thread locks the fader_mutex now */
+ f = alarm_thread_create(alarm_fade, &fade_vols, 0);
 
- pthread_join(f.tid, NULL);
- aud_drct_stop();
+ pthread_join(f.tid, NULL);
+ aud_drct_stop();
 
- /* might as well set the volume to something higher than zero so we
- * dont confuse the poor people who just woke up and cant work out why
- * theres no music playing when they press the little play button :)
- */
- aud_drct_set_volume_main(currvol);
+ /* might as well set the volume to something higher than zero so we
+ * dont confuse the poor people who just woke up and cant work out why
+ * theres no music playing when they press the little play button :)
+ */
+ aud_drct_set_volume_main(currvol);
 
- AUDDBG("alarm_stop done\n");
- return(NULL);
+ AUDDBG("alarm_stop done\n");
+ return(NULL);
 }
 
-void alarm_stop_cancel(GtkButton *w, gpointer data)
+void alarm_stop_cancel(GtkWidget *w, gpointer data)
 {
- AUDDBG("alarm_stop_cancel\n");
- if (pthread_cancel(stop.tid) == 0) {
- stop.is_valid = FALSE;
- }
+ AUDDBG("alarm_stop_cancel\n");
+ if (pthread_cancel(stop.tid) == 0)
+ stop.is_valid = FALSE;
 }
 
 /* the main alarm thread */
 static gboolean alarm_timeout (void * unused)
 {
- struct tm *currtime;
- time_t timenow;
- guint today;
-
- AUDDBG("Getting time\n");
- timenow = time(NULL);
- currtime = localtime(&timenow);
- today = currtime->tm_wday;
- AUDDBG("Today is %d\n", today);
-
- /* already went off? */
- if (timenow < play_start + 60)
- return TRUE;
-
- if(alarm_conf.day[today].flags & ALARM_OFF)
- return TRUE;
- else
- {
- /* set the alarm_h and alarm_m for today, if not default */
- if(!(alarm_conf.day[today].flags & ALARM_DEFAULT))
- {
- alarm_h = alarm_conf.day[today].hour;
- alarm_m = alarm_conf.day[today].min;
- }
- else
- {
- alarm_h = alarm_conf.default_hour;
- alarm_m = alarm_conf.default_min;
- }
- }
-
- AUDDBG("Alarm time is %d:%d (def: %d:%d)\n", alarm_h, alarm_m,
- alarm_conf.default_hour, alarm_conf.default_min);
-
- AUDDBG("Checking time (%d:%d)\n", currtime->tm_hour, currtime->tm_min);
- if((currtime->tm_hour != alarm_h) || (currtime->tm_min != alarm_m))
- return TRUE;
-
- if(cmd_on == TRUE)
- {
- AUDDBG("Executing %s, cmd_on is true\n", cmdstr);
- if(system(cmdstr) == -1)
- {
- AUDDBG("Executing %s failed\n",cmdstr);
- }
- }
-
- bool_t started = FALSE;
-
- if (playlist[0])
- {
- aud_drct_pl_open (playlist);
- started = TRUE;
- }
-
- if(fading)
- {
- fader fade_vols;
-
- AUDDBG("Fading is true\n");
- aud_drct_set_volume_main(quietvol);
-
- /* start playing */
- play_start = time(NULL);
-
- if (! started)
- aud_drct_play ();
-
- /* fade volume */
- fade_vols.start = quietvol;
- fade_vols.end = volume;
-
- //alarm_fade(quietvol, volume);
- alarm_thread_create(alarm_fade, &fade_vols, 0);
- }
- else
- {
- /* no fading */
-
- /* set volume */
- aud_drct_set_volume_main(volume);
-
- /* start playing */
- play_start = time(NULL);
- aud_drct_play();
- }
-
- if(alarm_conf.reminder_on == TRUE)
- {
- GtkWidget *reminder_dialog;
- AUDDBG("Showing reminder '%s'\n", alarm_conf.reminder_msg);
-
- reminder_dialog = (GtkWidget*) create_reminder_dialog(alarm_conf.reminder_msg);
- g_signal_connect (reminder_dialog, "destroy", (GCallback)
- gtk_widget_destroyed, & reminder_dialog);
- gtk_widget_show_all(reminder_dialog);
- }
-
- /* bring up the wakeup call dialog if stop_on is set TRUE, this
- * has been moved to after making xmms play so that it doesnt
- * get in the way for people with manual window placement turned on
- *
- * this means that the dialog doesnt get shown until the volume has
- * finished fading though !, so thats something else to fix
- */
- if(stop_on == TRUE)
- {
- alarm_dialog = create_alarm_dialog();
- g_signal_connect (alarm_dialog, "destroy", (GCallback)
- gtk_widget_destroyed, & alarm_dialog);
-
- gtk_widget_show_all(alarm_dialog);
-
- AUDDBG("now starting stop thread\n");
- stop = alarm_thread_create(alarm_stop_thread, NULL, 0);
- AUDDBG("Created wakeup dialog and started stop thread\n");
- }
-
- return TRUE;
+ struct tm *currtime;
+ time_t timenow;
+ guint today;
+
+ AUDDBG("Getting time\n");
+ timenow = time(NULL);
+ currtime = localtime(&timenow);
+ today = currtime->tm_wday;
+ AUDDBG("Today is %d\n", today);
+
+ /* already went off? */
+ if (timenow < play_start + 60)
+ return TRUE;
+
+ if(alarm_conf.day[today].flags & ALARM_OFF)
+ return TRUE;
+ else
+ {
+ /* set the alarm_h and alarm_m for today, if not default */
+ if(!(alarm_conf.day[today].flags & ALARM_DEFAULT))
+ {
+ alarm_h = alarm_conf.day[today].hour;
+ alarm_m = alarm_conf.day[today].min;
+ }
+ else
+ {
+ alarm_h = alarm_conf.default_hour;
+ alarm_m = alarm_conf.default_min;
+ }
+ }
+
+ AUDDBG("Alarm time is %d:%d (def: %d:%d)\n", alarm_h, alarm_m,
+ alarm_conf.default_hour, alarm_conf.default_min);
+
+ AUDDBG("Checking time (%d:%d)\n", currtime->tm_hour, currtime->tm_min);
+ if((currtime->tm_hour != alarm_h) || (currtime->tm_min != alarm_m))
+ return TRUE;
+
+ if(cmd_on == TRUE)
+ {
+ AUDDBG("Executing %s, cmd_on is true\n", cmdstr);
+ if(system(cmdstr) == -1)
+ AUDDBG("Executing %s failed\n",cmdstr);
+ }
+
+ bool_t started = FALSE;
+
+ if (playlist[0])
+ {
+ aud_drct_pl_open (playlist);
+ started = TRUE;
+ }
+
+ if(fading)
+ {
+ fader fade_vols;
+
+ AUDDBG("Fading is true\n");
+ aud_drct_set_volume_main(quietvol);
+
+ /* start playing */
+ play_start = time(NULL);
+
+ if (! started)
+ aud_drct_play ();
+
+ /* fade volume */
+ fade_vols.start = quietvol;
+ fade_vols.end = volume;
+
+ //alarm_fade(quietvol, volume);
+ alarm_thread_create(alarm_fade, &fade_vols, 0);
+ }
+ else
+ {
+ /* no fading */
+
+ /* set volume */
+ aud_drct_set_volume_main(volume);
+
+ /* start playing */
+ play_start = time(NULL);
+ aud_drct_play();
+ }
+
+ if(alarm_conf.reminder_on == TRUE)
+ {
+ GtkWidget *reminder_dialog;
+ AUDDBG("Showing reminder '%s'\n", alarm_conf.reminder_msg);
+
+ reminder_dialog = (GtkWidget*) create_reminder_dialog(alarm_conf.reminder_msg);
+ gtk_widget_show_all(reminder_dialog);
+ }
+
+ /* bring up the wakeup call dialog if stop_on is set TRUE, this
+ * has been moved to after making Audacious play so that it doesnt
+ * get in the way for people with manual window placement turned on
+ *
+ * this means that the dialog doesnt get shown until the volume has
+ * finished fading though !, so thats something else to fix
+ */
+ if(stop_on == TRUE)
+ {
+ alarm_dialog = create_alarm_dialog();
+
+ AUDDBG("now starting stop thread\n");
+ stop = alarm_thread_create(alarm_stop_thread, NULL, 0);
+ AUDDBG("Created wakeup dialog and started stop thread\n");
+ }
+
+ return TRUE;
 }
 
 /*
@@ -791,14 +768,14 @@
 */
 static gboolean alarm_init (void)
 {
- AUDDBG("alarm_init\n");
+ AUDDBG("alarm_init\n");
 
- alarm_conf.reminder_msg = NULL;
- alarm_read_config();
+ alarm_conf.reminder_msg = NULL;
+ alarm_read_config();
 
- timeout_source = g_timeout_add_seconds (10, alarm_timeout, NULL);
+ timeout_source = g_timeout_add_seconds (10, alarm_timeout, NULL);
 
- return TRUE;
+ return TRUE;
 }
 
 /*
@@ -806,25 +783,26 @@
 */
 static void alarm_cleanup(void)
 {
- AUDDBG("alarm_cleanup\n");
-
- if (timeout_source)
- {
- g_source_remove (timeout_source);
- timeout_source = 0;
- }
-
- if (stop.is_valid) {
- pthread_cancel(stop.tid);
- stop.is_valid = FALSE;
- }
-
- g_free(alarm_conf.reminder_msg);
- alarm_conf.reminder_msg = NULL;
- g_free(playlist);
- playlist = NULL;
- g_free(cmdstr);
- cmdstr = NULL;
+ AUDDBG("alarm_cleanup\n");
+
+ if (timeout_source)
+ {
+ g_source_remove (timeout_source);
+ timeout_source = 0;
+ }
+
+ if (stop.is_valid)
+ {
+ pthread_cancel(stop.tid);
+ stop.is_valid = FALSE;
+ }
+
+ g_free(alarm_conf.reminder_msg);
+ alarm_conf.reminder_msg = NULL;
+ g_free(playlist);
+ playlist = NULL;
+ g_free(cmdstr);
+ cmdstr = NULL;
 }
 
 static const char alarm_about[] =
@@ -833,10 +811,10 @@
 
 AUD_GENERAL_PLUGIN
 (
- .name = N_("Alarm"),
- .domain = PACKAGE,
- .about_text = alarm_about,
- .init = alarm_init,
- .configure = alarm_configure,
- .cleanup = alarm_cleanup,
+ .name = N_("Alarm"),
+ .domain = PACKAGE,
+ .about_text = alarm_about,
+ .init = alarm_init,
+ .configure = alarm_configure,
+ .cleanup = alarm_cleanup,
 )

audacious-plugins-3.3.4.tar.bz2/src/alarm/alarm.h -> audacious-plugins-3.4.2.tar.bz2/src/alarm/alarm.h Changed

audacious-plugins-3.3.4.tar.bz2/src/alarm/callbacks.h -> audacious-plugins-3.4.2.tar.bz2/src/alarm/callbacks.h Changed

audacious-plugins-3.3.4.tar.bz2/src/alarm/interface.c -> audacious-plugins-3.4.2.tar.bz2/src/alarm/interface.c Changed

@@ -1,75 +1,109 @@
 /*
- * DO NOT EDIT THIS FILE - it is generated by Glade.
+ * interface.c
+ * Copyright 2012 Thomas Lange
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
 */
 
-#include <config.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
+#include <audacious/i18n.h>
+#include <libaudgui/libaudgui.h>
 
 #include "callbacks.h"
-#include "interface.h"
 
-#include <audacious/i18n.h>
+const gchar *help[] =
+{
+ N_("Time\n"
+ " Alarm at:\n"
+ " The time for the alarm to come on.\n\n"
+
+ " Quiet after:\n"
+ " Stop alarm after this amount of time.\n"
+ " (if the wakeup dialog is not closed)\n\n\n"
+
+ "Days\n"
+ " Day:\n"
+ " Select the days for the alarm to activate.\n\n"
+
+ " Time:\n"
+ " Choose the time for the alarm on each day,\n"
+ " or select the toggle button to use the default\n"
+ " time.\n\n\n"),
+
+ N_("Volume\n"
+ " Fading:\n"
+ " Fade the volume up to the chosen volume\n"
+ " for this amount of time.\n\n"
+
+ " Start at:\n"
+ " Start fading from this volume.\n\n"
+
+ " Final:\n"
+ " The volume to stop fading at. If the fading\n"
+ " time is 0 then set volume to this and start\n"
+ " playing.\n\n\n"
+
+ "Options:\n"
+ " Additional Command:\n"
+ " Run this command at the alarm time.\n\n"),
+
+ N_(" Playlist:\n"
+ " Load this playlist. If no playlist\n"
+ " is given, the current one will be used.\n"
+ " The URL of an mp3/ogg stream\n"
+ " can also be entered here.\n\n"
+
+ " Reminder:\n"
+ " Display a reminder when the alarm goes off.\n"
+ " Type the reminder in the box and turn on the\n"
+ " toggle button if you want it to be shown."),
+
+ NULL
+};
+
+GtkWidget *create_alarm_dialog (void)
+{
+ GtkWidget *alarm_dialog;
+
+ alarm_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("This is your wakeup call."));
+ gtk_window_set_title (GTK_WINDOW (alarm_dialog), _("Alarm"));
+
+ g_signal_connect (alarm_dialog, "response",
+ G_CALLBACK (alarm_stop_cancel), NULL);
+ g_signal_connect_swapped (alarm_dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), alarm_dialog);
+
+ gtk_widget_show_all (alarm_dialog);
 
-GtkWidget*
-create_alarm_dialog (void)
+ return alarm_dialog;
+}
+
+GtkWidget *create_reminder_dialog (const gchar *reminder_msg)
 {
- GtkWidget *alarm_dialog;
- GtkWidget *dialog_vbox3;
- GtkWidget *label19;
- GtkWidget *dialog_action_area3;
- GtkWidget *button9;
-
- alarm_dialog = gtk_dialog_new ();
- gtk_widget_set_name (alarm_dialog, "alarm_dialog");
- g_object_set_data (G_OBJECT (alarm_dialog), "alarm_dialog", alarm_dialog);
- gtk_window_set_title (GTK_WINDOW (alarm_dialog), _("Alarm"));
-
- dialog_vbox3 = gtk_dialog_get_content_area ((GtkDialog *) alarm_dialog);
- gtk_widget_set_name (dialog_vbox3, "dialog_vbox3");
- g_object_set_data (G_OBJECT (alarm_dialog), "dialog_vbox3", dialog_vbox3);
- gtk_widget_show (dialog_vbox3);
-
- label19 = gtk_label_new (_("This is your wakeup call."));
- gtk_widget_set_name (label19, "label19");
- g_object_ref (label19);
- g_object_set_data_full (G_OBJECT (alarm_dialog), "label19", label19,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label19);
- gtk_box_pack_start (GTK_BOX (dialog_vbox3), label19, FALSE, TRUE, 0);
- gtk_misc_set_padding (GTK_MISC (label19), 10, 10);
-
- dialog_action_area3 = gtk_dialog_get_action_area ((GtkDialog *) alarm_dialog);
- gtk_widget_set_name (dialog_action_area3, "dialog_action_area3");
- g_object_set_data (G_OBJECT (alarm_dialog), "dialog_action_area3", dialog_action_area3);
- gtk_widget_show (dialog_action_area3);
- gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area3), 10);
-
- button9 = gtk_button_new_with_label (_("OK"));
- gtk_widget_set_name (button9, "button9");
- g_object_ref (button9);
- g_object_set_data_full (G_OBJECT (alarm_dialog), "button9", button9,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (button9);
- gtk_box_pack_start (GTK_BOX (dialog_action_area3), button9, FALSE, TRUE, 0);
- gtk_widget_set_can_default (button9, TRUE);
-
- g_signal_connect (G_OBJECT (button9), "clicked",
- G_CALLBACK (alarm_stop_cancel),
- NULL);
- g_signal_connect_swapped (G_OBJECT (button9), "clicked",
- G_CALLBACK (gtk_widget_destroy),
- G_OBJECT (alarm_dialog));
-
- gtk_widget_grab_focus (button9);
- gtk_widget_grab_default (button9);
- return alarm_dialog;
+ GtkWidget *reminder_dialog;
+
+ reminder_dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_INFO, GTK_BUTTONS_CLOSE, _("Your reminder for today is..."));
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (reminder_dialog), "%s", reminder_msg);
+ gtk_window_set_title (GTK_WINDOW (reminder_dialog), _("Reminder"));
+
+ g_signal_connect_swapped (reminder_dialog, "response",
+ G_CALLBACK (gtk_widget_destroy), reminder_dialog);
+
+ return reminder_dialog;
 }
 
 static void file_set_cb (GtkFileChooserButton *button, gpointer entry)
@@ -79,1221 +113,343 @@
 g_free (uri);
 }
 
-GtkWidget*
-create_config_dialog (void)
+static void config_dialog_response (GtkWidget *dialog, gint response)
 {
- GtkWidget *config_dialog;
- GtkWidget *dialog_vbox5;
- GtkWidget *notebook1;
- GtkWidget *frame10;
- GtkWidget *grid3;
- GtkWidget *hbox21;
- GtkAdjustment *stop_h_spin_adj;
- GtkWidget *stop_h_spin;
- GtkWidget *label75;
- GtkWidget *hbox22;
- GtkAdjustment *alarm_h_spin_adj;
- GtkWidget *alarm_h_spin;
- GtkWidget *label76;
- GtkWidget *hbox23;
- GtkAdjustment *alarm_m_spin_adj;
- GtkWidget *alarm_m_spin;
- GtkWidget *label77;
- GtkWidget *hbox24;
- GtkAdjustment *stop_m_spin_adj;
- GtkWidget *stop_m_spin;
- GtkWidget *label78;
- GtkWidget *stop_checkb;
- GtkWidget *label79;
- GtkWidget *label80;
- GtkWidget *label71;
- GtkWidget *frame15;
- GtkWidget *grid4;
- GtkWidget *hbox31;
- GtkWidget *mon_def;
- GtkAdjustment *mon_h_adj;
- GtkWidget *mon_h;
- GtkWidget *label89;
- GtkAdjustment *mon_m_adj;
- GtkWidget *mon_m;
- GtkWidget *hbox32;
- GtkWidget *tue_def;
- GtkAdjustment *tue_h_adj;
- GtkWidget *tue_h;
- GtkWidget *label90;
- GtkAdjustment *tue_m_adj;
- GtkWidget *tue_m;
- GtkWidget *hbox33;
- GtkWidget *wed_def;
- GtkAdjustment *wed_h_adj;
- GtkWidget *wed_h;
- GtkWidget *label91;
- GtkAdjustment *wed_m_adj;
- GtkWidget *wed_m;
- GtkWidget *hbox34;
- GtkWidget *thu_def;
- GtkAdjustment *thu_h_adj;
- GtkWidget *thu_h;
- GtkWidget *label92;
- GtkAdjustment *thu_m_adj;
- GtkWidget *thu_m;
- GtkWidget *hbox35;
- GtkWidget *fri_def;
- GtkAdjustment *fri_h_adj;
- GtkWidget *fri_h;
- GtkWidget *label93;
- GtkAdjustment *fri_m_adj;
- GtkWidget *fri_m;
- GtkWidget *hbox36;
- GtkWidget *sat_def;
- GtkAdjustment *sat_h_adj;
- GtkWidget *sat_h;
- GtkWidget *label94;
- GtkAdjustment *sat_m_adj;
- GtkWidget *sat_m;
- GtkWidget *hbox37;
- GtkWidget *sun_def;
- GtkAdjustment *sun_h_adj;
- GtkWidget *sun_h;
- GtkWidget *label95;
- GtkAdjustment *sun_m_adj;
- GtkWidget *sun_m;
- GtkWidget *label87;
- GtkWidget *label88;
- GtkWidget *tue_cb;
- GtkWidget *wed_cb;
- GtkWidget *thu_cb;
- GtkWidget *fri_cb;
- GtkWidget *sat_cb;
- GtkWidget *sun_cb;
- GtkWidget *mon_cb;
- GtkWidget *label72;
- GtkWidget *vbox8;
- GtkWidget *frame11;
- GtkWidget *alignment10;
- GtkWidget *hbox25;
- GtkAdjustment *fading_spin_adj;
- GtkWidget *fading_spin;
- GtkWidget *label81;
- GtkWidget *frame12;
- GtkWidget *vbox9;
- GtkWidget *alignment11;
- GtkWidget *current_button;
- GtkWidget *label82;
- GtkWidget *hbox26;
- GtkWidget *quiet_vol_scale;
- GtkWidget *label83;
- GtkWidget *hseparator2;
- GtkWidget *label84;
- GtkWidget *hbox27;
- GtkWidget *vol_scale;
- GtkWidget *label85;
- GtkWidget *label73;
- GtkWidget *vbox10;
- GtkWidget *frame13;
- GtkWidget *hbox28;
- GtkWidget *cmd_entry;
- GtkWidget *cmd_checkb;
- GtkWidget *frame14;
- GtkWidget *hbox29;
- GtkWidget *playlist;
- GtkWidget *playlist_browse_button;
- GtkWidget *frame18;
- GtkWidget *hbox38;
- GtkWidget *reminder_cb;
- GtkWidget *reminder_text;
- GtkWidget *label74;
- GtkWidget *frame16;
- GtkWidget *scrolledwindow1;
- GtkWidget *text1;
- GtkTextBuffer *text1buffer;
- GtkTextIter iter;
- GtkWidget *label86;
- GtkWidget *dialog_action_area5;
- GtkWidget *hbox20;
- GtkWidget *ok_button;
- GtkWidget *cancel_button;
-
- config_dialog = gtk_dialog_new ();
- gtk_widget_set_name (config_dialog, "config_dialog");
- g_object_set_data (G_OBJECT (config_dialog), "config_dialog", config_dialog);
- gtk_window_set_title (GTK_WINDOW (config_dialog), _("Alarm Settings"));
-
- dialog_vbox5 = gtk_dialog_get_content_area ((GtkDialog *) config_dialog);
- gtk_widget_set_name (dialog_vbox5, "dialog_vbox5");
- g_object_set_data (G_OBJECT (config_dialog), "dialog_vbox5", dialog_vbox5);
- gtk_widget_show (dialog_vbox5);
-
- notebook1 = gtk_notebook_new ();
- gtk_widget_set_name (notebook1, "notebook1");
- g_object_ref (notebook1);
- g_object_set_data_full (G_OBJECT (config_dialog), "notebook1", notebook1,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (notebook1);
- gtk_box_pack_start (GTK_BOX (dialog_vbox5), notebook1, TRUE, TRUE, 0);
-
- frame10 = gtk_frame_new (_("Time"));
- gtk_widget_set_name (frame10, "frame10");
- g_object_ref (frame10);
- g_object_set_data_full (G_OBJECT (config_dialog), "frame10", frame10,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (frame10);
- gtk_container_add (GTK_CONTAINER (notebook1), frame10);
- gtk_container_set_border_width (GTK_CONTAINER (frame10), 10);
-
- grid3 = gtk_grid_new ();
- gtk_widget_set_name (grid3, "grid3");
- g_object_ref (grid3);
- g_object_set_data_full (G_OBJECT (config_dialog), "grid3", grid3,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (grid3);
- gtk_container_add (GTK_CONTAINER (frame10), grid3);
- gtk_container_set_border_width (GTK_CONTAINER (grid3), 8);
- gtk_grid_set_row_spacing (GTK_GRID (grid3), 5);
- gtk_grid_set_column_spacing (GTK_GRID (grid3), 15);
- gtk_grid_set_row_homogeneous (GTK_GRID (grid3), TRUE);
-
- hbox21 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox21, "hbox21");
- g_object_ref (hbox21);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox21", hbox21,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox21);
- gtk_grid_attach (GTK_GRID (grid3), hbox21, 1, 1, 1, 1);
-
- stop_h_spin_adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 100, 1, 10, 0);
- stop_h_spin = gtk_spin_button_new (GTK_ADJUSTMENT (stop_h_spin_adj), 1, 0);
- gtk_widget_set_name (stop_h_spin, "stop_h_spin");
- g_object_ref (stop_h_spin);
- g_object_set_data_full (G_OBJECT (config_dialog), "stop_h_spin", stop_h_spin,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (stop_h_spin);
- gtk_box_pack_start (GTK_BOX (hbox21), stop_h_spin, FALSE, FALSE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (stop_h_spin), TRUE);
- gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (stop_h_spin), GTK_UPDATE_IF_VALID);
-
- label75 = gtk_label_new (_("hours"));
- gtk_widget_set_name (label75, "label75");
- g_object_ref (label75);
- g_object_set_data_full (G_OBJECT (config_dialog), "label75", label75,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label75);
- gtk_box_pack_start (GTK_BOX (hbox21), label75, FALSE, FALSE, 0);
-
- hbox22 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox22, "hbox22");
- g_object_ref (hbox22);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox22", hbox22,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox22);
- gtk_grid_attach (GTK_GRID (grid3), hbox22, 1, 0, 1, 1);
-
- alarm_h_spin_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
- alarm_h_spin = gtk_spin_button_new (GTK_ADJUSTMENT (alarm_h_spin_adj), 1, 0);
- gtk_widget_set_name (alarm_h_spin, "alarm_h_spin");
- g_object_ref (alarm_h_spin);
- g_object_set_data_full (G_OBJECT (config_dialog), "alarm_h_spin", alarm_h_spin,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (alarm_h_spin);
- gtk_box_pack_start (GTK_BOX (hbox22), alarm_h_spin, FALSE, FALSE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (alarm_h_spin), TRUE);
- gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (alarm_h_spin), GTK_UPDATE_IF_VALID);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (alarm_h_spin), TRUE);
-
- label76 = gtk_label_new (":");
- gtk_widget_set_name (label76, "label76");
- g_object_ref (label76);
- g_object_set_data_full (G_OBJECT (config_dialog), "label76", label76,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label76);
- gtk_box_pack_start (GTK_BOX (hbox22), label76, FALSE, FALSE, 0);
- gtk_misc_set_padding (GTK_MISC (label76), 5, 0);
-
- hbox23 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox23, "hbox23");
- g_object_ref (hbox23);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox23", hbox23,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox23);
- gtk_grid_attach (GTK_GRID (grid3), hbox23, 2, 0, 1, 1);
-
- alarm_m_spin_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
- alarm_m_spin = gtk_spin_button_new (GTK_ADJUSTMENT (alarm_m_spin_adj), 1, 0);
- gtk_widget_set_name (alarm_m_spin, "alarm_m_spin");
- g_object_ref (alarm_m_spin);
- g_object_set_data_full (G_OBJECT (config_dialog), "alarm_m_spin", alarm_m_spin,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (alarm_m_spin);
- gtk_box_pack_start (GTK_BOX (hbox23), alarm_m_spin, FALSE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (alarm_m_spin), TRUE);
- gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (alarm_m_spin), GTK_UPDATE_IF_VALID);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (alarm_m_spin), TRUE);
-
- label77 = gtk_label_new (_("h"));
- gtk_widget_set_name (label77, "label77");
- g_object_ref (label77);
- g_object_set_data_full (G_OBJECT (config_dialog), "label77", label77,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label77);
- gtk_box_pack_start (GTK_BOX (hbox23), label77, FALSE, FALSE, 0);
-
- hbox24 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox24, "hbox24");
- g_object_ref (hbox24);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox24", hbox24,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox24);
- gtk_grid_attach (GTK_GRID (grid3), hbox24, 2, 1, 1, 1);
-
- stop_m_spin_adj = (GtkAdjustment *) gtk_adjustment_new (0, 0, 59, 1, 10, 0);
- stop_m_spin = gtk_spin_button_new (GTK_ADJUSTMENT (stop_m_spin_adj), 1, 0);
- gtk_widget_set_name (stop_m_spin, "stop_m_spin");
- g_object_ref (stop_m_spin);
- g_object_set_data_full (G_OBJECT (config_dialog), "stop_m_spin", stop_m_spin,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (stop_m_spin);
- gtk_box_pack_start (GTK_BOX (hbox24), stop_m_spin, FALSE, FALSE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (stop_m_spin), TRUE);
- gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (stop_m_spin), GTK_UPDATE_IF_VALID);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_m_spin), TRUE);
-
- label78 = gtk_label_new (_("minutes"));
- gtk_widget_set_name (label78, "label78");
- g_object_ref (label78);
- g_object_set_data_full (G_OBJECT (config_dialog), "label78", label78,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label78);
- gtk_box_pack_start (GTK_BOX (hbox24), label78, FALSE, FALSE, 0);
-
- stop_checkb = gtk_check_button_new ();
- gtk_widget_set_name (stop_checkb, "stop_checkb");
- g_object_ref (stop_checkb);
- g_object_set_data_full (G_OBJECT (config_dialog), "stop_checkb", stop_checkb,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (stop_checkb);
- gtk_grid_attach (GTK_GRID (grid3), stop_checkb, 0, 1, 1, 1);
-
- label79 = gtk_label_new (_("Quiet after:"));
- gtk_widget_set_name (label79, "label79");
- g_object_ref (label79);
- g_object_set_data_full (G_OBJECT (config_dialog), "label79", label79,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label79);
- gtk_container_add (GTK_CONTAINER (stop_checkb), label79);
- gtk_label_set_justify (GTK_LABEL (label79), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label79), 0, 0.5);
-
- label80 = gtk_label_new (_("Alarm at (default):"));
- gtk_widget_set_name (label80, "label80");
- g_object_ref (label80);
- g_object_set_data_full (G_OBJECT (config_dialog), "label80", label80,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label80);
- gtk_grid_attach (GTK_GRID (grid3), label80, 0, 0, 1, 1);
- gtk_label_set_justify (GTK_LABEL (label80), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label80), 0, 0.5);
-
- label71 = gtk_label_new (_("Time"));
- gtk_widget_set_name (label71, "label71");
- g_object_ref (label71);
- g_object_set_data_full (G_OBJECT (config_dialog), "label71", label71,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label71);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 0), label71);
-
- frame15 = gtk_frame_new (_("Choose the days for the alarm to come on"));
- gtk_widget_set_name (frame15, "frame15");
- g_object_ref (frame15);
- g_object_set_data_full (G_OBJECT (config_dialog), "frame15", frame15,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (frame15);
- gtk_container_add (GTK_CONTAINER (notebook1), frame15);
- gtk_container_set_border_width (GTK_CONTAINER (frame15), 10);
-
- grid4 = gtk_grid_new ();
- gtk_grid_set_row_homogeneous (GTK_GRID (grid4), TRUE);
- gtk_widget_set_name (grid4, "grid4");
- g_object_ref (grid4);
- g_object_set_data_full (G_OBJECT (config_dialog), "grid4", grid4,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (grid4);
- gtk_container_add (GTK_CONTAINER (frame15), grid4);
- gtk_container_set_border_width (GTK_CONTAINER (grid4), 5);
-
- hbox31 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox31, "hbox31");
- g_object_ref (hbox31);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox31", hbox31,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox31);
- gtk_grid_attach (GTK_GRID (grid4), hbox31, 1, 1, 1, 1);
-
- mon_def = gtk_check_button_new_with_label (_("Default"));
- gtk_widget_set_name (mon_def, "mon_def");
- g_object_ref (mon_def);
- g_object_set_data_full (G_OBJECT (config_dialog), "mon_def", mon_def,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (mon_def);
- gtk_box_pack_start (GTK_BOX (hbox31), mon_def, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mon_def), TRUE);
-
- mon_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
- mon_h = gtk_spin_button_new (GTK_ADJUSTMENT (mon_h_adj), 1, 0);
- gtk_widget_set_name (mon_h, "mon_h");
- g_object_ref (mon_h);
- g_object_set_data_full (G_OBJECT (config_dialog), "mon_h", mon_h,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (mon_h);
- gtk_box_pack_start (GTK_BOX (hbox31), mon_h, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mon_h), TRUE);
-
- label89 = gtk_label_new (":");
- gtk_widget_set_name (label89, "label89");
- g_object_ref (label89);
- g_object_set_data_full (G_OBJECT (config_dialog), "label89", label89,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label89);
- gtk_box_pack_start (GTK_BOX (hbox31), label89, FALSE, FALSE, 0);
-
- mon_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
- mon_m = gtk_spin_button_new (GTK_ADJUSTMENT (mon_m_adj), 1, 0);
- gtk_widget_set_name (mon_m, "mon_m");
- g_object_ref (mon_m);
- g_object_set_data_full (G_OBJECT (config_dialog), "mon_m", mon_m,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (mon_m);
- gtk_box_pack_start (GTK_BOX (hbox31), mon_m, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (mon_m), TRUE);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (mon_m), TRUE);
-
- hbox32 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox32, "hbox32");
- g_object_ref (hbox32);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox32", hbox32,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox32);
- gtk_grid_attach (GTK_GRID (grid4), hbox32, 1, 2, 1, 1);
-
- tue_def = gtk_check_button_new_with_label (_("Default"));
- gtk_widget_set_name (tue_def, "tue_def");
- g_object_ref (tue_def);
- g_object_set_data_full (G_OBJECT (config_dialog), "tue_def", tue_def,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (tue_def);
- gtk_box_pack_start (GTK_BOX (hbox32), tue_def, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tue_def), TRUE);
-
- tue_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
- tue_h = gtk_spin_button_new (GTK_ADJUSTMENT (tue_h_adj), 1, 0);
- gtk_widget_set_name (tue_h, "tue_h");
- g_object_ref (tue_h);
- g_object_set_data_full (G_OBJECT (config_dialog), "tue_h", tue_h,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (tue_h);
- gtk_box_pack_start (GTK_BOX (hbox32), tue_h, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (tue_h), TRUE);
-
- label90 = gtk_label_new (":");
- gtk_widget_set_name (label90, "label90");
- g_object_ref (label90);
- g_object_set_data_full (G_OBJECT (config_dialog), "label90", label90,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label90);
- gtk_box_pack_start (GTK_BOX (hbox32), label90, FALSE, FALSE, 0);
-
- tue_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
- tue_m = gtk_spin_button_new (GTK_ADJUSTMENT (tue_m_adj), 1, 0);
- gtk_widget_set_name (tue_m, "tue_m");
- g_object_ref (tue_m);
- g_object_set_data_full (G_OBJECT (config_dialog), "tue_m", tue_m,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (tue_m);
- gtk_box_pack_start (GTK_BOX (hbox32), tue_m, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (tue_m), TRUE);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (tue_m), TRUE);
-
- hbox33 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox33, "hbox33");
- g_object_ref (hbox33);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox33", hbox33,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox33);
- gtk_grid_attach (GTK_GRID (grid4), hbox33, 1, 3, 1, 1);
-
- wed_def = gtk_check_button_new_with_label (_("Default"));
- gtk_widget_set_name (wed_def, "wed_def");
- g_object_ref (wed_def);
- g_object_set_data_full (G_OBJECT (config_dialog), "wed_def", wed_def,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (wed_def);
- gtk_box_pack_start (GTK_BOX (hbox33), wed_def, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wed_def), TRUE);
-
- wed_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
- wed_h = gtk_spin_button_new (GTK_ADJUSTMENT (wed_h_adj), 1, 0);
- gtk_widget_set_name (wed_h, "wed_h");
- g_object_ref (wed_h);
- g_object_set_data_full (G_OBJECT (config_dialog), "wed_h", wed_h,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (wed_h);
- gtk_box_pack_start (GTK_BOX (hbox33), wed_h, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (wed_h), TRUE);
-
- label91 = gtk_label_new (":");
- gtk_widget_set_name (label91, "label91");
- g_object_ref (label91);
- g_object_set_data_full (G_OBJECT (config_dialog), "label91", label91,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label91);
- gtk_box_pack_start (GTK_BOX (hbox33), label91, FALSE, FALSE, 0);
-
- wed_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
- wed_m = gtk_spin_button_new (GTK_ADJUSTMENT (wed_m_adj), 1, 0);
- gtk_widget_set_name (wed_m, "wed_m");
- g_object_ref (wed_m);
- g_object_set_data_full (G_OBJECT (config_dialog), "wed_m", wed_m,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (wed_m);
- gtk_box_pack_start (GTK_BOX (hbox33), wed_m, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (wed_m), TRUE);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (wed_m), TRUE);
-
- hbox34 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox34, "hbox34");
- g_object_ref (hbox34);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox34", hbox34,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox34);
- gtk_grid_attach (GTK_GRID (grid4), hbox34, 1, 4, 1, 1);
-
- thu_def = gtk_check_button_new_with_label (_("Default"));
- gtk_widget_set_name (thu_def, "thu_def");
- g_object_ref (thu_def);
- g_object_set_data_full (G_OBJECT (config_dialog), "thu_def", thu_def,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (thu_def);
- gtk_box_pack_start (GTK_BOX (hbox34), thu_def, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (thu_def), TRUE);
-
- thu_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
- thu_h = gtk_spin_button_new (GTK_ADJUSTMENT (thu_h_adj), 1, 0);
- gtk_widget_set_name (thu_h, "thu_h");
- g_object_ref (thu_h);
- g_object_set_data_full (G_OBJECT (config_dialog), "thu_h", thu_h,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (thu_h);
- gtk_box_pack_start (GTK_BOX (hbox34), thu_h, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (thu_h), TRUE);
-
- label92 = gtk_label_new (":");
- gtk_widget_set_name (label92, "label92");
- g_object_ref (label92);
- g_object_set_data_full (G_OBJECT (config_dialog), "label92", label92,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label92);
- gtk_box_pack_start (GTK_BOX (hbox34), label92, FALSE, FALSE, 0);
-
- thu_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
- thu_m = gtk_spin_button_new (GTK_ADJUSTMENT (thu_m_adj), 1, 0);
- gtk_widget_set_name (thu_m, "thu_m");
- g_object_ref (thu_m);
- g_object_set_data_full (G_OBJECT (config_dialog), "thu_m", thu_m,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (thu_m);
- gtk_box_pack_start (GTK_BOX (hbox34), thu_m, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (thu_m), TRUE);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (thu_m), TRUE);
-
- hbox35 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox35, "hbox35");
- g_object_ref (hbox35);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox35", hbox35,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox35);
- gtk_grid_attach (GTK_GRID (grid4), hbox35, 1, 5, 1, 1);
-
- fri_def = gtk_check_button_new_with_label (_("Default"));
- gtk_widget_set_name (fri_def, "fri_def");
- g_object_ref (fri_def);
- g_object_set_data_full (G_OBJECT (config_dialog), "fri_def", fri_def,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (fri_def);
- gtk_box_pack_start (GTK_BOX (hbox35), fri_def, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fri_def), TRUE);
-
- fri_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
- fri_h = gtk_spin_button_new (GTK_ADJUSTMENT (fri_h_adj), 1, 0);
- gtk_widget_set_name (fri_h, "fri_h");
- g_object_ref (fri_h);
- g_object_set_data_full (G_OBJECT (config_dialog), "fri_h", fri_h,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (fri_h);
- gtk_box_pack_start (GTK_BOX (hbox35), fri_h, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (fri_h), TRUE);
-
- label93 = gtk_label_new (":");
- gtk_widget_set_name (label93, "label93");
- g_object_ref (label93);
- g_object_set_data_full (G_OBJECT (config_dialog), "label93", label93,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label93);
- gtk_box_pack_start (GTK_BOX (hbox35), label93, FALSE, FALSE, 0);
-
- fri_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
- fri_m = gtk_spin_button_new (GTK_ADJUSTMENT (fri_m_adj), 1, 0);
- gtk_widget_set_name (fri_m, "fri_m");
- g_object_ref (fri_m);
- g_object_set_data_full (G_OBJECT (config_dialog), "fri_m", fri_m,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (fri_m);
- gtk_box_pack_start (GTK_BOX (hbox35), fri_m, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (fri_m), TRUE);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (fri_m), TRUE);
-
- hbox36 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox36, "hbox36");
- g_object_ref (hbox36);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox36", hbox36,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox36);
- gtk_grid_attach (GTK_GRID (grid4), hbox36, 1, 6, 1, 1);
-
- sat_def = gtk_check_button_new_with_label (_("Default"));
- gtk_widget_set_name (sat_def, "sat_def");
- g_object_ref (sat_def);
- g_object_set_data_full (G_OBJECT (config_dialog), "sat_def", sat_def,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (sat_def);
- gtk_box_pack_start (GTK_BOX (hbox36), sat_def, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sat_def), TRUE);
-
- sat_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
- sat_h = gtk_spin_button_new (GTK_ADJUSTMENT (sat_h_adj), 1, 0);
- gtk_widget_set_name (sat_h, "sat_h");
- g_object_ref (sat_h);
- g_object_set_data_full (G_OBJECT (config_dialog), "sat_h", sat_h,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (sat_h);
- gtk_box_pack_start (GTK_BOX (hbox36), sat_h, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (sat_h), TRUE);
-
- label94 = gtk_label_new (":");
- gtk_widget_set_name (label94, "label94");
- g_object_ref (label94);
- g_object_set_data_full (G_OBJECT (config_dialog), "label94", label94,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label94);
- gtk_box_pack_start (GTK_BOX (hbox36), label94, FALSE, FALSE, 0);
-
- sat_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
- sat_m = gtk_spin_button_new (GTK_ADJUSTMENT (sat_m_adj), 1, 0);
- gtk_widget_set_name (sat_m, "sat_m");
- g_object_ref (sat_m);
- g_object_set_data_full (G_OBJECT (config_dialog), "sat_m", sat_m,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (sat_m);
- gtk_box_pack_start (GTK_BOX (hbox36), sat_m, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (sat_m), TRUE);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (sat_m), TRUE);
-
- hbox37 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox37, "hbox37");
- g_object_ref (hbox37);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox37", hbox37,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox37);
- gtk_grid_attach (GTK_GRID (grid4), hbox37, 1, 7, 1, 1);
-
- sun_def = gtk_check_button_new_with_label (_("Default"));
- gtk_widget_set_name (sun_def, "sun_def");
- g_object_ref (sun_def);
- g_object_set_data_full (G_OBJECT (config_dialog), "sun_def", sun_def,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (sun_def);
- gtk_box_pack_start (GTK_BOX (hbox37), sun_def, FALSE, FALSE, 0);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sun_def), TRUE);
-
- sun_h_adj = (GtkAdjustment *) gtk_adjustment_new (6, 0, 23, 1, 10, 0);
- sun_h = gtk_spin_button_new (GTK_ADJUSTMENT (sun_h_adj), 1, 0);
- gtk_widget_set_name (sun_h, "sun_h");
- g_object_ref (sun_h);
- g_object_set_data_full (G_OBJECT (config_dialog), "sun_h", sun_h,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (sun_h);
- gtk_box_pack_start (GTK_BOX (hbox37), sun_h, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (sun_h), TRUE);
-
- label95 = gtk_label_new (":");
- gtk_widget_set_name (label95, "label95");
- g_object_ref (label95);
- g_object_set_data_full (G_OBJECT (config_dialog), "label95", label95,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label95);
- gtk_box_pack_start (GTK_BOX (hbox37), label95, FALSE, FALSE, 0);
-
- sun_m_adj = (GtkAdjustment *) gtk_adjustment_new (30, 0, 59, 1, 10, 0);
- sun_m = gtk_spin_button_new (GTK_ADJUSTMENT (sun_m_adj), 1, 0);
- gtk_widget_set_name (sun_m, "sun_m");
- g_object_ref (sun_m);
- g_object_set_data_full (G_OBJECT (config_dialog), "sun_m", sun_m,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (sun_m);
- gtk_box_pack_start (GTK_BOX (hbox37), sun_m, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (sun_m), TRUE);
- gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (sun_m), TRUE);
-
- label87 = gtk_label_new (_("Day"));
- gtk_widget_set_name (label87, "label87");
- g_object_ref (label87);
- g_object_set_data_full (G_OBJECT (config_dialog), "label87", label87,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label87);
- gtk_grid_attach (GTK_GRID (grid4), label87, 0, 0, 1, 1);
-
- label88 = gtk_label_new (_("Time"));
- gtk_widget_set_name (label88, "label88");
- g_object_ref (label88);
- g_object_set_data_full (G_OBJECT (config_dialog), "label88", label88,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label88);
- gtk_grid_attach (GTK_GRID (grid4), label88, 1, 0, 1, 1);
-
- tue_cb = gtk_check_button_new_with_label (_("Tuesday"));
- gtk_widget_set_name (tue_cb, "tue_cb");
- g_object_ref (tue_cb);
- g_object_set_data_full (G_OBJECT (config_dialog), "tue_cb", tue_cb,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (tue_cb);
- gtk_grid_attach (GTK_GRID (grid4), tue_cb, 0, 2, 1, 1);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tue_cb), TRUE);
-
- wed_cb = gtk_check_button_new_with_label (_("Wednesday"));
- gtk_widget_set_name (wed_cb, "wed_cb");
- g_object_ref (wed_cb);
- g_object_set_data_full (G_OBJECT (config_dialog), "wed_cb", wed_cb,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (wed_cb);
- gtk_grid_attach (GTK_GRID (grid4), wed_cb, 0, 3, 1, 1);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (wed_cb), TRUE);
-
- thu_cb = gtk_check_button_new_with_label (_("Thursday"));
- gtk_widget_set_name (thu_cb, "thu_cb");
- g_object_ref (thu_cb);
- g_object_set_data_full (G_OBJECT (config_dialog), "thu_cb", thu_cb,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (thu_cb);
- gtk_grid_attach (GTK_GRID (grid4), thu_cb, 0, 4, 1, 1);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (thu_cb), TRUE);
-
- fri_cb = gtk_check_button_new_with_label (_("Friday"));
- gtk_widget_set_name (fri_cb, "fri_cb");
- g_object_ref (fri_cb);
- g_object_set_data_full (G_OBJECT (config_dialog), "fri_cb", fri_cb,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (fri_cb);
- gtk_grid_attach (GTK_GRID (grid4), fri_cb, 0, 5, 1, 1);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (fri_cb), TRUE);
-
- sat_cb = gtk_check_button_new_with_label (_("Saturday"));
- gtk_widget_set_name (sat_cb, "sat_cb");
- g_object_ref (sat_cb);
- g_object_set_data_full (G_OBJECT (config_dialog), "sat_cb", sat_cb,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (sat_cb);
- gtk_grid_attach (GTK_GRID (grid4), sat_cb, 0, 6, 1, 1);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sat_cb), TRUE);
-
- sun_cb = gtk_check_button_new_with_label (_("Sunday"));
- gtk_widget_set_name (sun_cb, "sun_cb");
- g_object_ref (sun_cb);
- g_object_set_data_full (G_OBJECT (config_dialog), "sun_cb", sun_cb,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (sun_cb);
- gtk_grid_attach (GTK_GRID (grid4), sun_cb, 0, 7, 1, 1);
-
- mon_cb = gtk_check_button_new_with_label (_("Monday"));
- gtk_widget_set_name (mon_cb, "mon_cb");
- g_object_ref (mon_cb);
- g_object_set_data_full (G_OBJECT (config_dialog), "mon_cb", mon_cb,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (mon_cb);
- gtk_grid_attach (GTK_GRID (grid4), mon_cb, 0, 1, 1, 1);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (mon_cb), TRUE);
-
- label72 = gtk_label_new (_("Days"));
- gtk_widget_set_name (label72, "label72");
- g_object_ref (label72);
- g_object_set_data_full (G_OBJECT (config_dialog), "label72", label72,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label72);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 1), label72);
-
- vbox8 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_widget_set_name (vbox8, "vbox8");
- g_object_ref (vbox8);
- g_object_set_data_full (G_OBJECT (config_dialog), "vbox8", vbox8,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (vbox8);
- gtk_container_add (GTK_CONTAINER (notebook1), vbox8);
-
- frame11 = gtk_frame_new (_("Fading"));
- gtk_widget_set_name (frame11, "frame11");
- g_object_ref (frame11);
- g_object_set_data_full (G_OBJECT (config_dialog), "frame11", frame11,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (frame11);
- gtk_box_pack_start (GTK_BOX (vbox8), frame11, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame11), 10);
-
- alignment10 = gtk_alignment_new (0, 0.5, 0.1, 1);
- gtk_widget_set_name (alignment10, "alignment10");
- g_object_ref (alignment10);
- g_object_set_data_full (G_OBJECT (config_dialog), "alignment10", alignment10,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (alignment10);
- gtk_container_add (GTK_CONTAINER (frame11), alignment10);
- gtk_container_set_border_width (GTK_CONTAINER (alignment10), 8);
-
- hbox25 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox25, "hbox25");
- g_object_ref (hbox25);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox25", hbox25,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox25);
- gtk_container_add (GTK_CONTAINER (alignment10), hbox25);
-
- fading_spin_adj = (GtkAdjustment *) gtk_adjustment_new (120, 0, 3600, 1, 10, 0);
- fading_spin = gtk_spin_button_new (GTK_ADJUSTMENT (fading_spin_adj), 1, 0);
- gtk_widget_set_name (fading_spin, "fading_spin");
- g_object_ref (fading_spin);
- g_object_set_data_full (G_OBJECT (config_dialog), "fading_spin", fading_spin,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (fading_spin);
- gtk_box_pack_start (GTK_BOX (hbox25), fading_spin, TRUE, TRUE, 0);
- gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (fading_spin), TRUE);
- gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (fading_spin), GTK_UPDATE_IF_VALID);
-
- label81 = gtk_label_new (_("seconds"));
- gtk_widget_set_name (label81, "label81");
- g_object_ref (label81);
- g_object_set_data_full (G_OBJECT (config_dialog), "label81", label81,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label81);
- gtk_box_pack_start (GTK_BOX (hbox25), label81, FALSE, TRUE, 0);
-
- frame12 = gtk_frame_new (_("Volume"));
- gtk_widget_set_name (frame12, "frame12");
- g_object_ref (frame12);
- g_object_set_data_full (G_OBJECT (config_dialog), "frame12", frame12,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (frame12);
- gtk_box_pack_start (GTK_BOX (vbox8), frame12, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame12), 10);
-
- vbox9 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
- gtk_widget_set_name (vbox9, "vbox9");
- g_object_ref (vbox9);
- g_object_set_data_full (G_OBJECT (config_dialog), "vbox9", vbox9,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (vbox9);
- gtk_container_add (GTK_CONTAINER (frame12), vbox9);
- gtk_container_set_border_width (GTK_CONTAINER (vbox9), 8);
-
- alignment11 = gtk_alignment_new (1, 0.5, 0.1, 1);
- gtk_widget_set_name (alignment11, "alignment11");
- g_object_ref (alignment11);
- g_object_set_data_full (G_OBJECT (config_dialog), "alignment11", alignment11,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (alignment11);
- gtk_box_pack_end (GTK_BOX (vbox9), alignment11, FALSE, FALSE, 0);
-
- current_button = gtk_button_new_with_label (_("Current"));
- gtk_widget_set_name (current_button, "current_button");
- g_object_ref (current_button);
- g_object_set_data_full (G_OBJECT (config_dialog), "current_button", current_button,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (current_button);
- gtk_container_add (GTK_CONTAINER (alignment11), current_button);
-
- label82 = gtk_label_new (_("Start at"));
- gtk_widget_set_name (label82, "label82");
- g_object_ref (label82);
- g_object_set_data_full (G_OBJECT (config_dialog), "label82", label82,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label82);
- gtk_box_pack_start (GTK_BOX (vbox9), label82, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label82), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label82), 7.45058e-09, 0.5);
-
- hbox26 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox26, "hbox26");
- g_object_ref (hbox26);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox26", hbox26,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox26);
- gtk_box_pack_start (GTK_BOX (vbox9), hbox26, TRUE, TRUE, 0);
-
- quiet_vol_scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (gtk_adjustment_new (20, 0, 100, 1, 5, 0)));
- gtk_widget_set_name (quiet_vol_scale, "quiet_vol_scale");
- g_object_ref (quiet_vol_scale);
- g_object_set_data_full (G_OBJECT (config_dialog), "quiet_vol_scale", quiet_vol_scale,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (quiet_vol_scale);
- gtk_box_pack_start (GTK_BOX (hbox26), quiet_vol_scale, TRUE, TRUE, 0);
- gtk_scale_set_value_pos (GTK_SCALE (quiet_vol_scale), GTK_POS_RIGHT);
- gtk_scale_set_digits (GTK_SCALE (quiet_vol_scale), 0);
-
- label83 = gtk_label_new (_("%"));
- gtk_widget_set_name (label83, "label83");
- g_object_ref (label83);
- g_object_set_data_full (G_OBJECT (config_dialog), "label83", label83,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label83);
- gtk_box_pack_start (GTK_BOX (hbox26), label83, FALSE, FALSE, 0);
-
- hseparator2 = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_widget_set_name (hseparator2, "hseparator2");
- g_object_ref (hseparator2);
- g_object_set_data_full (G_OBJECT (config_dialog), "hseparator2", hseparator2,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hseparator2);
- gtk_box_pack_start (GTK_BOX (vbox9), hseparator2, TRUE, TRUE, 0);
-
- label84 = gtk_label_new (_("Final"));
- gtk_widget_set_name (label84, "label84");
- g_object_ref (label84);
- g_object_set_data_full (G_OBJECT (config_dialog), "label84", label84,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label84);
- gtk_box_pack_start (GTK_BOX (vbox9), label84, FALSE, FALSE, 0);
- gtk_label_set_justify (GTK_LABEL (label84), GTK_JUSTIFY_LEFT);
- gtk_misc_set_alignment (GTK_MISC (label84), 0, 0.5);
-
- hbox27 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox27, "hbox27");
- g_object_ref (hbox27);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox27", hbox27,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox27);
- gtk_box_pack_start (GTK_BOX (vbox9), hbox27, TRUE, TRUE, 0);
-
- vol_scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (gtk_adjustment_new (80, 0, 100, 1, 5, 0)));
- gtk_widget_set_name (vol_scale, "vol_scale");
- g_object_ref (vol_scale);
- g_object_set_data_full (G_OBJECT (config_dialog), "vol_scale", vol_scale,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (vol_scale);
- gtk_box_pack_start (GTK_BOX (hbox27), vol_scale, TRUE, TRUE, 0);
- gtk_scale_set_value_pos (GTK_SCALE (vol_scale), GTK_POS_RIGHT);
- gtk_scale_set_digits (GTK_SCALE (vol_scale), 0);
-
- label85 = gtk_label_new (_("%"));
- gtk_widget_set_name (label85, "label85");
- g_object_ref (label85);
- g_object_set_data_full (G_OBJECT (config_dialog), "label85", label85,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label85);
- gtk_box_pack_start (GTK_BOX (hbox27), label85, FALSE, TRUE, 0);
- gtk_label_set_justify (GTK_LABEL (label85), GTK_JUSTIFY_FILL);
-
- label73 = gtk_label_new (_("Volume"));
- gtk_widget_set_name (label73, "label73");
- g_object_ref (label73);
- g_object_set_data_full (G_OBJECT (config_dialog), "label73", label73,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label73);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label73);
-
- vbox10 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_widget_set_name (vbox10, "vbox10");
- g_object_ref (vbox10);
- g_object_set_data_full (G_OBJECT (config_dialog), "vbox10", vbox10,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (vbox10);
- gtk_container_add (GTK_CONTAINER (notebook1), vbox10);
-
- frame13 = gtk_frame_new (_("Additional Command"));
- gtk_widget_set_name (frame13, "frame13");
- g_object_ref (frame13);
- g_object_set_data_full (G_OBJECT (config_dialog), "frame13", frame13,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (frame13);
- gtk_box_pack_start (GTK_BOX (vbox10), frame13, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame13), 10);
-
- hbox28 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_widget_set_name (hbox28, "hbox28");
- g_object_ref (hbox28);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox28", hbox28,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox28);
- gtk_container_add (GTK_CONTAINER (frame13), hbox28);
- gtk_container_set_border_width (GTK_CONTAINER (hbox28), 8);
-
- cmd_entry = gtk_entry_new ();
- gtk_widget_set_name (cmd_entry, "cmd_entry");
- g_object_ref (cmd_entry);
- g_object_set_data_full (G_OBJECT (config_dialog), "cmd_entry", cmd_entry,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (cmd_entry);
- gtk_box_pack_start (GTK_BOX (hbox28), cmd_entry, TRUE, TRUE, 0);
-
- cmd_checkb = gtk_check_button_new_with_label (_("enable"));
- gtk_widget_set_name (cmd_checkb, "cmd_checkb");
- g_object_ref (cmd_checkb);
- g_object_set_data_full (G_OBJECT (config_dialog), "cmd_checkb", cmd_checkb,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (cmd_checkb);
- gtk_box_pack_start (GTK_BOX (hbox28), cmd_checkb, FALSE, FALSE, 0);
-
- frame14 = gtk_frame_new (_("Playlist (optional)"));
- gtk_widget_set_name (frame14, "frame14");
- g_object_ref (frame14);
- g_object_set_data_full (G_OBJECT (config_dialog), "frame14", frame14,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (frame14);
- gtk_box_pack_start (GTK_BOX (vbox10), frame14, FALSE, FALSE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame14), 10);
-
- hbox29 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_widget_set_name (hbox29, "hbox29");
- g_object_ref (hbox29);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox29", hbox29,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox29);
- gtk_container_add (GTK_CONTAINER (frame14), hbox29);
- gtk_container_set_border_width (GTK_CONTAINER (hbox29), 8);
-
- playlist = gtk_entry_new ();
- gtk_widget_set_name (playlist, "playlist");
- g_object_ref (playlist);
- g_object_set_data_full (G_OBJECT (config_dialog), "playlist", playlist,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (playlist);
- gtk_box_pack_start (GTK_BOX (hbox29), playlist, TRUE, TRUE, 0);
-
- playlist_browse_button = gtk_file_chooser_button_new (_("Select a playlist"), GTK_FILE_CHOOSER_ACTION_OPEN);
- gtk_widget_set_name (playlist_browse_button, "playlist_browse_button");
- gtk_widget_set_valign (playlist_browse_button, GTK_ALIGN_CENTER);
- g_object_ref (playlist_browse_button);
- g_object_set_data_full (G_OBJECT (config_dialog), "playlist_browse_button", playlist_browse_button,
- (GDestroyNotify) g_object_unref);
- g_signal_connect (playlist_browse_button, "file-set", G_CALLBACK (file_set_cb), playlist);
- gtk_widget_show (playlist_browse_button);
- gtk_box_pack_start (GTK_BOX (hbox29), playlist_browse_button, FALSE, FALSE, 0);
-
- frame18 = gtk_frame_new (_("Reminder"));
- gtk_widget_set_name (frame18, "frame18");
- g_object_ref (frame18);
- g_object_set_data_full (G_OBJECT (config_dialog), "frame18", frame18,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (frame18);
- gtk_box_pack_start (GTK_BOX (vbox10), frame18, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame18), 10);
-
- hbox38 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_widget_set_name (hbox38, "hbox38");
- g_object_ref (hbox38);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox38", hbox38,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox38);
- gtk_container_add (GTK_CONTAINER (frame18), hbox38);
-
- reminder_cb = gtk_check_button_new_with_label (_("Use reminder"));
- gtk_widget_set_name (reminder_cb, "reminder_cb");
- g_object_ref (reminder_cb);
- g_object_set_data_full (G_OBJECT (config_dialog), "reminder_cb", reminder_cb,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (reminder_cb);
- gtk_box_pack_start (GTK_BOX (hbox38), reminder_cb, FALSE, FALSE, 0);
-
- reminder_text = gtk_entry_new ();
- gtk_widget_set_name (reminder_text, "reminder_text");
- g_object_ref (reminder_text);
- g_object_set_data_full (G_OBJECT (config_dialog), "reminder_text", reminder_text,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (reminder_text);
- gtk_box_pack_start (GTK_BOX (hbox38), reminder_text, TRUE, TRUE, 5);
-
- label74 = gtk_label_new (_("Options"));
- gtk_widget_set_name (label74, "label74");
- g_object_ref (label74);
- g_object_set_data_full (G_OBJECT (config_dialog), "label74", label74,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label74);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 3), label74);
-
- frame16 = gtk_frame_new (_("What do these options mean?"));
- gtk_widget_set_name (frame16, "frame16");
- g_object_ref (frame16);
- g_object_set_data_full (G_OBJECT (config_dialog), "frame16", frame16,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (frame16);
- gtk_container_add (GTK_CONTAINER (notebook1), frame16);
- gtk_container_set_border_width (GTK_CONTAINER (frame16), 10);
-
- scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL);
- gtk_widget_set_name (scrolledwindow1, "scrolledwindow1");
- g_object_ref (scrolledwindow1);
- g_object_set_data_full (G_OBJECT (config_dialog), "scrolledwindow1", scrolledwindow1,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (scrolledwindow1);
- gtk_container_add (GTK_CONTAINER (frame16), scrolledwindow1);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
-
- text1 = gtk_text_view_new();
- gtk_text_view_set_editable (GTK_TEXT_VIEW (text1), FALSE);
- text1buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW (text1));
- gtk_text_buffer_get_iter_at_offset (text1buffer, &iter, 0);
- gtk_widget_set_name (text1, "text1");
- g_object_ref (text1);
- g_object_set_data_full (G_OBJECT (config_dialog), "text1", text1,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (text1);
- gtk_container_add (GTK_CONTAINER (scrolledwindow1), text1);
- gtk_text_buffer_insert (text1buffer, &iter,
- _("\nTime\n Alarm at: \n The time for the alarm to come on.\n\n Quiet After: \n Stop alarm after this amount of time.\n (if the wakeup dialog is not closed)\n\n\nDays\n Day:\n Select the days for the alarm to activate.\n\n Time:\n Choose the time for the alarm on each day,\n or select the toggle button to use the default\n time.\n\n\nVolume\n Fading: \n Fade the volume up to the chosen volume \n for this amount of time.\n\n Start at: \n Start fading from this volume.\n\n Final: \n The volume to stop fading at. If the fading\n time is 0 then set volume to this and start\n playing.\n\n\nOptions:\n Additional Command:\n Run this command at the alarm time.\n\n Playlist: \n Load this playlist for playing songs from.\n If no playlist is given, the songs which are\n currently in the list will be used.\n The URL of an mp3/ogg stream can also be\n entered here.\n\n Reminder:\n Display a reminder when the alarm goes off,\n type the reminder in the box and turn on the\n toggle button if you want it to be shown.\n"), -1);
-
- label86 = gtk_label_new (_("Help"));
- gtk_widget_set_name (label86, "label86");
- g_object_ref (label86);
- g_object_set_data_full (G_OBJECT (config_dialog), "label86", label86,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (label86);
- gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 4), label86);
-
- dialog_action_area5 = gtk_dialog_get_action_area ((GtkDialog *) config_dialog);
- gtk_widget_set_name (dialog_action_area5, "dialog_action_area5");
- g_object_set_data (G_OBJECT (config_dialog), "dialog_action_area5", dialog_action_area5);
- gtk_widget_show (dialog_action_area5);
- gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area5), 10);
-
- hbox20 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_widget_set_name (hbox20, "hbox20");
- g_object_ref (hbox20);
- g_object_set_data_full (G_OBJECT (config_dialog), "hbox20", hbox20,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (hbox20);
- gtk_box_pack_start (GTK_BOX (dialog_action_area5), hbox20, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (hbox20), 10);
-
- ok_button = gtk_button_new_with_label (_("OK"));
- gtk_widget_set_name (ok_button, "ok_button");
- g_object_ref (ok_button);
- g_object_set_data_full (G_OBJECT (config_dialog), "ok_button", ok_button,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (ok_button);
- gtk_box_pack_start (GTK_BOX (hbox20), ok_button, FALSE, TRUE, 0);
- gtk_widget_set_can_default (ok_button, TRUE);
-
- cancel_button = gtk_button_new_with_label (_("Cancel"));
- gtk_widget_set_name (cancel_button, "cancel_button");
- g_object_ref (cancel_button);
- g_object_set_data_full (G_OBJECT (config_dialog), "cancel_button", cancel_button,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (cancel_button);
- gtk_box_pack_start (GTK_BOX (hbox20), cancel_button, FALSE, TRUE, 0);
- gtk_widget_set_can_default (cancel_button, TRUE);
-
- g_signal_connect (G_OBJECT (mon_def), "toggled",
- G_CALLBACK (on_mon_def_toggled),
- NULL);
- g_signal_connect (G_OBJECT (tue_def), "toggled",
- G_CALLBACK (on_tue_def_toggled),
- NULL);
- g_signal_connect (G_OBJECT (wed_def), "toggled",
- G_CALLBACK (on_wed_def_toggled),
- NULL);
- g_signal_connect (G_OBJECT (thu_def), "toggled",
- G_CALLBACK (on_thu_def_toggled),
- NULL);
- g_signal_connect (G_OBJECT (fri_def), "toggled",
- G_CALLBACK (on_fri_def_toggled),
- NULL);
- g_signal_connect (G_OBJECT (sat_def), "toggled",
- G_CALLBACK (on_sat_def_toggled),
- NULL);
- g_signal_connect (G_OBJECT (sun_def), "toggled",
- G_CALLBACK (on_sun_def_toggled),
- NULL);
- g_signal_connect (G_OBJECT (current_button), "clicked",
- G_CALLBACK (alarm_current_volume),
- NULL);
- g_signal_connect (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (alarm_save),
- NULL);
- g_signal_connect_swapped (G_OBJECT (ok_button), "clicked",
- G_CALLBACK (gtk_widget_destroy),
- G_OBJECT (config_dialog));
- g_signal_connect_swapped (G_OBJECT (cancel_button), "clicked",
- G_CALLBACK (gtk_widget_destroy),
- G_OBJECT (config_dialog));
-
- gtk_widget_grab_default (ok_button);
-
- return config_dialog;
+ if (response == GTK_RESPONSE_OK)
+ alarm_save ();
+
+ gtk_widget_destroy (dialog);
 }
 
-GtkWidget*
-create_reminder_dialog (gchar *reminder_msg)
+GtkWidget *create_config_dialog (void)
 {
- GtkWidget *reminder_dialog;
- GtkWidget *dialog_vbox6;
- GtkWidget *frame19;
- GtkWidget *reminder_entry;
- GtkWidget *dialog_action_area6;
- GtkWidget *button11;
-
- reminder_dialog = gtk_dialog_new ();
- gtk_widget_set_name (reminder_dialog, "reminder_dialog");
- g_object_set_data (G_OBJECT (reminder_dialog), "reminder_dialog", reminder_dialog);
- gtk_window_set_title (GTK_WINDOW (reminder_dialog), _("Reminder"));
-
- dialog_vbox6 = gtk_dialog_get_content_area ((GtkDialog *) reminder_dialog);
- gtk_widget_set_name (dialog_vbox6, "dialog_vbox6");
- g_object_set_data (G_OBJECT (reminder_dialog), "dialog_vbox6", dialog_vbox6);
- gtk_widget_show (dialog_vbox6);
-
- frame19 = gtk_frame_new (_("Your reminder for today is.."));
- gtk_widget_set_name (frame19, "frame19");
- g_object_ref (frame19);
- g_object_set_data_full (G_OBJECT (reminder_dialog), "frame19", frame19,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (frame19);
- gtk_box_pack_start (GTK_BOX (dialog_vbox6), frame19, TRUE, TRUE, 0);
- gtk_container_set_border_width (GTK_CONTAINER (frame19), 10);
-
- reminder_entry = gtk_entry_new ();
- gtk_widget_set_name (reminder_entry, "reminder_entry");
- g_object_ref (reminder_entry);
- g_object_set_data_full (G_OBJECT (reminder_dialog), "reminder_entry", reminder_entry,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (reminder_entry);
- gtk_container_add (GTK_CONTAINER (frame19), reminder_entry);
- gtk_editable_set_editable ((GtkEditable *) reminder_entry, FALSE);
- gtk_entry_set_text (GTK_ENTRY (reminder_entry), reminder_msg);
-
- dialog_action_area6 = gtk_dialog_get_action_area ((GtkDialog *) reminder_dialog);
- gtk_widget_set_name (dialog_action_area6, "dialog_action_area6");
- g_object_set_data (G_OBJECT (reminder_dialog), "dialog_action_area6", dialog_action_area6);
- gtk_widget_show (dialog_action_area6);
- gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area6), 10);
-
- button11 = gtk_button_new_with_label (_("Thankyou"));
- gtk_widget_set_name (button11, "button11");
- g_object_ref (button11);
- g_object_set_data_full (G_OBJECT (reminder_dialog), "button11", button11,
- (GDestroyNotify) g_object_unref);
- gtk_widget_show (button11);
- gtk_box_pack_start (GTK_BOX (dialog_action_area6), button11, FALSE, FALSE, 0);
-
- g_signal_connect_swapped (G_OBJECT (button11), "clicked",
- G_CALLBACK (gtk_widget_destroy),
- G_OBJECT(reminder_dialog));
-
- return reminder_dialog;
+ /* General */
+ GtkWidget *config_dialog, *content_area, *action_area, *notebook;
+ GtkWidget *vbox, *hbox, *label, *frame, *grid;
+ GtkAdjustment *adjustment;
+
+ /* Page 1 */
+ GtkWidget *alarm_h_spin, *alarm_m_spin;
+ GtkWidget *stop_checkb, *stop_h_spin, *stop_m_spin;
+
+ /* Page 2 */
+ gint i, j;
+ GtkWidget *checkbutton;
+ GtkWidget *widget[21];
+
+ const gchar *weekdays[] = { _("Monday"), _("Tuesday"), _("Wednesday"),
+ _("Thursday"), _("Friday"), _("Saturday"), _("Sunday") };
+
+ const gchar *day_cb[] = { "mon_cb", "tue_cb", "wed_cb", "thu_cb",
+ "fri_cb", "sat_cb", "sun_cb" };
+
+ const gchar *day_def[] = { "mon_def", "tue_def", "wed_def", "thu_def",
+ "fri_def", "sat_def", "sun_def", };
+
+ const gchar *day_h[] = { "mon_h", "tue_h", "wed_h", "thu_h",
+ "fri_h", "sat_h", "sun_h" };
+
+ const gchar *day_m[] = { "mon_m", "tue_m", "wed_m", "thu_m",
+ "fri_m", "sat_m", "sun_m" };
+
+ const GCallback cb_def[] = { G_CALLBACK (on_mon_def_toggled), G_CALLBACK (on_tue_def_toggled),
+ G_CALLBACK (on_wed_def_toggled), G_CALLBACK (on_thu_def_toggled),
+ G_CALLBACK (on_fri_def_toggled), G_CALLBACK (on_sat_def_toggled),
+ G_CALLBACK (on_sun_def_toggled) };
+
+ /* Page 3 */
+ GtkWidget *vbox2, *hbox2;
+ GtkWidget *fading_spin, *quiet_vol_scale, *vol_scale, *separator, *current_button;
+
+ /* Page 4 */
+ GtkWidget *cmd_entry, *playlist_entry, *reminder_text;
+ GtkWidget *cmd_checkb, *reminder_checkb, *file_chooser_button;
+
+ /* Page 5 */
+ GtkWidget *view, *scrolled_window;
+ GtkTextBuffer *text_buffer;
+ gchar *help_text;
+
+
+ /* General */
+ config_dialog = gtk_dialog_new_with_buttons (_("Alarm Settings"), NULL, GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_STOCK_OK, GTK_RESPONSE_OK, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL);
+ gtk_dialog_set_default_response (GTK_DIALOG (config_dialog), GTK_RESPONSE_OK);
+ action_area = gtk_dialog_get_action_area (GTK_DIALOG (config_dialog));
+ content_area = gtk_dialog_get_content_area (GTK_DIALOG (config_dialog));
+ gtk_container_set_border_width (GTK_CONTAINER (action_area), 12);
+ notebook = gtk_notebook_new ();
+ gtk_box_pack_start (GTK_BOX (content_area), notebook, TRUE, TRUE, 0);
+
+
+ /* Page 1 */
+ frame = gtk_frame_new (_("Time"));
+ gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 3);
+ gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
+ gtk_container_set_border_width (GTK_CONTAINER (grid), 5);
+
+ label = gtk_label_new (_("Alarm at (default):"));
+ gtk_widget_set_margin_right (label, 10);
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
+
+ adjustment = gtk_adjustment_new (6, 0, 23, 1, 10, 0);
+ alarm_h_spin = gtk_spin_button_new (adjustment, 1, 0);
+ g_object_set_data (G_OBJECT (config_dialog), "alarm_h_spin", alarm_h_spin);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (alarm_h_spin), GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (alarm_h_spin), TRUE);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (alarm_h_spin), TRUE);
+ gtk_grid_attach (GTK_GRID (grid), alarm_h_spin, 1, 0, 1, 1);
+
+ label = gtk_label_new (":");
+ gtk_grid_attach (GTK_GRID (grid), label, 2, 0, 1, 1);
+
+ adjustment = gtk_adjustment_new (30, 0, 59, 1, 10, 0);
+ alarm_m_spin = gtk_spin_button_new (adjustment, 1, 0);
+ g_object_set_data (G_OBJECT (config_dialog), "alarm_m_spin", alarm_m_spin);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (alarm_m_spin), GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (alarm_m_spin), TRUE);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (alarm_m_spin), TRUE);
+ gtk_grid_attach (GTK_GRID (grid), alarm_m_spin, 3, 0, 1, 1);
+
+ label = gtk_label_new (_("h"));
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+ gtk_grid_attach (GTK_GRID (grid), label, 4, 0, 1, 1);
+
+ stop_checkb = gtk_check_button_new_with_label (_("Quiet after:"));
+ g_object_set_data (G_OBJECT (config_dialog), "stop_checkb", stop_checkb);
+ gtk_widget_set_margin_right (stop_checkb, 10);
+ gtk_widget_set_valign (stop_checkb, GTK_ALIGN_CENTER);
+ gtk_grid_attach (GTK_GRID (grid), stop_checkb, 0, 1, 1, 1);
+
+ adjustment = gtk_adjustment_new (0, 0, 100, 1, 10, 0);
+ stop_h_spin = gtk_spin_button_new (adjustment, 1, 0);
+ g_object_set_data (G_OBJECT (config_dialog), "stop_h_spin", stop_h_spin);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (stop_h_spin), GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (stop_h_spin), TRUE);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_h_spin), TRUE);
+ gtk_grid_attach (GTK_GRID (grid), stop_h_spin, 1, 1, 1, 1);
+
+ label = gtk_label_new (_("hours"));
+ gtk_widget_set_margin_right (label, 10);
+ gtk_grid_attach (GTK_GRID (grid), label, 2, 1, 1, 1);
+
+ adjustment = gtk_adjustment_new (0, 0, 59, 1, 10, 0);
+ stop_m_spin = gtk_spin_button_new (adjustment, 1, 0);
+ g_object_set_data (G_OBJECT (config_dialog), "stop_m_spin", stop_m_spin);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (stop_m_spin), GTK_UPDATE_IF_VALID);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (stop_m_spin), TRUE);
+ gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (stop_m_spin), TRUE);
+ gtk_grid_attach (GTK_GRID (grid), stop_m_spin, 3, 1, 1, 1);
+
+ label = gtk_label_new (_("minutes"));
+ gtk_grid_attach (GTK_GRID (grid), label, 4, 1, 1, 1);
+ gtk_container_add (GTK_CONTAINER (frame), grid);
+
+ label = gtk_label_new (_("Time"));
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), frame, label);
+
+
+ /* Page 2 */
+ frame = gtk_frame_new (_("Choose the days for the alarm to come on"));
+ gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
+ grid = gtk_grid_new ();
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 15);
+ gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
+ gtk_container_set_border_width (GTK_CONTAINER (grid), 5);
+
+ label = gtk_label_new (_("Day"));
+ gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
+
+ label = gtk_label_new (_("Time"));
+ gtk_grid_attach (GTK_GRID (grid), label, 2, 0, 3, 1);
+
+ for (i = 0; i < 7; i ++)
+ {
+ widget[i] = gtk_check_button_new_with_label (weekdays[i]);
+ g_object_set_data (G_OBJECT (config_dialog), day_cb[i], widget[i]);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget[i]), TRUE);
+ gtk_widget_set_valign (widget[i], GTK_ALIGN_CENTER);
+ gtk_grid_attach (GTK_GRID (grid), widget[i], 0, i + 1, 1, 1);
+ }
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget[6]), FALSE);
+
+ for (i = 0; i < 7; i ++)
+ {
+ checkbutton = gtk_check_button_new_with_label (_("Default"));
+ g_object_set_data (G_OBJECT (config_dialog), day_def[i], checkbutton);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), TRUE);
+ gtk_widget_set_valign (checkbutton, GTK_ALIGN_CENTER);
+ g_signal_connect (checkbutton, "toggled", G_CALLBACK (cb_def[i]), NULL);
+ gtk_grid_attach (GTK_GRID (grid), checkbutton, 1, i + 1, 1, 1);
+ }
+
+ for (i = 7, j = 0; i < 14; i ++, j ++)
+ {
+ adjustment = gtk_adjustment_new (6, 0, 23, 1, 10, 0);
+ widget[i] = gtk_spin_button_new (adjustment, 1, 0);
+ g_object_set_data (G_OBJECT (config_dialog), day_h[j], widget[i]);
+ gtk_grid_attach (GTK_GRID (grid), widget[i], 2, j + 1, 1, 1);
+ }
+
+ for (i = 0; i < 7; i ++)
+ {
+ label = gtk_label_new (":");
+ gtk_grid_attach (GTK_GRID (grid), label, 3, i + 1, 1, 1);
+ }
+
+ for (i = 14, j = 0; i < 21; i ++, j ++)
+ {
+ adjustment = gtk_adjustment_new (30, 0, 59, 1, 10, 0);
+ widget[i] = gtk_spin_button_new (adjustment, 1, 0);
+ g_object_set_data (G_OBJECT (config_dialog), day_m[j], widget[i]);
+ gtk_grid_attach (GTK_GRID (grid), widget[i], 4, j + 1, 1, 1);
+ }
+
+ label = gtk_label_new (_("Days"));
+ gtk_container_add (GTK_CONTAINER (frame), grid);
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), frame, label);
+
+
+ /* Page 3 */
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+
+ frame = gtk_frame_new (_("Fading"));
+ gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+ adjustment = gtk_adjustment_new (120, 0, 3600, 1, 10, 0);
+ fading_spin = gtk_spin_button_new (adjustment, 1, 0);
+ g_object_set_data (G_OBJECT (config_dialog), "fading_spin", fading_spin);
+ gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (fading_spin), TRUE);
+ gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (fading_spin), GTK_UPDATE_IF_VALID);
+ label = gtk_label_new (_("seconds"));
+
+ gtk_container_add (GTK_CONTAINER (hbox), fading_spin);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 3);
+ gtk_container_add (GTK_CONTAINER (frame), hbox);
+ gtk_container_add (GTK_CONTAINER (vbox), frame);
+
+ frame = gtk_frame_new (_("Volume"));
+ vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
+
+ label = gtk_label_new (_("Start at"));
+ gtk_widget_set_margin_bottom (label, 2);
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+ gtk_container_add (GTK_CONTAINER (vbox2), label);
+
+ quiet_vol_scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, gtk_adjustment_new (20, 0, 100, 1, 5, 0));
+ g_object_set_data (G_OBJECT (config_dialog), "quiet_vol_scale", quiet_vol_scale);
+ gtk_scale_set_value_pos (GTK_SCALE (quiet_vol_scale), GTK_POS_RIGHT);
+ gtk_scale_set_digits (GTK_SCALE (quiet_vol_scale), 0);
+ label = gtk_label_new ("%");
+ hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ gtk_box_pack_start (GTK_BOX (hbox2), quiet_vol_scale, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (hbox2), label);
+ gtk_container_add (GTK_CONTAINER (vbox2), hbox2);
+
+ separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_box_pack_start (GTK_BOX (vbox2), separator, FALSE, FALSE, 10);
+
+ label = gtk_label_new (_("Final"));
+ gtk_widget_set_margin_bottom (label, 2);
+ gtk_widget_set_halign (label, GTK_ALIGN_START);
+ gtk_container_add (GTK_CONTAINER (vbox2), label);
+
+ vol_scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, gtk_adjustment_new (80, 0, 100, 1, 5, 0));
+ g_object_set_data (G_OBJECT (config_dialog), "vol_scale", vol_scale);
+ gtk_scale_set_value_pos (GTK_SCALE (vol_scale), GTK_POS_RIGHT);
+ gtk_scale_set_digits (GTK_SCALE (vol_scale), 0);
+ label = gtk_label_new ("%");
+ hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ gtk_box_pack_start (GTK_BOX (hbox2), vol_scale, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (hbox2), label);
+ gtk_container_add (GTK_CONTAINER (vbox2), hbox2);
+
+ current_button = gtk_button_new_with_label (_("Current"));
+ gtk_widget_set_margin_top (current_button, 10);
+ gtk_widget_set_halign (current_button, GTK_ALIGN_END);
+ g_signal_connect (current_button, "clicked", G_CALLBACK (alarm_current_volume), NULL);
+ gtk_container_add (GTK_CONTAINER (vbox2), current_button);
+
+ gtk_container_add (GTK_CONTAINER (frame), vbox2);
+ gtk_container_add (GTK_CONTAINER (vbox), frame);
+
+ label = gtk_label_new (_("Volume"));
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+
+
+ /* Page 4 */
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ frame = gtk_frame_new (_("Additional Command"));
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+ gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+ cmd_entry = gtk_entry_new ();
+ g_object_set_data (G_OBJECT (config_dialog), "cmd_entry", cmd_entry);
+ cmd_checkb = gtk_check_button_new_with_label (_("enable"));
+ g_object_set_data (G_OBJECT (config_dialog), "cmd_checkb", cmd_checkb);
+ gtk_box_pack_start (GTK_BOX (hbox), cmd_entry, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (hbox), cmd_checkb);
+ gtk_container_add (GTK_CONTAINER (frame), hbox);
+ gtk_container_add (GTK_CONTAINER (vbox), frame);
+
+ frame = gtk_frame_new (_("Playlist (optional)"));
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+ gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+ playlist_entry = gtk_entry_new ();
+ g_object_set_data (G_OBJECT (config_dialog), "playlist", playlist_entry);
+
+ file_chooser_button = gtk_file_chooser_button_new (_("Select a playlist"), GTK_FILE_CHOOSER_ACTION_OPEN);
+ gtk_widget_set_valign (file_chooser_button, GTK_ALIGN_CENTER);
+ g_signal_connect (file_chooser_button, "file-set", G_CALLBACK (file_set_cb), playlist_entry);
+ gtk_box_pack_start (GTK_BOX (hbox), playlist_entry, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (hbox), file_chooser_button);
+ gtk_container_add (GTK_CONTAINER (frame), hbox);
+ gtk_container_add (GTK_CONTAINER (vbox), frame);
+
+ frame = gtk_frame_new (_("Reminder"));
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+ gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
+ reminder_checkb = gtk_check_button_new_with_label (_("Use reminder"));
+ g_object_set_data (G_OBJECT (config_dialog), "reminder_cb", reminder_checkb);
+ reminder_text = gtk_entry_new ();
+ g_object_set_data (G_OBJECT (config_dialog), "reminder_text", reminder_text);
+ gtk_container_add (GTK_CONTAINER (hbox), reminder_checkb);
+ gtk_box_pack_end (GTK_BOX (hbox), reminder_text, TRUE, TRUE, 0);
+ gtk_container_add (GTK_CONTAINER (frame), hbox);
+ gtk_container_add (GTK_CONTAINER (vbox), frame);
+
+ label = gtk_label_new (_("Options"));
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, label);
+
+
+ /* Page 5 */
+ frame = gtk_frame_new (_("What do these options mean?"));
+ gtk_container_set_border_width (GTK_CONTAINER (frame), 10);
+ view = gtk_text_view_new ();
+ gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
+ gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+ text_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+ help_text = g_strconcat (_(help[0]), _(help[1]), _(help[2]), NULL);
+ gtk_text_buffer_set_text (text_buffer, help_text, -1);
+ g_free (help_text);
+ scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+ gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 5);
+ gtk_container_add (GTK_CONTAINER (scrolled_window), view);
+ gtk_container_add (GTK_CONTAINER (frame), GTK_WIDGET (scrolled_window));
+
+ label = gtk_label_new (_("Help"));
+ gtk_notebook_append_page (GTK_NOTEBOOK (notebook), frame, label);
+
+ g_signal_connect (config_dialog, "response", G_CALLBACK (config_dialog_response), NULL);
+
+ gtk_widget_show_all (config_dialog);
+
+ return config_dialog;
 }
-
-/*
- * vi:ai:expandtab:ts=2 sts=2 shiftwidth=2:nowrap:
- */

audacious-plugins-3.3.4.tar.bz2/src/alarm/interface.h -> audacious-plugins-3.4.2.tar.bz2/src/alarm/interface.h Changed

audacious-plugins-3.3.4.tar.bz2/src/albumart/albumart.c -> audacious-plugins-3.4.2.tar.bz2/src/albumart/albumart.c Changed

@@ -1,105 +1,146 @@
 /*
- * Copyright (c) 2011 William Pitcock <nenolod@dereferenced.org>.
+ * albumart.c
+ * Copyright 2012 John Lindgren
 *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
 *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
 */
 
-#include <gtk/gtk.h>
-
-#include <audacious/debug.h>
 #include <audacious/drct.h>
 #include <audacious/i18n.h>
-#include <audacious/misc.h>
-#include <audacious/playlist.h>
 #include <audacious/plugin.h>
 #include <libaudcore/hook.h>
-#include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
-#include "config.h"
+static void album_set_unscaled (GtkWidget * widget, GdkPixbuf * unscaled)
+{
+ GdkPixbuf * old;
+
+ if ((old = g_object_get_data ((GObject *) widget, "pixbux-unscaled")))
+ g_object_unref (old);
+ if ((old = g_object_get_data ((GObject *) widget, "pixbux-scaled")))
+ g_object_unref (old);
 
-static gint width;
-static gint height;
+ g_object_set_data ((GObject *) widget, "pixbuf-unscaled", unscaled);
+ g_object_set_data ((GObject *) widget, "pixbuf-scaled", NULL);
 
-static gboolean draw_event (GtkWidget * widget, cairo_t * cr, void * unused)
+ gtk_widget_queue_draw (widget);
+}
+
+static GdkPixbuf * album_get_scaled (GtkWidget * widget, int maxwidth, int maxheight)
 {
- GdkPixbuf *album = NULL;
+ GdkPixbuf * unscaled = g_object_get_data ((GObject *) widget, "pixbuf-unscaled");
+ if (! unscaled)
+ return NULL;
+
+ int width = gdk_pixbuf_get_width (unscaled);
+ int height = gdk_pixbuf_get_height (unscaled);
 
- if (aud_drct_get_playing() && album == NULL)
+ if (width > maxwidth || height > maxheight)
 {
- album = audgui_pixbuf_for_current ();
- g_return_val_if_fail (album != NULL, TRUE);
- if (gdk_pixbuf_get_width(album) > width ||
- gdk_pixbuf_get_height(album) > height)
- audgui_pixbuf_scale_within(&album, width < height ? width : height);
+ if (width * maxheight > height * maxwidth)
+ {
+ height = height * maxwidth / width;
+ width = maxwidth;
+ }
+ else
+ {
+ width = width * maxheight / height;
+ height = maxheight;
+ }
 }
 
- if (album != NULL)
+ GdkPixbuf * scaled = g_object_get_data ((GObject *) widget, "pixbuf-scaled");
+ if (scaled)
 {
- double x = (width - gdk_pixbuf_get_width(album)) / 2;
- double y = (height - gdk_pixbuf_get_height(album)) / 2;
+ if (gdk_pixbuf_get_width (scaled) == width &&
+ gdk_pixbuf_get_height (scaled) == height)
+ return scaled;
 
- gdk_cairo_set_source_pixbuf(cr, album, x, y);
- cairo_paint_with_alpha(cr, 1.0);
+ g_object_unref (scaled);
 }
 
- if (album != NULL)
- g_object_unref(album);
-
- return TRUE;
+ scaled = gdk_pixbuf_scale_simple (unscaled, width, height, GDK_INTERP_BILINEAR);
+ g_object_set_data ((GObject *) widget, "pixbuf-scaled", scaled);
+ return scaled;
 }
 
-static gboolean configure_event (GtkWidget * widget, GdkEventConfigure * event)
+static bool_t album_draw (GtkWidget * widget, cairo_t * cr)
 {
- width = event->width;
- height = event->height;
- gtk_widget_queue_draw(widget);
+ GdkRectangle rect;
+ gtk_widget_get_allocation (widget, & rect);
+
+ GdkPixbuf * scaled = album_get_scaled (widget, rect.width, rect.height);
+ if (! scaled)
+ return TRUE;
 
+ int x = (rect.width - gdk_pixbuf_get_width (scaled)) / 2;
+ int y = (rect.height - gdk_pixbuf_get_height (scaled)) / 2;
+
+ gdk_cairo_set_source_pixbuf (cr, scaled, x, y);
+ cairo_paint (cr);
 return TRUE;
 }
 
-static void playback_start (gpointer data, GtkWidget *area)
+static bool_t album_configure (GtkWidget * widget, GdkEventConfigure * event)
 {
- gtk_widget_queue_draw(area);
+ gtk_widget_queue_draw (widget);
+ return TRUE;
 }
 
-static /* GtkWidget * */ gpointer get_widget (void)
+static void album_update (void * unused, GtkWidget * widget)
 {
- GtkWidget *area = gtk_drawing_area_new();
-
- g_signal_connect(area, "draw", (GCallback) draw_event, NULL);
- g_signal_connect(area, "configure-event", (GCallback) configure_event, NULL);
+ if (! aud_drct_get_playing ())
+ return;
 
- hook_associate("playback begin", (HookFunction) playback_start, area);
+ GdkPixbuf * unscaled = audgui_pixbuf_request_current ();
+ album_set_unscaled (widget, unscaled ? unscaled : audgui_pixbuf_fallback ());
+ gtk_widget_queue_draw (widget);
+}
 
- gtk_widget_set_size_request(area, 128, 128);
+static void album_clear (void * unused, GtkWidget * widget)
+{
+ album_set_unscaled (widget, NULL);
+ gtk_widget_queue_draw (widget);
+}
 
- return area;
+static void album_cleanup (GtkWidget * widget)
+{
+ hook_dissociate_full ("playback begin", (HookFunction) album_update, widget);
+ hook_dissociate_full ("current art ready", (HookFunction) album_update, widget);
+ hook_dissociate_full ("playback stop", (HookFunction) album_clear, widget);
 }
 
-static void cleanup(void)
+static void * album_get_widget (void)
 {
- hook_dissociate("playback begin", (HookFunction) playback_start);
+ GtkWidget * widget = gtk_drawing_area_new ();
+ gtk_widget_set_size_request (widget, 96, 96);
+
+ g_signal_connect (widget, "draw", (GCallback) album_draw, NULL);
+ g_signal_connect (widget, "configure-event", (GCallback) album_configure, NULL);
+ g_signal_connect (widget, "destroy", (GCallback) album_cleanup, NULL);
+
+ hook_associate ("playback begin", (HookFunction) album_update, widget);
+ hook_associate ("current art ready", (HookFunction) album_update, widget);
+ hook_associate ("playback stop", (HookFunction) album_clear, widget);
+
+ return widget;
 }
 
 AUD_GENERAL_PLUGIN
 (
 .name = N_("Album Art"),
 .domain = PACKAGE,
- .cleanup = cleanup,
- .get_widget = get_widget
+ .get_widget = album_get_widget
 )

audacious-plugins-3.3.4.tar.bz2/src/alsa/alsa.c -> audacious-plugins-3.4.2.tar.bz2/src/alsa/alsa.c Changed

@@ -69,7 +69,6 @@
 } while (0)
 
 static snd_pcm_t * alsa_handle;
-static char alsa_initted;
 static pthread_mutex_t alsa_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t alsa_cond = PTHREAD_COND_INITIALIZER;
 
@@ -279,34 +278,17 @@
 
 int alsa_init (void)
 {
-    alsa_handle = NULL;
-    alsa_initted = 0;
+    AUDDBG ("Initialize.\n");
+    alsa_config_load ();
+    alsa_open_mixer ();
     return 1;
 }
 
-void alsa_soft_init (void)
-{
-    pthread_mutex_lock (& alsa_mutex);
-
-    if (! alsa_initted)
-    {
-        AUDDBG ("Initialize.\n");
-        alsa_config_load ();
-        alsa_open_mixer ();
-        alsa_initted = 1;
-    }
-
-    pthread_mutex_unlock (& alsa_mutex);
-}
-
 void alsa_cleanup (void)
 {
-    if (alsa_initted)
-    {
-        AUDDBG ("Cleanup.\n");
-        alsa_close_mixer ();
-        alsa_config_save ();
-    }
+    AUDDBG ("Cleanup.\n");
+    alsa_close_mixer ();
+    alsa_config_save ();
 }
 
 static int convert_aud_format (int aud_format)
@@ -345,7 +327,6 @@
 
 int alsa_open_audio (int aud_format, int rate, int channels)
 {
-    alsa_soft_init ();
     pthread_mutex_lock (& alsa_mutex);
 
     assert (alsa_handle == NULL);
@@ -661,7 +642,6 @@
 
 void alsa_get_volume (int * left, int * right)
 {
-    alsa_soft_init ();
     pthread_mutex_lock (& alsa_mutex);
 
     long left_l = 0, right_l = 0;
@@ -718,7 +698,6 @@
 
 void alsa_set_volume (int left, int right)
 {
-    alsa_soft_init ();
     pthread_mutex_lock (& alsa_mutex);
 
     if (alsa_mixer == NULL)

audacious-plugins-3.3.4.tar.bz2/src/alsa/alsa.h -> audacious-plugins-3.4.2.tar.bz2/src/alsa/alsa.h Changed

audacious-plugins-3.3.4.tar.bz2/src/alsa/config.c -> audacious-plugins-3.4.2.tar.bz2/src/alsa/config.c Changed

@@ -26,8 +26,6 @@
 #include <libaudgui/libaudgui-gtk.h>
 
 #include "alsa.h"
-#include "config.h"
-
 char * alsa_config_pcm = NULL, * alsa_config_mixer = NULL,
 * alsa_config_mixer_element = NULL;
 int alsa_config_drain_workaround = 1;
@@ -207,6 +205,10 @@
 
 static void pcm_list_fill (void)
 {
+ if (pcm_list)
+ return;
+
+ pcm_list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
 pcm_found ("default", _("Default PCM device"));
 get_defined_devices ("pcm", 0, pcm_found);
 get_cards (pcm_card_found);
@@ -232,6 +234,10 @@
 
 static void mixer_list_fill (void)
 {
+ if (mixer_list)
+ return;
+
+ mixer_list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
 mixer_found ("default", _("Default mixer device"));
 get_defined_devices ("ctl", 0, mixer_found);
 get_cards (mixer_card_found);
@@ -273,33 +279,22 @@
 
 static void mixer_element_list_fill (void)
 {
+ if (mixer_element_list)
+ return;
+
+ mixer_element_list = gtk_list_store_new (1, G_TYPE_STRING);
 get_mixer_elements (alsa_config_mixer, mixer_element_found);
 }
 
-static void fill_lists (void)
+static void mixer_element_list_refill (void)
 {
- if (! pcm_list)
- {
- pcm_list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
- pcm_list_fill ();
- }
-
- if (! mixer_list)
- {
- mixer_list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
- mixer_list_fill ();
- }
-
- if (! mixer_element_list)
- {
- mixer_element_list = gtk_list_store_new (1, G_TYPE_STRING);
- mixer_element_list_fill ();
- }
+ gtk_list_store_clear (mixer_element_list);
+ get_mixer_elements (alsa_config_mixer, mixer_element_found);
 }
 
 static void guess_mixer_element (void)
 {
- fill_lists ();
+ mixer_element_list_fill ();
 
 static const char * guesses[] = {"Master", "PCM", "Wave"};
 for (int count = 0; count < G_N_ELEMENTS (guesses); count ++)
@@ -475,8 +470,7 @@
 free (alsa_config_mixer);
 alsa_config_mixer = strdup (new);
 
- gtk_list_store_clear (mixer_element_list);
- mixer_element_list_fill ();
+ mixer_element_list_refill ();
 guess_mixer_element ();
 combo_select_by_text (mixer_element_combo, mixer_element_list,
 alsa_config_mixer_element);
@@ -526,19 +520,22 @@
 
 void alsa_configure (void)
 {
- alsa_soft_init ();
-
 if (window != NULL)
 {
 gtk_window_present ((GtkWindow *) window);
 return;
 }
 
- fill_lists ();
+ pcm_list_fill ();
+ mixer_list_fill ();
+ mixer_element_list_fill ();
+
 create_window ();
+
 combo_select_by_text (pcm_combo, pcm_list, alsa_config_pcm);
 combo_select_by_text (mixer_combo, mixer_list, alsa_config_mixer);
 combo_select_by_text (mixer_element_combo, mixer_element_list,
 alsa_config_mixer_element);
+
 connect_callbacks ();
 }

audacious-plugins-3.3.4.tar.bz2/src/alsa/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/alsa/plugin.c Changed

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/Makefile -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/Makefile Changed

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/amidi-plug.c -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/amidi-plug.c Changed

@@ -19,153 +19,132 @@
 */
 
 #include <pthread.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include <audacious/drct.h>
+#include <audacious/i18n.h>
 #include <audacious/misc.h>
 #include <audacious/plugin.h>
-#include <libaudcore/hook.h>
 
-#include "amidi-plug.h"
+#include "i_backend.h"
+#include "i_common.h"
+#include "i_configure.h"
+#include "i_fileinfo.h"
+#include "i_midi.h"
+#include "i_utils.h"
+
+enum
+{
+ AMIDIPLUG_STOP,
+ AMIDIPLUG_PLAY,
+ AMIDIPLUG_PAUSE,
+ AMIDIPLUG_ERR
+};
 
 static void amidiplug_play_loop (InputPlayback * playback);
 
-static gboolean amidiplug_play (InputPlayback * playback, const gchar *
- filename_uri, VFSFile * file, gint start_time, gint stop_time, gboolean pause);
-static void amidiplug_pause (InputPlayback * playback, gboolean paused);
-static void amidiplug_mseek (InputPlayback * playback, gint time);
-static Tuple * amidiplug_get_song_tuple (const gchar * filename_uri, VFSFile *
- file);
+static bool_t amidiplug_play (InputPlayback * playback, const char *
+ filename_uri, VFSFile * file, int start_time, int stop_time, bool_t pause);
+static void amidiplug_pause (InputPlayback * playback, bool_t paused);
+static void amidiplug_mseek (InputPlayback * playback, int time);
+static Tuple * amidiplug_get_song_tuple (const char * filename_uri, VFSFile * file);
+static void amidiplug_skipto (int playing_tick);
 
-AUD_INPUT_PLUGIN
-(
- .name = N_("AMIDI-Plug (MIDI Player)"),
- .domain = PACKAGE,
- .init = amidiplug_init,
- .about = amidiplug_aboutbox,
- .configure = amidiplug_configure,
- .play = amidiplug_play,
- .stop = amidiplug_stop,
- .pause = amidiplug_pause,
- .mseek = amidiplug_mseek,
- .get_time = amidiplug_get_time,
- .get_volume = amidiplug_get_volume,
- .set_volume = amidiplug_set_volume,
- .cleanup = amidiplug_cleanup,
- .probe_for_tuple = amidiplug_get_song_tuple,
- .file_info_box = amidiplug_file_info_box,
- .is_our_file_from_vfs = amidiplug_is_our_file_from_vfs,
- .extensions = amidiplug_vfs_extensions,
-)
+static int amidiplug_playing_status = AMIDIPLUG_STOP;
+
+static midifile_t midifile;
+
+static const char * const amidiplug_vfs_extensions[] = {"mid", "midi", "rmi",
+ "rmid", NULL
+ };
 
 static pthread_mutex_t control_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t control_cond = PTHREAD_COND_INITIALIZER;
 static pthread_mutex_t audio_control_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-static gboolean initted;
-static gint seek_time;
+/* also used in i_configure.c */
+amidiplug_sequencer_backend_t * backend;
+
+static int seek_time;
 
 static pthread_t audio_thread;
-static gboolean audio_stop_flag;
-static gint audio_seek_time;
+static bool_t audio_stop_flag;
+static int audio_seek_time;
 
-static volatile gint current_time = -1;
+static volatile int current_time = -1;
 
-static gboolean amidiplug_init (void)
+static void amidiplug_cleanup (void)
 {
- initted = FALSE;
- return TRUE;
+ if (backend)
+ i_backend_unload (backend);
+
+ i_configure_cfg_ap_free ();
+ i_configure_cfg_backend_free ();
 }
 
-static void soft_init (void)
+static bool_t amidiplug_init (void)
 {
- pthread_mutex_lock (& control_mutex);
+ i_configure_cfg_ap_read ();
+ i_configure_cfg_backend_read ();
 
- if (! initted)
- {
- i_configure_cfg_ap_read ();
- i_backend_load (amidiplug_cfg_ap.ap_seq_backend);
+ backend = i_backend_load (amidiplug_cfg_ap->ap_seq_backend);
 
- initted = TRUE;
+ if (! backend)
+ {
+ amidiplug_cleanup ();
+ return FALSE;
 }
 
- pthread_mutex_unlock (& control_mutex);
-}
-
-static void amidiplug_cleanup (void)
-{
- if (initted)
- i_backend_unload ();
+ return TRUE;
 }
 
-static gint amidiplug_is_our_file_from_vfs( const gchar *filename_uri , VFSFile *fp )
+static int amidiplug_is_our_file_from_vfs (const char * filename_uri, VFSFile * fp)
 {
- gchar magic_bytes[4];
+ char magic_bytes[4];
 
- soft_init ();
+ if (fp == NULL)
+ return FALSE;
 
- if ( fp == NULL )
- return FALSE;
-
- if ( VFS_FREAD( magic_bytes , 1 , 4 , fp ) != 4 )
- return FALSE;
+ if (vfs_fread (magic_bytes, 1, 4, fp) != 4)
+ return FALSE;
 
- if ( !strncmp( magic_bytes , "MThd" , 4 ) )
- {
- DEBUGMSG( "MIDI found, %s is a standard midi file\n" , filename_uri );
- return TRUE;
- }
-
- if ( !strncmp( magic_bytes , "RIFF" , 4 ) )
- {
- /* skip the four bytes after RIFF,
- then read the next four */
- if ( VFS_FSEEK( fp , 4 , SEEK_CUR ) != 0 )
- return FALSE;
-
- if ( VFS_FREAD( magic_bytes , 1 , 4 , fp ) != 4 )
- return FALSE;
-
- if ( !strncmp( magic_bytes , "RMID" , 4 ) )
+ if (!strncmp (magic_bytes, "MThd", 4))
 {
- DEBUGMSG( "MIDI found, %s is a riff midi file\n" , filename_uri );
- return TRUE;
+ DEBUGMSG ("MIDI found, %s is a standard midi file\n", filename_uri);
+ return TRUE;
 }
- }
-
- return FALSE;
-}
-
-static void amidiplug_configure (void)
-{
- soft_init ();
- i_configure_gui ();
-}
 
+ if (!strncmp (magic_bytes, "RIFF", 4))
+ {
+ /* skip the four bytes after RIFF,
+ then read the next four */
+ if (vfs_fseek (fp, 4, SEEK_CUR) != 0)
+ return FALSE;
 
-static void amidiplug_aboutbox( void )
-{
- i_about_gui();
-}
+ if (vfs_fread (magic_bytes, 1, 4, fp) != 4)
+ return FALSE;
 
+ if (!strncmp (magic_bytes, "RMID", 4))
+ {
+ DEBUGMSG ("MIDI found, %s is a riff midi file\n", filename_uri);
+ return TRUE;
+ }
+ }
 
-static void amidiplug_file_info_box (const gchar * filename)
-{
- soft_init ();
- i_fileinfo_gui (filename);
+ return FALSE;
 }
 
-
-static void amidiplug_stop( InputPlayback * playback )
+static void amidiplug_stop (InputPlayback * playback)
 {
- DEBUGMSG( "STOP request at tick: %i\n" , midifile.playing_tick );
+ DEBUGMSG ("STOP request at tick: %i\n", midifile.playing_tick);
 
- pthread_mutex_lock (& control_mutex);
- amidiplug_playing_status = AMIDIPLUG_STOP;
- pthread_cond_broadcast (& control_cond);
- pthread_mutex_unlock (& control_mutex);
+ pthread_mutex_lock (& control_mutex);
+ amidiplug_playing_status = AMIDIPLUG_STOP;
+ pthread_cond_broadcast (& control_cond);
+ pthread_mutex_unlock (& control_mutex);
 }
 
-static void amidiplug_pause (InputPlayback * playback, gboolean paused)
+static void amidiplug_pause (InputPlayback * playback, bool_t paused)
 {
 pthread_mutex_lock (& control_mutex);
 amidiplug_playing_status = paused ? AMIDIPLUG_PAUSE : AMIDIPLUG_PLAY;
@@ -173,7 +152,7 @@
 pthread_mutex_unlock (& control_mutex);
 }
 
-static void amidiplug_mseek (InputPlayback * playback, gint time)
+static void amidiplug_mseek (InputPlayback * playback, int time)
 {
 pthread_mutex_lock (& control_mutex);
 seek_time = time;
@@ -181,181 +160,186 @@
 pthread_mutex_unlock (& control_mutex);
 }
 
-static gint amidiplug_get_time (InputPlayback * playback)
+static int amidiplug_get_time (InputPlayback * playback)
 {
 return current_time;
 }
 
-static gint amidiplug_get_volume( gint * l_p , gint * r_p )
+static int amidiplug_get_volume (int * l_p, int * r_p)
 {
- if ( backend.autonomous_audio == TRUE )
- {
- backend.audio_volume_get( l_p , r_p );
- return 1;
- }
- return 0;
+ if (backend->autonomous_audio == TRUE)
+ {
+ backend->audio_volume_get (l_p, r_p);
+ return 1;
+ }
+
+ return 0;
 }
 
 
-static gint amidiplug_set_volume( gint l , gint r )
+static int amidiplug_set_volume (int l, int r)
 {
- if ( backend.autonomous_audio == TRUE )
- {
- backend.audio_volume_set( l , r );
- return 1;
- }
- return 0;
+ if (backend->autonomous_audio == TRUE)
+ {
+ backend->audio_volume_set (l, r);
+ return 1;
+ }
+
+ return 0;
 }
 
 
-static Tuple * amidiplug_get_song_tuple (const gchar * filename_uri, VFSFile *
- file)
+static Tuple * amidiplug_get_song_tuple (const char * filename_uri, VFSFile *
+ file)
 {
- /* song title, get it from the filename */
- Tuple *tuple = tuple_new_from_filename(filename_uri);
- midifile_t mf;
-
- soft_init ();
+ /* song title, get it from the filename */
+ Tuple * tuple = tuple_new_from_filename (filename_uri);
+ midifile_t mf;
 
- if ( i_midi_parse_from_filename( filename_uri , &mf ) )
- tuple_set_int(tuple, FIELD_LENGTH, NULL, mf.length / 1000);
+ if (i_midi_parse_from_filename (filename_uri, &mf))
+ tuple_set_int (tuple, FIELD_LENGTH, NULL, mf.length / 1000);
 
- i_midi_free( &mf );
+ i_midi_free (&mf);
 
- return tuple;
+ return tuple;
 }
 
 
-static gboolean amidiplug_play (InputPlayback * playback, const gchar *
- filename_uri, VFSFile * file, gint start_time, gint stop_time, gboolean pause)
+static bool_t amidiplug_play (InputPlayback * playback, const char *
+ filename_uri, VFSFile * file, int start_time, int stop_time, bool_t pause)
 {
- g_return_val_if_fail (file != NULL, FALSE);
-
- gint port_count = 0;
- gint au_samplerate = -1, au_bitdepth = -1, au_channels = -1;
-
- soft_init ();
-
- if ( backend.gmodule == NULL )
- {
- g_warning( "No sequencer backend selected\n" );
- /* not usable, cause now amidiplug_play is in a different thread
- i_message_gui( _("AMIDI-Plug - warning") ,
- _("No sequencer backend has been selected!\nPlease configure AMIDI-Plug before playing.") ,
- AMIDIPLUG_MESSAGE_WARN , NULL , TRUE );
- */
- amidiplug_playing_status = AMIDIPLUG_ERR;
- return FALSE;
- }
-
- /* get information about audio from backend, if available */
- backend.audio_info_get( &au_channels , &au_bitdepth , &au_samplerate );
- DEBUGMSG( "PLAY requested, audio details: channels -> %i , bitdepth -> %i , samplerate -> %i\n" ,
- au_channels , au_bitdepth , au_samplerate );
-
- if ( backend.autonomous_audio == FALSE )
- {
- DEBUGMSG( "PLAY requested, opening audio output plugin\n" );
- playback->output->open_audio( FMT_S16_NE , au_samplerate , au_channels );
- }
-
- DEBUGMSG( "PLAY requested, midifile init\n" );
- /* midifile init */
- i_midi_init( &midifile );
-
- /* get the number of selected ports */
- port_count = backend.seq_get_port_count();
- if ( port_count < 1 )
- {
- aud_interface_show_error (_("You have not selected any sequencer ports for "
- "MIDI playback. You can do so in the MIDI plugin preferences."));
- amidiplug_playing_status = AMIDIPLUG_ERR;
- return FALSE;
- }
+ g_return_val_if_fail (file != NULL, FALSE);
 
- DEBUGMSG( "PLAY requested, opening file: %s\n" , filename_uri );
- midifile.file_pointer = file;
- midifile.file_name = g_strdup(filename_uri);
+ int port_count = 0;
+ int au_samplerate = -1, au_bitdepth = -1, au_channels = -1;
 
- switch( i_midi_file_read_id( &midifile ) )
- {
- case MAKE_ID('R', 'I', 'F', 'F'):
+ if (backend->gmodule == NULL)
 {
- DEBUGMSG( "PLAY requested, RIFF chunk found, processing...\n" );
- /* read riff chunk */
- if ( !i_midi_file_parse_riff( &midifile ) )
- WARNANDBREAKANDPLAYERR( "%s: invalid file format (riff parser)\n" , filename_uri );
+ g_warning ("No sequencer backend selected\n");
+ /* not usable, cause now amidiplug_play is in a different thread
+ i_message_gui( _("AMIDI-Plug - warning"),
+ _("No sequencer backend has been selected!\nPlease configure AMIDI-Plug before playing."),
+ AMIDIPLUG_MESSAGE_WARN, NULL, TRUE );
+ */
+ amidiplug_playing_status = AMIDIPLUG_ERR;
+ return FALSE;
+ }
+
+ /* get information about audio from backend, if available */
+ backend->audio_info_get (&au_channels, &au_bitdepth, &au_samplerate);
+ DEBUGMSG ("PLAY requested, audio details: channels -> %i, bitdepth -> %i, samplerate -> %i\n",
+ au_channels, au_bitdepth, au_samplerate);
 
- /* if that was read correctly, go ahead and read smf data */
+ if (backend->autonomous_audio == FALSE)
+ {
+ DEBUGMSG ("PLAY requested, opening audio output plugin\n");
+ playback->output->open_audio (FMT_S16_NE, au_samplerate, au_channels);
 }
 
- case MAKE_ID('M', 'T', 'h', 'd'):
+ DEBUGMSG ("PLAY requested, midifile init\n");
+ /* midifile init */
+ i_midi_init (&midifile);
+
+ /* get the number of selected ports */
+ port_count = backend->seq_get_port_count();
+
+ if (port_count < 1)
 {
- DEBUGMSG( "PLAY requested, MThd chunk found, processing...\n" );
- if ( !i_midi_file_parse_smf( &midifile , port_count ) )
- WARNANDBREAKANDPLAYERR( "%s: invalid file format (smf parser)\n" , filename_uri );
-
- if ( midifile.time_division < 1 )
- WARNANDBREAKANDPLAYERR( "%s: invalid time division (%i)\n" , filename_uri , midifile.time_division );
-
- DEBUGMSG( "PLAY requested, setting ppq and tempo...\n" );
- /* fill midifile.ppq and midifile.tempo using time_division */
- if ( !i_midi_setget_tempo( &midifile ) )
- WARNANDBREAKANDPLAYERR( "%s: invalid values while setting ppq and tempo\n" , filename_uri );
-
- DEBUGMSG( "PLAY requested, sequencer start\n" );
- /* sequencer start */
- if ( !backend.seq_start( filename_uri ) )
- WARNANDBREAKANDPLAYERR( "%s: problem with seq_start, play aborted\n" , filename_uri );
-
- DEBUGMSG( "PLAY requested, sequencer on\n" );
- /* sequencer on */
- if ( !backend.seq_on() )
- WARNANDBREAKANDPLAYERR( "%s: problem with seq_on, play aborted\n" , filename_uri );
-
- DEBUGMSG( "PLAY requested, setting sequencer queue tempo...\n" );
- /* set sequencer queue tempo using ppq and tempo (call only after i_midi_setget_tempo) */
- if ( !backend.seq_queue_tempo( midifile.current_tempo , midifile.ppq ) )
- {
- backend.seq_off(); /* kill the sequencer */
- WARNANDBREAKANDPLAYERR( "%s: ALSA queue problem, play aborted\n" , filename_uri );
- }
-
- /* fill midifile.length, keeping in count tempo-changes */
- i_midi_setget_length( &midifile );
- DEBUGMSG( "PLAY requested, song length calculated: %i msec\n" , (gint)(midifile.length / 1000) );
-
- playback->set_params (playback, au_bitdepth * au_samplerate * au_channels
- / 8, au_samplerate, au_channels);
-
- /* done with file */
- midifile.file_pointer = NULL;
-
- /* play play play! */
- DEBUGMSG( "PLAY requested, starting play thread\n" );
- amidiplug_playing_status = pause ? AMIDIPLUG_PAUSE : AMIDIPLUG_PLAY;
- seek_time = (start_time > 0) ? start_time : -1;
- playback->set_pb_ready(playback);
- amidiplug_play_loop(playback);
- break;
+ aud_interface_show_error (_("You have not selected any sequencer ports for "
+ "MIDI playback. You can do so in the MIDI plugin preferences."));
+ amidiplug_playing_status = AMIDIPLUG_ERR;
+ return FALSE;
+ }
+
+ DEBUGMSG ("PLAY requested, opening file: %s\n", filename_uri);
+ midifile.file_pointer = file;
+ midifile.file_name = g_strdup (filename_uri);
+
+ switch (i_midi_file_read_id (&midifile))
+ {
+ case MAKE_ID ('R', 'I', 'F', 'F') :
+ {
+ DEBUGMSG ("PLAY requested, RIFF chunk found, processing...\n");
+
+ /* read riff chunk */
+ if (!i_midi_file_parse_riff (&midifile))
+ WARNANDBREAKANDPLAYERR ("%s: invalid file format (riff parser)\n", filename_uri);
+
+ /* if that was read correctly, go ahead and read smf data */
+ }
+
+ case MAKE_ID ('M', 'T', 'h', 'd') :
+ {
+ DEBUGMSG ("PLAY requested, MThd chunk found, processing...\n");
+
+ if (!i_midi_file_parse_smf (&midifile, port_count))
+ WARNANDBREAKANDPLAYERR ("%s: invalid file format (smf parser)\n", filename_uri);
+
+ if (midifile.time_division < 1)
+ WARNANDBREAKANDPLAYERR ("%s: invalid time division (%i)\n", filename_uri, midifile.time_division);
+
+ DEBUGMSG ("PLAY requested, setting ppq and tempo...\n");
+
+ /* fill midifile.ppq and midifile.tempo using time_division */
+ if (!i_midi_setget_tempo (&midifile))
+ WARNANDBREAKANDPLAYERR ("%s: invalid values while setting ppq and tempo\n", filename_uri);
+
+ DEBUGMSG ("PLAY requested, sequencer start\n");
+
+ /* sequencer start */
+ if (!backend->seq_start (filename_uri))
+ WARNANDBREAKANDPLAYERR ("%s: problem with seq_start, play aborted\n", filename_uri);
+
+ DEBUGMSG ("PLAY requested, sequencer on\n");
+
+ /* sequencer on */
+ if (!backend->seq_on())
+ WARNANDBREAKANDPLAYERR ("%s: problem with seq_on, play aborted\n", filename_uri);
+
+ DEBUGMSG ("PLAY requested, setting sequencer queue tempo...\n");
+
+ /* set sequencer queue tempo using ppq and tempo (call only after i_midi_setget_tempo) */
+ if (!backend->seq_queue_tempo (midifile.current_tempo, midifile.ppq))
+ {
+ backend->seq_off(); /* kill the sequencer */
+ WARNANDBREAKANDPLAYERR ("%s: ALSA queue problem, play aborted\n", filename_uri);
+ }
+
+ /* fill midifile.length, keeping in count tempo-changes */
+ i_midi_setget_length (&midifile);
+ DEBUGMSG ("PLAY requested, song length calculated: %i msec\n", (int) (midifile.length / 1000));
+
+ playback->set_params (playback, au_bitdepth * au_samplerate * au_channels
+ / 8, au_samplerate, au_channels);
+
+ /* done with file */
+ midifile.file_pointer = NULL;
+
+ /* play play play! */
+ DEBUGMSG ("PLAY requested, starting play thread\n");
+ amidiplug_playing_status = pause ? AMIDIPLUG_PAUSE : AMIDIPLUG_PLAY;
+ seek_time = (start_time > 0) ? start_time : -1;
+ playback->set_pb_ready (playback);
+ amidiplug_play_loop (playback);
+ break;
 }
 
 default:
 {
- amidiplug_playing_status = AMIDIPLUG_ERR;
- g_warning( "%s is not a Standard MIDI File\n" , filename_uri );
- break;
+ amidiplug_playing_status = AMIDIPLUG_ERR;
+ g_warning ("%s is not a Standard MIDI File\n", filename_uri);
+ break;
+ }
 }
- }
 
- return TRUE;
+ return TRUE;
 }
 
 static void * audio_loop (void * arg)
 {
 InputPlayback * playback = arg;
 void * buffer = NULL;
- gint buffer_size = 0;
+ int buffer_size = 0;
 
 while (1)
 {
@@ -375,11 +359,11 @@
 
 pthread_mutex_unlock (& audio_control_mutex);
 
- if (backend.seq_output (& buffer, & buffer_size))
+ if (backend->seq_output (& buffer, & buffer_size))
 playback->output->write_audio (buffer, buffer_size);
 }
 
- g_free (buffer);
+ free (buffer);
 return NULL;
 }
 
@@ -390,7 +374,7 @@
 pthread_create (& audio_thread, NULL, audio_loop, (void *) playback);
 }
 
-static void audio_seek (InputPlayback * playback, gint time)
+static void audio_seek (InputPlayback * playback, int time)
 {
 pthread_mutex_lock (& audio_control_mutex);
 audio_seek_time = time;
@@ -398,7 +382,7 @@
 pthread_mutex_unlock (& audio_control_mutex);
 }
 
-static void audio_pause (InputPlayback * playback, gboolean pause)
+static void audio_pause (InputPlayback * playback, bool_t pause)
 {
 playback->output->pause (pause);
 }
@@ -412,189 +396,202 @@
 pthread_join (audio_thread, NULL);
 }
 
-static void do_seek (gint time)
+static void do_seek (int time)
 {
- backend.seq_event_allnoteoff (midifile.playing_tick);
- backend.seq_queue_stop ();
+ backend->seq_event_allnoteoff (midifile.playing_tick);
+ backend->seq_queue_stop ();
 amidiplug_skipto (time * (gint64) 1000 / midifile.avg_microsec_per_tick);
 }
 
-static void do_pause (gboolean pause)
+static void do_pause (bool_t pause)
 {
 if (pause)
 {
- backend.seq_event_allnoteoff (midifile.playing_tick);
- backend.seq_queue_stop ();
+ backend->seq_event_allnoteoff (midifile.playing_tick);
+ backend->seq_queue_stop ();
 }
 else
 {
 midifile.skip_offset = midifile.playing_tick;
- backend.seq_queue_start ();
+ backend->seq_queue_start ();
 }
 }
 
 static void amidiplug_play_loop (InputPlayback * playback)
 {
- gint j = 0;
- gboolean rewind = TRUE, paused = FALSE, stopped = FALSE;
+ int j = 0;
+ bool_t rewind = TRUE, paused = FALSE, stopped = FALSE;
 
- if ( rewind )
- {
- /* initialize current position in each track */
- for (j = 0; j < midifile.num_tracks; ++j)
- midifile.tracks[j].current_event = midifile.tracks[j].first_event;
- }
-
- if (! backend.autonomous_audio)
- audio_start (playback);
+ if (rewind)
+ {
+ /* initialize current position in each track */
+ for (j = 0; j < midifile.num_tracks; ++j)
+ midifile.tracks[j].current_event = midifile.tracks[j].first_event;
+ }
 
- /* queue start */
- backend.seq_queue_start();
- /* common settings for all our events */
- backend.seq_event_init();
+ if (! backend->autonomous_audio)
+ audio_start (playback);
 
- DEBUGMSG( "PLAY thread, start the play loop\n" );
- for (;;)
- {
- midievent_t * event = NULL;
- midifile_track_t * event_track = NULL;
- gint i, min_tick = midifile.max_tick + 1;
+ /* queue start */
+ backend->seq_queue_start();
+ /* common settings for all our events */
+ backend->seq_event_init();
 
- pthread_mutex_lock (& control_mutex);
+ DEBUGMSG ("PLAY thread, start the play loop\n");
 
- if (amidiplug_playing_status == AMIDIPLUG_STOP)
+ for (;;)
 {
- pthread_mutex_unlock (& control_mutex);
- stopped = TRUE;
- break;
- }
+ midievent_t * event = NULL;
+ midifile_track_t * event_track = NULL;
+ int i, min_tick = midifile.max_tick + 1;
 
- if (seek_time != -1)
- {
- if (! backend.autonomous_audio)
- audio_seek (playback, seek_time);
+ pthread_mutex_lock (& control_mutex);
 
- do_seek (seek_time);
- seek_time = -1;
- }
+ if (amidiplug_playing_status == AMIDIPLUG_STOP)
+ {
+ pthread_mutex_unlock (& control_mutex);
+ stopped = TRUE;
+ break;
+ }
 
- if (amidiplug_playing_status == AMIDIPLUG_PAUSE)
- {
- if (! paused)
+ if (seek_time != -1)
 {
- do_pause (TRUE);
+ if (! backend->autonomous_audio)
+ audio_seek (playback, seek_time);
 
- if (! backend.autonomous_audio)
- audio_pause (playback, TRUE);
+ do_seek (seek_time);
+ seek_time = -1;
+ }
 
- paused = TRUE;
+ if (amidiplug_playing_status == AMIDIPLUG_PAUSE)
+ {
+ if (! paused)
+ {
+ do_pause (TRUE);
+
+ if (! backend->autonomous_audio)
+ audio_pause (playback, TRUE);
+
+ paused = TRUE;
+ }
+
+ pthread_cond_wait (& control_cond, & control_mutex);
+ pthread_mutex_unlock (& control_mutex);
+ continue;
+ }
+
+ if (paused)
+ {
+ do_pause (FALSE);
+
+ if (! backend->autonomous_audio)
+ audio_pause (playback, FALSE);
+
+ paused = FALSE;
 }
 
- pthread_cond_wait (& control_cond, & control_mutex);
 pthread_mutex_unlock (& control_mutex);
- continue;
- }
 
- if (paused)
- {
- do_pause (FALSE);
+ /* search next event */
+ for (i = 0; i < midifile.num_tracks; ++i)
+ {
+ midifile_track_t * track = &midifile.tracks[i];
+ midievent_t * e2 = track->current_event;
+
+ if ((e2) && (e2->tick < min_tick))
+ {
+ min_tick = e2->tick;
+ event = e2;
+ event_track = track;
+ }
+ }
 
- if (! backend.autonomous_audio)
- audio_pause (playback, FALSE);
+ if (!event)
+ break; /* end of song reached */
 
- paused = FALSE;
- }
+ /* advance pointer to next event */
+ event_track->current_event = event->next;
+ /* consider the midifile.skip_offset */
+ event->tick_real = event->tick - midifile.skip_offset;
 
- pthread_mutex_unlock (& control_mutex);
 
- /* search next event */
- for (i = 0; i < midifile.num_tracks; ++i)
- {
- midifile_track_t * track = &midifile.tracks[i];
- midievent_t * e2 = track->current_event;
- if (( e2 ) && ( e2->tick < min_tick ))
- {
- min_tick = e2->tick;
- event = e2;
- event_track = track;
- }
- }
+ switch (event->type)
+ {
+ case SND_SEQ_EVENT_NOTEON:
+ backend->seq_event_noteon (event);
+ break;
 
- if (!event)
- break; /* end of song reached */
+ case SND_SEQ_EVENT_NOTEOFF:
+ backend->seq_event_noteoff (event);
+ break;
 
- /* advance pointer to next event */
- event_track->current_event = event->next;
- /* consider the midifile.skip_offset */
- event->tick_real = event->tick - midifile.skip_offset;
+ case SND_SEQ_EVENT_KEYPRESS:
+ backend->seq_event_keypress (event);
+ break;
 
+ case SND_SEQ_EVENT_CONTROLLER:
+ backend->seq_event_controller (event);
+ break;
 
- switch (event->type)
- {
- case SND_SEQ_EVENT_NOTEON:
- backend.seq_event_noteon( event );
- break;
- case SND_SEQ_EVENT_NOTEOFF:
- backend.seq_event_noteoff( event );
- break;
- case SND_SEQ_EVENT_KEYPRESS:
- backend.seq_event_keypress( event );
- break;
- case SND_SEQ_EVENT_CONTROLLER:
- backend.seq_event_controller( event );
- break;
- case SND_SEQ_EVENT_PGMCHANGE:
- backend.seq_event_pgmchange( event );
- break;
- case SND_SEQ_EVENT_CHANPRESS:
- backend.seq_event_chanpress( event );
- break;
- case SND_SEQ_EVENT_PITCHBEND:
- backend.seq_event_pitchbend( event );
- break;
- case SND_SEQ_EVENT_SYSEX:
- backend.seq_event_sysex( event );
- break;
- case SND_SEQ_EVENT_TEMPO:
- backend.seq_event_tempo( event );
- DEBUGMSG( "PLAY thread, processing tempo event with value %i on tick %i\n" ,
- event->data.tempo , event->tick );
- midifile.current_tempo = event->data.tempo;
- break;
- case SND_SEQ_EVENT_META_TEXT:
- /* do nothing */
- break;
- case SND_SEQ_EVENT_META_LYRIC:
- /* do nothing */
- break;
- default:
- DEBUGMSG( "PLAY thread, encountered invalid event type %i\n" , event->type );
- break;
- }
+ case SND_SEQ_EVENT_PGMCHANGE:
+ backend->seq_event_pgmchange (event);
+ break;
 
- midifile.playing_tick = event->tick;
+ case SND_SEQ_EVENT_CHANPRESS:
+ backend->seq_event_chanpress (event);
+ break;
 
- if (backend.autonomous_audio)
- {
- current_time = (gint64) midifile.playing_tick *
- midifile.avg_microsec_per_tick / 1000;
+ case SND_SEQ_EVENT_PITCHBEND:
+ backend->seq_event_pitchbend (event);
+ break;
 
- /* these backends deal with audio production themselves (i.e. ALSA) */
- backend.seq_output( NULL , NULL );
+ case SND_SEQ_EVENT_SYSEX:
+ backend->seq_event_sysex (event);
+ break;
+
+ case SND_SEQ_EVENT_TEMPO:
+ backend->seq_event_tempo (event);
+ DEBUGMSG ("PLAY thread, processing tempo event with value %i on tick %i\n",
+ event->data.tempo, event->tick);
+ midifile.current_tempo = event->data.tempo;
+ break;
+
+ case SND_SEQ_EVENT_META_TEXT:
+ /* do nothing */
+ break;
+
+ case SND_SEQ_EVENT_META_LYRIC:
+ /* do nothing */
+ break;
+
+ default:
+ DEBUGMSG ("PLAY thread, encountered invalid event type %i\n", event->type);
+ break;
+ }
+
+ midifile.playing_tick = event->tick;
+
+ if (backend->autonomous_audio)
+ {
+ current_time = (gint64) midifile.playing_tick *
+ midifile.avg_microsec_per_tick / 1000;
+
+ /* these backends deal with audio production themselves (i.e. ALSA) */
+ backend->seq_output (NULL, NULL);
+ }
 }
- }
 
- backend.seq_output_shut (stopped ? midifile.playing_tick : midifile.max_tick,
- midifile.skip_offset);
+ backend->seq_output_shut (stopped ? midifile.playing_tick : midifile.max_tick,
+ midifile.skip_offset);
 
- if (! backend.autonomous_audio)
- audio_stop (playback);
+ if (! backend->autonomous_audio)
+ audio_stop (playback);
 
- backend.seq_off ();
- backend.seq_stop ();
- i_midi_free (& midifile);
+ backend->seq_off ();
+ backend->seq_stop ();
+ i_midi_free (& midifile);
 
- current_time = -1;
+ current_time = -1;
 }
 
 
@@ -602,98 +599,127 @@
 midi file; re-do them using a time-tick of 0, so they are processed
 istantaneously and proceed this way until the playing_tick is reached;
 also obtain the correct skip_offset from the playing_tick */
-void amidiplug_skipto( gint playing_tick )
+static void amidiplug_skipto (int playing_tick)
 {
- gint i;
+ int i;
 
- /* this check is always made, for safety*/
- if ( playing_tick >= midifile.max_tick )
- playing_tick = midifile.max_tick - 1;
+ /* this check is always made, for safety*/
+ if (playing_tick >= midifile.max_tick)
+ playing_tick = midifile.max_tick - 1;
 
- /* initialize current position in each track */
- for (i = 0; i < midifile.num_tracks; ++i)
- midifile.tracks[i].current_event = midifile.tracks[i].first_event;
+ /* initialize current position in each track */
+ for (i = 0; i < midifile.num_tracks; ++i)
+ midifile.tracks[i].current_event = midifile.tracks[i].first_event;
 
- /* common settings for all our events */
- backend.seq_event_init();
- backend.seq_queue_start();
+ /* common settings for all our events */
+ backend->seq_event_init();
+ backend->seq_queue_start();
 
- DEBUGMSG( "SKIPTO request, starting skipto loop\n" );
- for (;;)
- {
- midievent_t * event = NULL;
- midifile_track_t * event_track = NULL;
- gint i, min_tick = midifile.max_tick + 1;
+ DEBUGMSG ("SKIPTO request, starting skipto loop\n");
 
- /* search next event */
- for (i = 0; i < midifile.num_tracks; ++i)
+ for (;;)
 {
- midifile_track_t * track = &midifile.tracks[i];
- midievent_t * e2 = track->current_event;
- if (( e2 ) && ( e2->tick < min_tick ))
- {
- min_tick = e2->tick;
- event = e2;
- event_track = track;
- }
- }
+ midievent_t * event = NULL;
+ midifile_track_t * event_track = NULL;
+ int i, min_tick = midifile.max_tick + 1;
 
- /* unlikely here... unless very strange MIDI files are played :) */
- if (!event)
- {
- DEBUGMSG( "SKIPTO request, reached the last event but not the requested tick (!)\n" );
- break; /* end of song reached */
- }
+ /* search next event */
+ for (i = 0; i < midifile.num_tracks; ++i)
+ {
+ midifile_track_t * track = &midifile.tracks[i];
+ midievent_t * e2 = track->current_event;
+
+ if ((e2) && (e2->tick < min_tick))
+ {
+ min_tick = e2->tick;
+ event = e2;
+ event_track = track;
+ }
+ }
 
- /* reached the requested tick, job done */
- if ( event->tick >= playing_tick )
- {
- DEBUGMSG( "SKIPTO request, reached the requested tick, exiting from skipto loop\n" );
- break;
- }
+ /* unlikely here... unless very strange MIDI files are played :) */
+ if (!event)
+ {
+ DEBUGMSG ("SKIPTO request, reached the last event but not the requested tick (!)\n");
+ break; /* end of song reached */
+ }
 
- /* advance pointer to next event */
- event_track->current_event = event->next;
- /* set the time tick to 0 */
- event->tick_real = 0;
+ /* reached the requested tick, job done */
+ if (event->tick >= playing_tick)
+ {
+ DEBUGMSG ("SKIPTO request, reached the requested tick, exiting from skipto loop\n");
+ break;
+ }
 
- switch (event->type)
- {
- /* do nothing for these
- case SND_SEQ_EVENT_NOTEON:
- case SND_SEQ_EVENT_NOTEOFF:
- case SND_SEQ_EVENT_KEYPRESS:
- {
- break;
- } */
- case SND_SEQ_EVENT_CONTROLLER:
- backend.seq_event_controller( event );
- break;
- case SND_SEQ_EVENT_PGMCHANGE:
- backend.seq_event_pgmchange( event );
- break;
- case SND_SEQ_EVENT_CHANPRESS:
- backend.seq_event_chanpress( event );
- break;
- case SND_SEQ_EVENT_PITCHBEND:
- backend.seq_event_pitchbend( event );
- break;
- case SND_SEQ_EVENT_SYSEX:
- backend.seq_event_sysex( event );
- break;
- case SND_SEQ_EVENT_TEMPO:
- backend.seq_event_tempo( event );
- midifile.current_tempo = event->data.tempo;
- break;
- }
+ /* advance pointer to next event */
+ event_track->current_event = event->next;
+ /* set the time tick to 0 */
+ event->tick_real = 0;
 
- if ( backend.autonomous_audio == TRUE )
- {
- /* these backends deal with audio production themselves (i.e. ALSA) */
- backend.seq_output( NULL , NULL );
+ switch (event->type)
+ {
+ /* do nothing for these
+ case SND_SEQ_EVENT_NOTEON:
+ case SND_SEQ_EVENT_NOTEOFF:
+ case SND_SEQ_EVENT_KEYPRESS:
+ {
+ break;
+ } */
+ case SND_SEQ_EVENT_CONTROLLER:
+ backend->seq_event_controller (event);
+ break;
+
+ case SND_SEQ_EVENT_PGMCHANGE:
+ backend->seq_event_pgmchange (event);
+ break;
+
+ case SND_SEQ_EVENT_CHANPRESS:
+ backend->seq_event_chanpress (event);
+ break;
+
+ case SND_SEQ_EVENT_PITCHBEND:
+ backend->seq_event_pitchbend (event);
+ break;
+
+ case SND_SEQ_EVENT_SYSEX:
+ backend->seq_event_sysex (event);
+ break;
+
+ case SND_SEQ_EVENT_TEMPO:
+ backend->seq_event_tempo (event);
+ midifile.current_tempo = event->data.tempo;
+ break;
+ }
+
+ if (backend->autonomous_audio == TRUE)
+ {
+ /* these backends deal with audio production themselves (i.e. ALSA) */
+ backend->seq_output (NULL, NULL);
+ }
 }
- }
 
- midifile.skip_offset = playing_tick;
- midifile.playing_tick = playing_tick;
+ midifile.skip_offset = playing_tick;
+ midifile.playing_tick = playing_tick;
 }
+
+
+AUD_INPUT_PLUGIN
+(
+ .name = N_("AMIDI-Plug (MIDI Player)"),
+ .domain = PACKAGE,
+ .init = amidiplug_init,
+ .about = i_about_gui,
+ .configure = i_configure_gui,
+ .play = amidiplug_play,
+ .stop = amidiplug_stop,
+ .pause = amidiplug_pause,
+ .mseek = amidiplug_mseek,
+ .get_time = amidiplug_get_time,
+ .get_volume = amidiplug_get_volume,
+ .set_volume = amidiplug_set_volume,
+ .cleanup = amidiplug_cleanup,
+ .probe_for_tuple = amidiplug_get_song_tuple,
+ .file_info_box = i_fileinfo_gui,
+ .is_our_file_from_vfs = amidiplug_is_our_file_from_vfs,
+ .extensions = amidiplug_vfs_extensions,
+)

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/backend-alsa/Makefile -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/backend-alsa/Makefile Changed

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/backend-alsa/b-alsa.c -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/backend-alsa/b-alsa.c Changed

@@ -18,467 +18,479 @@
 *
 */
 
+#include <audacious/i18n.h>
+#include <audacious/misc.h>
+
+#include "../i_configure.h"
 #include "b-alsa.h"
-#include "b-alsa-config.h"
 
 /* sequencer instance */
 static sequencer_client_t sc;
 /* options */
-static amidiplug_cfg_alsa_t amidiplug_cfg_alsa;
-
+static amidiplug_cfg_alsa_t * alsa_cfg;
 
-gint backend_info_get( gchar ** name , gchar ** longname , gchar ** desc , gint * ppos )
+int backend_info_get (char ** name, char ** longname, char ** desc, int * ppos)
 {
- if ( name != NULL )
- *name = g_strdup( "alsa" );
- if ( longname != NULL )
- *longname = g_strjoin( "", _("ALSA Backend "), AMIDIPLUG_VERSION, NULL );
- if ( desc != NULL )
- *desc = g_strdup( _("This backend sends MIDI events to a group of user-chosen "
- "ALSA sequencer ports. The ALSA sequencer interface is very "
- "versatile, it can provide ports for audio cards hardware "
- "synthesizers (i.e. emu10k1) but also for software synths, "
- "external devices, etc.\n"
- "This backend does not produce audio, MIDI events are handled "
- "directly from devices/programs behind the ALSA ports; in example, "
- "MIDI events sent to the hardware synth will be directly played.\n"
- "Backend written by Giacomo Lozito.") );
- if ( ppos != NULL )
- *ppos = 1; /* preferred position in backend list */
- return 1;
+ if (name != NULL)
+ *name = g_strdup ("alsa");
+
+ if (longname != NULL)
+ *longname = g_strdup (_("ALSA Backend "));
+
+ if (desc != NULL)
+ *desc = g_strdup (_("This backend sends MIDI events to a group of user-chosen "
+ "ALSA sequencer ports. The ALSA sequencer interface is very "
+ "versatile, it can provide ports for audio cards hardware "
+ "synthesizers (i.e. emu10k1) but also for software synths, "
+ "external devices, etc.\n"
+ "This backend does not produce audio, MIDI events are handled "
+ "directly from devices/programs behind the ALSA ports; in example, "
+ "MIDI events sent to the hardware synth will be directly played.\n"
+ "Backend written by Giacomo Lozito."));
+
+ if (ppos != NULL)
+ *ppos = 1; /* preferred position in backend list */
+
+ return 1;
 }
 
 
-gint backend_init( i_cfg_get_file_cb callback )
+int backend_init (amidiplug_cfg_backend_t * cfg)
 {
- /* read configuration options */
- i_cfg_read( callback );
+ alsa_cfg = cfg->alsa;
 
- sc.seq = NULL;
- sc.client_port = 0;
- sc.queue = 0;
- sc.dest_port = NULL;
- sc.dest_port_num = 0;
- sc.queue_tempo = NULL;
- sc.is_start = FALSE;
+ sc.seq = NULL;
+ sc.client_port = 0;
+ sc.queue = 0;
+ sc.dest_port = NULL;
+ sc.dest_port_num = 0;
+ sc.queue_tempo = NULL;
+ sc.is_start = FALSE;
 
- return 1;
+ return 1;
 }
 
-gint backend_cleanup( void )
-{
- /* free configuration options */
- i_cfg_free();
 
- return 1;
+int backend_cleanup (void)
+{
+ return 1;
 }
 
 
-gint sequencer_get_port_count( void )
+int sequencer_get_port_count (void)
 {
- return i_util_str_count( amidiplug_cfg_alsa.alsa_seq_wports , ':' );
+ return i_util_str_count (alsa_cfg->alsa_seq_wports, ':');
 }
 
 
-gint sequencer_start( gchar * midi_fname )
+int sequencer_start (char * midi_fname)
 {
- sc.is_start = TRUE;
- return 1; /* success */
+ sc.is_start = TRUE;
+ return 1; /* success */
 }
 
 
-gint sequencer_stop( void )
+int sequencer_stop (void)
 {
- return 1; /* success */
+ return 1; /* success */
 }
 
 
 /* activate sequencer client */
-gint sequencer_on( void )
+int sequencer_on (void)
 {
- gchar * wports_str = amidiplug_cfg_alsa.alsa_seq_wports;
+ char * wports_str = alsa_cfg->alsa_seq_wports;
 
- if ( !i_seq_open() )
- {
- sc.seq = NULL;
- return 0;
- }
+ if (!i_seq_open())
+ {
+ sc.seq = NULL;
+ return 0;
+ }
 
- if ( !i_seq_port_create() )
- {
- i_seq_close();
- sc.seq = NULL;
- return 0;
- }
+ if (!i_seq_port_create())
+ {
+ i_seq_close();
+ sc.seq = NULL;
+ return 0;
+ }
 
- if ( !i_seq_queue_create() )
- {
- i_seq_close();
- sc.seq = NULL;
- return 0;
- }
+ if (!i_seq_queue_create())
+ {
+ i_seq_close();
+ sc.seq = NULL;
+ return 0;
+ }
 
- if (( sc.is_start == TRUE ) && ( wports_str ))
- {
- sc.is_start = FALSE;
- i_seq_port_wparse( wports_str );
- }
+ if ((sc.is_start == TRUE) && (wports_str))
+ {
+ sc.is_start = FALSE;
+ i_seq_port_wparse (wports_str);
+ }
 
- if ( !i_seq_port_connect() )
- {
- i_seq_queue_free();
- i_seq_close();
- sc.seq = NULL;
- return 0;
- }
+ if (!i_seq_port_connect())
+ {
+ i_seq_queue_free();
+ i_seq_close();
+ sc.seq = NULL;
+ return 0;
+ }
 
- /* success */
- return 1;
+ /* success */
+ return 1;
 }
 
 
 /* shutdown sequencer client */
-gint sequencer_off( void )
+int sequencer_off (void)
 {
- if ( sc.seq )
- {
- i_seq_port_disconnect();
- i_seq_queue_free();
- i_seq_close();
- sc.seq = NULL;
- /* return 1 here */
- return 1;
- }
- /* return 2 if it was already freed */
- return 2;
+ if (sc.seq)
+ {
+ i_seq_port_disconnect();
+ i_seq_queue_free();
+ i_seq_close();
+ sc.seq = NULL;
+ /* return 1 here */
+ return 1;
+ }
+
+ /* return 2 if it was already freed */
+ return 2;
 }
 
 
 /* queue set tempo */
-gint sequencer_queue_tempo( gint tempo , gint ppq )
-{
- /* interpret and set tempo */
- snd_seq_queue_tempo_alloca( &sc.queue_tempo );
- snd_seq_queue_tempo_set_tempo( sc.queue_tempo , tempo );
- snd_seq_queue_tempo_set_ppq( sc.queue_tempo , ppq );
-
- if ( snd_seq_set_queue_tempo( sc.seq , sc.queue , sc.queue_tempo ) < 0 )
- {
- g_warning( "Cannot set queue tempo (%u/%i)\n",
- snd_seq_queue_tempo_get_tempo(sc.queue_tempo),
- snd_seq_queue_tempo_get_ppq(sc.queue_tempo) );
- return 0;
- }
- return 1;
+int sequencer_queue_tempo (int tempo, int ppq)
+{
+ /* interpret and set tempo */
+ snd_seq_queue_tempo_alloca (&sc.queue_tempo);
+ snd_seq_queue_tempo_set_tempo (sc.queue_tempo, tempo);
+ snd_seq_queue_tempo_set_ppq (sc.queue_tempo, ppq);
+
+ if (snd_seq_set_queue_tempo (sc.seq, sc.queue, sc.queue_tempo) < 0)
+ {
+ g_warning ("Cannot set queue tempo (%u/%i)\n",
+ snd_seq_queue_tempo_get_tempo (sc.queue_tempo),
+ snd_seq_queue_tempo_get_ppq (sc.queue_tempo));
+ return 0;
+ }
+
+ return 1;
 }
 
 
-gint sequencer_queue_start( void )
+int sequencer_queue_start (void)
 {
- return snd_seq_start_queue( sc.seq , sc.queue , NULL );
+ return snd_seq_start_queue (sc.seq, sc.queue, NULL);
 }
 
 
-gint sequencer_queue_stop( void )
+int sequencer_queue_stop (void)
 {
- return snd_seq_stop_queue( sc.seq , sc.queue , NULL );
+ return snd_seq_stop_queue (sc.seq, sc.queue, NULL);
 }
 
 
-gint sequencer_event_init( void )
+int sequencer_event_init (void)
 {
- /* common settings for all our events */
- snd_seq_ev_clear(&sc.ev);
- sc.ev.queue = sc.queue;
- sc.ev.source.port = 0;
- sc.ev.flags = SND_SEQ_TIME_STAMP_TICK;
- return 1;
+ /* common settings for all our events */
+ snd_seq_ev_clear (&sc.ev);
+ sc.ev.queue = sc.queue;
+ sc.ev.source.port = 0;
+ sc.ev.flags = SND_SEQ_TIME_STAMP_TICK;
+ return 1;
 }
 
 
-gint sequencer_event_noteon( midievent_t * event )
+int sequencer_event_noteon (midievent_t * event)
 {
- i_seq_event_common_init( event );
- snd_seq_ev_set_fixed(&sc.ev);
- sc.ev.data.note.channel = event->data.d[0];
- sc.ev.data.note.note = event->data.d[1];
- sc.ev.data.note.velocity = event->data.d[2];
- return 1;
+ i_seq_event_common_init (event);
+ snd_seq_ev_set_fixed (&sc.ev);
+ sc.ev.data.note.channel = event->data.d[0];
+ sc.ev.data.note.note = event->data.d[1];
+ sc.ev.data.note.velocity = event->data.d[2];
+ return 1;
 }
 
 
-gint sequencer_event_noteoff( midievent_t * event )
+int sequencer_event_noteoff (midievent_t * event)
 {
- i_seq_event_common_init( event );
- snd_seq_ev_set_fixed(&sc.ev);
- sc.ev.data.note.channel = event->data.d[0];
- sc.ev.data.note.note = event->data.d[1];
- sc.ev.data.note.velocity = event->data.d[2];
- return 1;
+ i_seq_event_common_init (event);
+ snd_seq_ev_set_fixed (&sc.ev);
+ sc.ev.data.note.channel = event->data.d[0];
+ sc.ev.data.note.note = event->data.d[1];
+ sc.ev.data.note.velocity = event->data.d[2];
+ return 1;
 }
 
 
-gint sequencer_event_keypress( midievent_t * event )
+int sequencer_event_keypress (midievent_t * event)
 {
- i_seq_event_common_init( event );
- snd_seq_ev_set_fixed(&sc.ev);
- sc.ev.data.note.channel = event->data.d[0];
- sc.ev.data.note.note = event->data.d[1];
- sc.ev.data.note.velocity = event->data.d[2];
- return 1;
+ i_seq_event_common_init (event);
+ snd_seq_ev_set_fixed (&sc.ev);
+ sc.ev.data.note.channel = event->data.d[0];
+ sc.ev.data.note.note = event->data.d[1];
+ sc.ev.data.note.velocity = event->data.d[2];
+ return 1;
 }
 
 
-gint sequencer_event_controller( midievent_t * event )
+int sequencer_event_controller (midievent_t * event)
 {
- i_seq_event_common_init( event );
- snd_seq_ev_set_fixed(&sc.ev);
- sc.ev.data.control.channel = event->data.d[0];
- sc.ev.data.control.param = event->data.d[1];
- sc.ev.data.control.value = event->data.d[2];
- return 1;
+ i_seq_event_common_init (event);
+ snd_seq_ev_set_fixed (&sc.ev);
+ sc.ev.data.control.channel = event->data.d[0];
+ sc.ev.data.control.param = event->data.d[1];
+ sc.ev.data.control.value = event->data.d[2];
+ return 1;
 }
 
 
-gint sequencer_event_pgmchange( midievent_t * event )
+int sequencer_event_pgmchange (midievent_t * event)
 {
- i_seq_event_common_init( event );
- snd_seq_ev_set_fixed(&sc.ev);
- sc.ev.data.control.channel = event->data.d[0];
- sc.ev.data.control.value = event->data.d[1];
- return 1;
+ i_seq_event_common_init (event);
+ snd_seq_ev_set_fixed (&sc.ev);
+ sc.ev.data.control.channel = event->data.d[0];
+ sc.ev.data.control.value = event->data.d[1];
+ return 1;
 }
 
 
-gint sequencer_event_chanpress( midievent_t * event )
+int sequencer_event_chanpress (midievent_t * event)
 {
- i_seq_event_common_init( event );
- snd_seq_ev_set_fixed(&sc.ev);
- sc.ev.data.control.channel = event->data.d[0];
- sc.ev.data.control.value = event->data.d[1];
- return 1;
+ i_seq_event_common_init (event);
+ snd_seq_ev_set_fixed (&sc.ev);
+ sc.ev.data.control.channel = event->data.d[0];
+ sc.ev.data.control.value = event->data.d[1];
+ return 1;
 }
 
 
-gint sequencer_event_pitchbend( midievent_t * event )
+int sequencer_event_pitchbend (midievent_t * event)
 {
- i_seq_event_common_init( event );
- snd_seq_ev_set_fixed(&sc.ev);
- sc.ev.data.control.channel = event->data.d[0];
- sc.ev.data.control.value = ((event->data.d[1]) | ((event->data.d[2]) << 7)) - 0x2000;
- return 1;
+ i_seq_event_common_init (event);
+ snd_seq_ev_set_fixed (&sc.ev);
+ sc.ev.data.control.channel = event->data.d[0];
+ sc.ev.data.control.value = ((event->data.d[1]) | ((event->data.d[2]) << 7)) - 0x2000;
+ return 1;
 }
 
 
-gint sequencer_event_sysex( midievent_t * event )
+int sequencer_event_sysex (midievent_t * event)
 {
- i_seq_event_common_init( event );
- snd_seq_ev_set_variable(&sc.ev, event->data.length, event->sysex);
- return 1;
+ i_seq_event_common_init (event);
+ snd_seq_ev_set_variable (&sc.ev, event->data.length, event->sysex);
+ return 1;
 }
 
 
-gint sequencer_event_tempo( midievent_t * event )
+int sequencer_event_tempo (midievent_t * event)
 {
- i_seq_event_common_init( event );
- snd_seq_ev_set_fixed(&sc.ev);
- sc.ev.dest.client = SND_SEQ_CLIENT_SYSTEM;
- sc.ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER;
- sc.ev.data.queue.queue = sc.queue;
- sc.ev.data.queue.param.value = event->data.tempo;
- return 1;
+ i_seq_event_common_init (event);
+ snd_seq_ev_set_fixed (&sc.ev);
+ sc.ev.dest.client = SND_SEQ_CLIENT_SYSTEM;
+ sc.ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER;
+ sc.ev.data.queue.queue = sc.queue;
+ sc.ev.data.queue.param.value = event->data.tempo;
+ return 1;
 }
 
 
-gint sequencer_event_other( midievent_t * event )
+int sequencer_event_other (midievent_t * event)
 {
- /* unhandled */
- return 1;
+ /* unhandled */
+ return 1;
 }
 
 
-gint sequencer_event_allnoteoff( gint unused )
+int sequencer_event_allnoteoff (int unused)
 {
- gint i = 0 , c = 0;
- /* send "ALL SOUNDS OFF" to all channels on all ports */
- sc.ev.type = SND_SEQ_EVENT_CONTROLLER;
- sc.ev.time.tick = 0;
- snd_seq_ev_set_fixed(&sc.ev);
- sc.ev.data.control.param = MIDI_CTL_ALL_SOUNDS_OFF;
- sc.ev.data.control.value = 0;
- for ( i = 0 ; i < sc.dest_port_num ; i++ )
- {
- sc.ev.queue = sc.queue;
- sc.ev.dest = sc.dest_port[i];
+ int i = 0, c = 0;
+ /* send "ALL SOUNDS OFF" to all channels on all ports */
+ sc.ev.type = SND_SEQ_EVENT_CONTROLLER;
+ sc.ev.time.tick = 0;
+ snd_seq_ev_set_fixed (&sc.ev);
+ sc.ev.data.control.param = MIDI_CTL_ALL_SOUNDS_OFF;
+ sc.ev.data.control.value = 0;
 
- for ( c = 0 ; c < 16 ; c++ )
+ for (i = 0 ; i < sc.dest_port_num ; i++)
 {
- sc.ev.data.control.channel = c;
- snd_seq_event_output(sc.seq, &sc.ev);
- snd_seq_drain_output(sc.seq);
+ sc.ev.queue = sc.queue;
+ sc.ev.dest = sc.dest_port[i];
+
+ for (c = 0 ; c < 16 ; c++)
+ {
+ sc.ev.data.control.channel = c;
+ snd_seq_event_output (sc.seq, &sc.ev);
+ snd_seq_drain_output (sc.seq);
+ }
 }
- }
- return 1;
+
+ return 1;
 }
 
 
-gint sequencer_output( gpointer * buffer , gint * len )
+int sequencer_output (void * * buffer, int * len)
 {
- snd_seq_event_output( sc.seq , &sc.ev );
- snd_seq_drain_output( sc.seq );
- snd_seq_sync_output_queue( sc.seq );
- return 0;
+ snd_seq_event_output (sc.seq, &sc.ev);
+ snd_seq_drain_output (sc.seq);
+ snd_seq_sync_output_queue (sc.seq);
+ return 0;
 }
 
 
-gint sequencer_output_shut( guint max_tick , gint skip_offset )
+int sequencer_output_shut (unsigned max_tick, int skip_offset)
 {
- g_return_val_if_fail (sc.seq != NULL, 0);
+ g_return_val_if_fail (sc.seq != NULL, 0);
 
- gint i = 0 , c = 0;
- /* time to shutdown playback! */
- /* send "ALL SOUNDS OFF" to all channels on all ports */
- sc.ev.type = SND_SEQ_EVENT_CONTROLLER;
- sc.ev.time.tick = 0;
- snd_seq_ev_set_fixed(&sc.ev);
- sc.ev.data.control.param = MIDI_CTL_ALL_SOUNDS_OFF;
- sc.ev.data.control.value = 0;
- for ( i = 0 ; i < sc.dest_port_num ; i++ )
- {
- sc.ev.queue = sc.queue;
- sc.ev.dest = sc.dest_port[i];
+ int i = 0, c = 0;
+ /* time to shutdown playback! */
+ /* send "ALL SOUNDS OFF" to all channels on all ports */
+ sc.ev.type = SND_SEQ_EVENT_CONTROLLER;
+ sc.ev.time.tick = 0;
+ snd_seq_ev_set_fixed (&sc.ev);
+ sc.ev.data.control.param = MIDI_CTL_ALL_SOUNDS_OFF;
+ sc.ev.data.control.value = 0;
 
- for ( c = 0 ; c < 16 ; c++ )
+ for (i = 0 ; i < sc.dest_port_num ; i++)
 {
- sc.ev.data.control.channel = c;
- snd_seq_event_output(sc.seq, &sc.ev);
- snd_seq_drain_output(sc.seq);
+ sc.ev.queue = sc.queue;
+ sc.ev.dest = sc.dest_port[i];
+
+ for (c = 0 ; c < 16 ; c++)
+ {
+ sc.ev.data.control.channel = c;
+ snd_seq_event_output (sc.seq, &sc.ev);
+ snd_seq_drain_output (sc.seq);
+ }
 }
- }
-
- /* schedule queue stop at end of song */
- snd_seq_ev_clear(&sc.ev);
- sc.ev.queue = sc.queue;
- sc.ev.source.port = 0;
- sc.ev.flags = SND_SEQ_TIME_STAMP_TICK;
-
- snd_seq_ev_set_fixed(&sc.ev);
- sc.ev.type = SND_SEQ_EVENT_STOP;
- sc.ev.time.tick = max_tick - skip_offset;
- sc.ev.dest.client = SND_SEQ_CLIENT_SYSTEM;
- sc.ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER;
- sc.ev.data.queue.queue = sc.queue;
- snd_seq_event_output(sc.seq, &sc.ev);
- snd_seq_drain_output(sc.seq);
- /* snd_seq_sync_output_queue(sc.seq); */
-
- return 1;
-}
-
-
-gint audio_volume_get( gint * left_volume , gint * right_volume )
-{
- snd_mixer_t * mixer_h = NULL;
- snd_mixer_elem_t * mixer_elem = NULL;
- gchar mixer_card[10];
- snprintf( mixer_card , 8 , "hw:%i" , amidiplug_cfg_alsa.alsa_mixer_card_id );
- mixer_card[9] = '\0';
-
- if ( snd_mixer_open( &mixer_h , 0 ) > -1 )
- i_seq_mixer_find_selem( mixer_h , mixer_card ,
- amidiplug_cfg_alsa.alsa_mixer_ctl_name ,
- amidiplug_cfg_alsa.alsa_mixer_ctl_id ,
- &mixer_elem );
- else
- mixer_h = NULL;
-
- if ( ( mixer_elem ) && ( snd_mixer_selem_has_playback_volume( mixer_elem ) ) )
- {
- glong pv_min , pv_max , pv_range;
- glong lc, rc;
-
- snd_mixer_selem_get_playback_volume_range( mixer_elem , &pv_min , &pv_max );
- pv_range = pv_max - pv_min;
- if ( pv_range > 0 )
+
+ /* schedule queue stop at end of song */
+ snd_seq_ev_clear (&sc.ev);
+ sc.ev.queue = sc.queue;
+ sc.ev.source.port = 0;
+ sc.ev.flags = SND_SEQ_TIME_STAMP_TICK;
+
+ snd_seq_ev_set_fixed (&sc.ev);
+ sc.ev.type = SND_SEQ_EVENT_STOP;
+ sc.ev.time.tick = max_tick - skip_offset;
+ sc.ev.dest.client = SND_SEQ_CLIENT_SYSTEM;
+ sc.ev.dest.port = SND_SEQ_PORT_SYSTEM_TIMER;
+ sc.ev.data.queue.queue = sc.queue;
+ snd_seq_event_output (sc.seq, &sc.ev);
+ snd_seq_drain_output (sc.seq);
+ /* snd_seq_sync_output_queue(sc.seq); */
+
+ return 1;
+}
+
+
+int audio_volume_get (int * left_volume, int * right_volume)
+{
+ snd_mixer_t * mixer_h = NULL;
+ snd_mixer_elem_t * mixer_elem = NULL;
+ char mixer_card[10];
+ snprintf (mixer_card, 8, "hw:%i", alsa_cfg->alsa_mixer_card_id);
+ mixer_card[9] = '\0';
+
+ if (snd_mixer_open (&mixer_h, 0) > -1)
+ i_seq_mixer_find_selem (mixer_h, mixer_card,
+ alsa_cfg->alsa_mixer_ctl_name,
+ alsa_cfg->alsa_mixer_ctl_id,
+ &mixer_elem);
+ else
+ mixer_h = NULL;
+
+ if ((mixer_elem) && (snd_mixer_selem_has_playback_volume (mixer_elem)))
 {
- if (snd_mixer_selem_is_playback_mono (mixer_elem))
- {
- snd_mixer_selem_get_playback_volume (mixer_elem, SND_MIXER_SCHN_MONO,
- & lc);
- * left_volume = * right_volume = ((lc - pv_min) * 100 + pv_range / 2) /
- pv_range;
- }
- else
- {
- snd_mixer_selem_get_playback_volume( mixer_elem , SND_MIXER_SCHN_FRONT_LEFT , &lc );
- * left_volume = ((lc - pv_min) * 100 + pv_range / 2) / pv_range;
- snd_mixer_selem_get_playback_volume( mixer_elem , SND_MIXER_SCHN_FRONT_RIGHT , &rc );
- * right_volume = ((rc - pv_min) * 100 + pv_range / 2) / pv_range;
- }
+ glong pv_min, pv_max, pv_range;
+ glong lc, rc;
+
+ snd_mixer_selem_get_playback_volume_range (mixer_elem, &pv_min, &pv_max);
+ pv_range = pv_max - pv_min;
+
+ if (pv_range > 0)
+ {
+ if (snd_mixer_selem_is_playback_mono (mixer_elem))
+ {
+ snd_mixer_selem_get_playback_volume (mixer_elem, SND_MIXER_SCHN_MONO,
+ & lc);
+ * left_volume = * right_volume = ((lc - pv_min) * 100 + pv_range / 2) /
+ pv_range;
+ }
+ else
+ {
+ snd_mixer_selem_get_playback_volume (mixer_elem, SND_MIXER_SCHN_FRONT_LEFT, &lc);
+ * left_volume = ((lc - pv_min) * 100 + pv_range / 2) / pv_range;
+ snd_mixer_selem_get_playback_volume (mixer_elem, SND_MIXER_SCHN_FRONT_RIGHT, &rc);
+ * right_volume = ((rc - pv_min) * 100 + pv_range / 2) / pv_range;
+ }
+ }
 }
- }
 
- if ( mixer_h )
- snd_mixer_close( mixer_h );
- /* always return 1 here */
- return 1;
+ if (mixer_h)
+ snd_mixer_close (mixer_h);
+
+ /* always return 1 here */
+ return 1;
 }
 
 
-gint audio_volume_set( gint left_volume , gint right_volume )
+int audio_volume_set (int left_volume, int right_volume)
 {
- snd_mixer_t * mixer_h = NULL;
- snd_mixer_elem_t * mixer_elem = NULL;
- gchar mixer_card[10];
- snprintf( mixer_card , 8 , "hw:%i" , amidiplug_cfg_alsa.alsa_mixer_card_id );
- mixer_card[9] = '\0';
-
- if ( snd_mixer_open( &mixer_h , 0 ) > -1 )
- i_seq_mixer_find_selem( mixer_h , mixer_card ,
- amidiplug_cfg_alsa.alsa_mixer_ctl_name ,
- amidiplug_cfg_alsa.alsa_mixer_ctl_id ,
- &mixer_elem );
- else
- mixer_h = NULL;
+ snd_mixer_t * mixer_h = NULL;
+ snd_mixer_elem_t * mixer_elem = NULL;
+ char mixer_card[10];
+ snprintf (mixer_card, 8, "hw:%i", alsa_cfg->alsa_mixer_card_id);
+ mixer_card[9] = '\0';
 
- if ( ( mixer_elem ) && ( snd_mixer_selem_has_playback_volume( mixer_elem ) ) )
- {
- glong pv_min , pv_max , pv_range;
+ if (snd_mixer_open (&mixer_h, 0) > -1)
+ i_seq_mixer_find_selem (mixer_h, mixer_card,
+ alsa_cfg->alsa_mixer_ctl_name,
+ alsa_cfg->alsa_mixer_ctl_id,
+ &mixer_elem);
+ else
+ mixer_h = NULL;
 
- snd_mixer_selem_get_playback_volume_range( mixer_elem , &pv_min , &pv_max );
- pv_range = pv_max - pv_min;
- if ( pv_range > 0 )
+ if ((mixer_elem) && (snd_mixer_selem_has_playback_volume (mixer_elem)))
 {
- if ( snd_mixer_selem_has_playback_channel( mixer_elem , SND_MIXER_SCHN_FRONT_LEFT ) )
- snd_mixer_selem_set_playback_volume( mixer_elem , SND_MIXER_SCHN_FRONT_LEFT ,
- pv_min + (left_volume * pv_range + 50) / 100);
+ glong pv_min, pv_max, pv_range;
 
- if ( snd_mixer_selem_has_playback_channel( mixer_elem , SND_MIXER_SCHN_FRONT_RIGHT ) )
- snd_mixer_selem_set_playback_volume( mixer_elem , SND_MIXER_SCHN_FRONT_RIGHT ,
- pv_min + (right_volume * pv_range + 50) / 100);
+ snd_mixer_selem_get_playback_volume_range (mixer_elem, &pv_min, &pv_max);
+ pv_range = pv_max - pv_min;
+
+ if (pv_range > 0)
+ {
+ if (snd_mixer_selem_has_playback_channel (mixer_elem, SND_MIXER_SCHN_FRONT_LEFT))
+ snd_mixer_selem_set_playback_volume (mixer_elem, SND_MIXER_SCHN_FRONT_LEFT,
+ pv_min + (left_volume * pv_range + 50) / 100);
+
+ if (snd_mixer_selem_has_playback_channel (mixer_elem, SND_MIXER_SCHN_FRONT_RIGHT))
+ snd_mixer_selem_set_playback_volume (mixer_elem, SND_MIXER_SCHN_FRONT_RIGHT,
+ pv_min + (right_volume * pv_range + 50) / 100);
+ }
 }
- }
 
- if ( mixer_h )
- snd_mixer_close( mixer_h );
- /* always return 1 here */
- return 1;
+ if (mixer_h)
+ snd_mixer_close (mixer_h);
+
+ /* always return 1 here */
+ return 1;
 }
 
 
-gint audio_info_get( gint * channels , gint * bitdepth , gint * samplerate )
+int audio_info_get (int * channels, int * bitdepth, int * samplerate)
 {
- /* not applicable for ALSA backend */
- *channels = -1;
- *bitdepth = -1;
- *samplerate = -1;
- return 0; /* not valid information */
+ /* not applicable for ALSA backend */
+ *channels = -1;
+ *bitdepth = -1;
+ *samplerate = -1;
+ return 0; /* not valid information */
 }
 
 
-gboolean audio_check_autonomous( void )
+bool_t audio_check_autonomous (void)
 {
- return TRUE; /* ALSA deals directly with audio production */
+ return TRUE; /* ALSA deals directly with audio production */
 }
 
 
@@ -490,110 +502,120 @@
 
 /* get a list of writable ALSA MIDI ports
 use the data_bucket_t here...
- bint[0] = client id , bint[1] = port id
- bcharp[0] = client name , bcharp[1] = port name
- bpointer[0] = (not used) , bpointer[1] = (not used) */
-GSList * sequencer_port_get_list( void )
-{
- gint err;
- snd_seq_t * pseq;
- err = snd_seq_open( &pseq , "default" , SND_SEQ_OPEN_DUPLEX , 0 );
- if ( err < 0 )
- return NULL;
-
- GSList * wports = NULL;
- snd_seq_client_info_t *cinfo;
- snd_seq_port_info_t *pinfo;
-
- snd_seq_client_info_alloca( &cinfo );
- snd_seq_port_info_alloca( &pinfo );
-
- snd_seq_client_info_set_client( cinfo , -1 );
- while ( snd_seq_query_next_client( pseq , cinfo ) >= 0 )
- {
- gint client = snd_seq_client_info_get_client( cinfo );
- snd_seq_port_info_set_client( pinfo , client );
- snd_seq_port_info_set_port( pinfo , -1 );
- while (snd_seq_query_next_port( pseq , pinfo ) >= 0 )
+ bint[0] = client id, bint[1] = port id
+ bcharp[0] = client name, bcharp[1] = port name
+ bpointer[0] = (not used), bpointer[1] = (not used) */
+GSList * sequencer_port_get_list (void)
+{
+ int err;
+ snd_seq_t * pseq;
+ err = snd_seq_open (&pseq, "default", SND_SEQ_OPEN_DUPLEX, 0);
+
+ if (err < 0)
+ return NULL;
+
+ GSList * wports = NULL;
+ snd_seq_client_info_t * cinfo;
+ snd_seq_port_info_t * pinfo;
+
+ snd_seq_client_info_alloca (&cinfo);
+ snd_seq_port_info_alloca (&pinfo);
+
+ snd_seq_client_info_set_client (cinfo, -1);
+
+ while (snd_seq_query_next_client (pseq, cinfo) >= 0)
 {
- if ((snd_seq_port_info_get_capability(pinfo)
- & (SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE))
- == (SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE))
- {
- data_bucket_t * portinfo = (data_bucket_t*)g_malloc(sizeof(data_bucket_t));
- portinfo->bint[0] = snd_seq_port_info_get_client( pinfo );
- portinfo->bint[1] = snd_seq_port_info_get_port( pinfo );
- portinfo->bcharp[0] = g_strdup(snd_seq_client_info_get_name(cinfo));
- portinfo->bcharp[1] = g_strdup(snd_seq_port_info_get_name(pinfo));
- wports = g_slist_append( wports , portinfo );
- }
+ int client = snd_seq_client_info_get_client (cinfo);
+ snd_seq_port_info_set_client (pinfo, client);
+ snd_seq_port_info_set_port (pinfo, -1);
+
+ while (snd_seq_query_next_port (pseq, pinfo) >= 0)
+ {
+ if ((snd_seq_port_info_get_capability (pinfo)
+ & (SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE))
+ == (SND_SEQ_PORT_CAP_WRITE | SND_SEQ_PORT_CAP_SUBS_WRITE))
+ {
+ data_bucket_t * portinfo = (data_bucket_t *) malloc (sizeof (data_bucket_t));
+ portinfo->bint[0] = snd_seq_port_info_get_client (pinfo);
+ portinfo->bint[1] = snd_seq_port_info_get_port (pinfo);
+ portinfo->bcharp[0] = g_strdup (snd_seq_client_info_get_name (cinfo));
+ portinfo->bcharp[1] = g_strdup (snd_seq_port_info_get_name (pinfo));
+ wports = g_slist_append (wports, portinfo);
+ }
+ }
 }
- }
- /* snd_seq_port_info_free( pinfo );
- snd_seq_client_info_free( cinfo ); */
- snd_seq_close( pseq );
- return wports;
+
+ /* snd_seq_port_info_free( pinfo );
+ snd_seq_client_info_free( cinfo ); */
+ snd_seq_close (pseq);
+ return wports;
 }
 
 
-void sequencer_port_free_list( GSList * wports )
+void sequencer_port_free_list (GSList * wports)
 {
- GSList * start = wports;
- while ( wports != NULL )
- {
- data_bucket_t * portinfo = wports->data;
- g_free( (gpointer)portinfo->bcharp[0] );
- g_free( (gpointer)portinfo->bcharp[1] );
- g_free( portinfo );
- wports = wports->next;
- }
- g_slist_free( start );
- return;
+ GSList * start = wports;
+
+ while (wports != NULL)
+ {
+ data_bucket_t * portinfo = wports->data;
+ free ((void *) portinfo->bcharp[0]);
+ free ((void *) portinfo->bcharp[1]);
+ free (portinfo);
+ wports = wports->next;
+ }
+
+ g_slist_free (start);
+ return;
 }
 
 
 /* get a list of available sound cards and relative mixer controls;
 use the data_bucket_t here...
- bint[0] = card id , bint[1] = (not used)
- bcharp[0] = card name , bcharp[1] = (not used)
- bpointer[0] = list (GSList) of mixer controls on the card , bpointer[1] = (not used) */
-GSList * alsa_card_get_list( void )
+ bint[0] = card id, bint[1] = (not used)
+ bcharp[0] = card name, bcharp[1] = (not used)
+ bpointer[0] = list (GSList) of mixer controls on the card, bpointer[1] = (not used) */
+GSList * alsa_card_get_list (void)
 {
- gint soundcard_id = -1;
- GSList * scards = NULL;
+ int soundcard_id = -1;
+ GSList * scards = NULL;
+
+ snd_card_next (&soundcard_id);
 
- snd_card_next( &soundcard_id );
- while ( soundcard_id > -1 )
- {
- /* card container */
- data_bucket_t * cardinfo = (data_bucket_t*)g_malloc(sizeof(data_bucket_t));
- cardinfo->bint[0] = soundcard_id;
- /* snd_card_get_name calls strdup on its own */
- snd_card_get_name( soundcard_id , &cardinfo->bcharp[0] );
- /* for each sound card, get a list of available mixer controls */
- cardinfo->bpointer[0] = i_seq_mixctl_get_list( soundcard_id );
+ while (soundcard_id > -1)
+ {
+ /* card container */
+ data_bucket_t * cardinfo = (data_bucket_t *) malloc (sizeof (data_bucket_t));
+ cardinfo->bint[0] = soundcard_id;
+ /* snd_card_get_name calls strdup on its own */
+ snd_card_get_name (soundcard_id, &cardinfo->bcharp[0]);
+ /* for each sound card, get a list of available mixer controls */
+ cardinfo->bpointer[0] = i_seq_mixctl_get_list (soundcard_id);
+
+ scards = g_slist_append (scards, cardinfo);
+ snd_card_next (&soundcard_id);
+ }
 
- scards = g_slist_append( scards , cardinfo );
- snd_card_next( &soundcard_id );
- }
- return scards;
+ return scards;
 }
 
 
-void alsa_card_free_list( GSList * scards )
+void alsa_card_free_list (GSList * scards)
 {
- GSList * start = scards;
- while ( scards != NULL )
- {
- data_bucket_t * cardinfo = scards->data;
- /* free the list of mixer controls for the sound card */
- i_seq_mixctl_free_list( (GSList*)cardinfo->bpointer[0] );
- g_free( (gpointer)cardinfo->bcharp[0] );
- g_free( cardinfo );
- scards = scards->next;
- }
- g_slist_free( start );
- return;
+ GSList * start = scards;
+
+ while (scards != NULL)
+ {
+ data_bucket_t * cardinfo = scards->data;
+ /* free the list of mixer controls for the sound card */
+ i_seq_mixctl_free_list ((GSList *) cardinfo->bpointer[0]);
+ free ((void *) cardinfo->bcharp[0]);
+ free (cardinfo);
+ scards = scards->next;
+ }
+
+ g_slist_free (start);
+ return;
 }
 
 
@@ -604,301 +626,240 @@
 
 
 /* create sequencer client */
-gint i_seq_open( void )
+int i_seq_open (void)
 {
- gint err;
- err = snd_seq_open( &sc.seq , "default" , SND_SEQ_OPEN_DUPLEX , 0 );
- if (err < 0)
- return 0;
- snd_seq_set_client_name( sc.seq , "amidi-plug" );
- return 1;
+ int err;
+ err = snd_seq_open (&sc.seq, "default", SND_SEQ_OPEN_DUPLEX, 0);
+
+ if (err < 0)
+ return 0;
+
+ snd_seq_set_client_name (sc.seq, "amidi-plug");
+ return 1;
 }
 
 
 /* free sequencer client */
-gint i_seq_close( void )
+int i_seq_close (void)
 {
- if ( snd_seq_close( sc.seq ) < 0 )
- return 0; /* fail */
- else
- return 1; /* success */
+ if (snd_seq_close (sc.seq) < 0)
+ return 0; /* fail */
+ else
+ return 1; /* success */
 }
 
 
 /* create queue */
-gint i_seq_queue_create( void )
+int i_seq_queue_create (void)
 {
- sc.queue = snd_seq_alloc_named_queue( sc.seq , "AMIDI-Plug" );
- if ( sc.queue < 0 )
- return 0; /* fail */
- else
- return 1; /* success */
+ sc.queue = snd_seq_alloc_named_queue (sc.seq, "AMIDI-Plug");
+
+ if (sc.queue < 0)
+ return 0; /* fail */
+ else
+ return 1; /* success */
 }
 
 
 /* free queue */
-gint i_seq_queue_free( void )
+int i_seq_queue_free (void)
 {
- if ( snd_seq_free_queue( sc.seq , sc.queue ) < 0 )
- return 0; /* fail */
- else
- return 1; /* success */
+ if (snd_seq_free_queue (sc.seq, sc.queue) < 0)
+ return 0; /* fail */
+ else
+ return 1; /* success */
 }
 
 
 /* create sequencer port */
-gint i_seq_port_create( void )
-{
- sc.client_port = snd_seq_create_simple_port( sc.seq , "AMIDI-Plug" , 0 ,
- SND_SEQ_PORT_TYPE_MIDI_GENERIC |
- SND_SEQ_PORT_TYPE_APPLICATION );
- if ( sc.client_port < 0 )
- return 0; /* fail */
- else
- return 1; /* success */
+int i_seq_port_create (void)
+{
+ sc.client_port = snd_seq_create_simple_port (sc.seq, "AMIDI-Plug", 0,
+ SND_SEQ_PORT_TYPE_MIDI_GENERIC |
+ SND_SEQ_PORT_TYPE_APPLICATION);
+
+ if (sc.client_port < 0)
+ return 0; /* fail */
+ else
+ return 1; /* success */
 }
 
 
 /* port connection */
-gint i_seq_port_connect( void )
-{
- gint i = 0 , err = 0;
- for ( i = 0 ; i < sc.dest_port_num ; i++ )
- {
- if ( snd_seq_connect_to( sc.seq , sc.client_port ,
- sc.dest_port[i].client ,
- sc.dest_port[i].port ) < 0 )
- ++err;
- }
- /* if these values are equal, it means
- that all port connections failed */
- if ( err == i )
- return 0; /* fail */
- else
- return 1; /* success */
+int i_seq_port_connect (void)
+{
+ int i = 0, err = 0;
+
+ for (i = 0 ; i < sc.dest_port_num ; i++)
+ {
+ if (snd_seq_connect_to (sc.seq, sc.client_port,
+ sc.dest_port[i].client,
+ sc.dest_port[i].port) < 0)
+ ++err;
+ }
+
+ /* if these values are equal, it means
+ that all port connections failed */
+ if (err == i)
+ return 0; /* fail */
+ else
+ return 1; /* success */
 }
 
 
 /* port disconnection */
-gint i_seq_port_disconnect( void )
-{
- gint i = 0 , err = 0;
- for ( i = 0 ; i < sc.dest_port_num ; i++ )
- {
- if ( snd_seq_disconnect_to( sc.seq , sc.client_port ,
- sc.dest_port[i].client ,
- sc.dest_port[i].port ) < 0 )
- ++err;
- }
- /* if these values are equal, it means
- that all port disconnections failed */
- if ( err == i )
- return 0; /* fail */
- else
- return 1; /* success */
+int i_seq_port_disconnect (void)
+{
+ int i = 0, err = 0;
+
+ for (i = 0 ; i < sc.dest_port_num ; i++)
+ {
+ if (snd_seq_disconnect_to (sc.seq, sc.client_port,
+ sc.dest_port[i].client,
+ sc.dest_port[i].port) < 0)
+ ++err;
+ }
+
+ /* if these values are equal, it means
+ that all port disconnections failed */
+ if (err == i)
+ return 0; /* fail */
+ else
+ return 1; /* success */
 }
 
 
 /* parse writable ports */
-gint i_seq_port_wparse( gchar * wportlist )
+int i_seq_port_wparse (char * wportlist)
 {
- gint i = 0 , err = 0;
- gchar **portstr = g_strsplit( wportlist , "," , 0 );
+ int i = 0, err = 0;
+ char ** portstr = g_strsplit (wportlist, ",", 0);
 
- sc.dest_port_num = 0;
+ sc.dest_port_num = 0;
 
- /* fill sc.dest_port_num with the writable port number */
- while ( portstr[sc.dest_port_num] != NULL )
- ++sc.dest_port_num;
+ /* fill sc.dest_port_num with the writable port number */
+ while (portstr[sc.dest_port_num] != NULL)
+ ++sc.dest_port_num;
 
- /* check if there is already an allocated array and free it */
- g_free( sc.dest_port );
- sc.dest_port = NULL;
+ /* check if there is already an allocated array and free it */
+ free (sc.dest_port);
+ sc.dest_port = NULL;
 
- if ( sc.dest_port_num > 0 )
- /* allocate the array of writable ports */
- sc.dest_port = g_new0( snd_seq_addr_t, sc.dest_port_num );
+ if (sc.dest_port_num > 0)
+ /* allocate the array of writable ports */
+ sc.dest_port = g_new0 (snd_seq_addr_t, sc.dest_port_num);
 
- for ( i = 0 ; i < sc.dest_port_num ; i++ )
- {
- if ( snd_seq_parse_address( sc.seq , &sc.dest_port[i] , portstr[i] ) < 0 )
- ++err;
- }
+ for (i = 0 ; i < sc.dest_port_num ; i++)
+ {
+ if (snd_seq_parse_address (sc.seq, &sc.dest_port[i], portstr[i]) < 0)
+ ++err;
+ }
 
- g_strfreev( portstr );
+ g_strfreev (portstr);
 
- /* if these values are equal, it means
- that all port translations failed */
- if ( err == i )
- return 0; /* fail */
- else
- return 1; /* success */
+ /* if these values are equal, it means
+ that all port translations failed */
+ if (err == i)
+ return 0; /* fail */
+ else
+ return 1; /* success */
 }
 
 
-gint i_seq_event_common_init( midievent_t * event )
+int i_seq_event_common_init (midievent_t * event)
 {
- sc.ev.type = event->type;
- sc.ev.time.tick = event->tick_real;
- sc.ev.dest = sc.dest_port[event->port];
- return 1;
+ sc.ev.type = event->type;
+ sc.ev.time.tick = event->tick_real;
+ sc.ev.dest = sc.dest_port[event->port];
+ return 1;
 }
 
 
 /* get a list of available mixer controls for a given sound card;
 use the data_bucket_t here...
- bint[0] = control id , bint[1] = (not used)
- bcharp[0] = control name , bcharp[1] = (not used)
- bpointer[0] = (not used) , bpointer[1] = (not used) */
-GSList * i_seq_mixctl_get_list( gint soundcard_id )
-{
- GSList * mixctls = NULL;
- snd_mixer_t * mixer_h;
- snd_mixer_selem_id_t * mixer_selem_id;
- snd_mixer_elem_t * mixer_elem;
- gchar card[10];
-
- snprintf( card , 8 , "hw:%i" , soundcard_id );
- card[9] = '\0';
-
- snd_mixer_selem_id_alloca( &mixer_selem_id );
- snd_mixer_open( &mixer_h , 0 );
- snd_mixer_attach( mixer_h , card );
- snd_mixer_selem_register( mixer_h , NULL , NULL );
- snd_mixer_load( mixer_h );
- for ( mixer_elem = snd_mixer_first_elem( mixer_h ) ; mixer_elem ;
- mixer_elem = snd_mixer_elem_next( mixer_elem ) )
- {
- data_bucket_t * mixctlinfo = (data_bucket_t*)g_malloc(sizeof(data_bucket_t));
- snd_mixer_selem_get_id( mixer_elem , mixer_selem_id );
- mixctlinfo->bint[0] = snd_mixer_selem_id_get_index(mixer_selem_id);
- mixctlinfo->bcharp[0] = g_strdup(snd_mixer_selem_id_get_name(mixer_selem_id));
- mixctls = g_slist_append( mixctls , mixctlinfo );
- }
- snd_mixer_close( mixer_h );
- return mixctls;
-}
-
-
-void i_seq_mixctl_free_list( GSList * mixctls )
-{
- GSList * start = mixctls;
- while ( mixctls != NULL )
- {
- data_bucket_t * mixctlinfo = mixctls->data;
- g_free( (gpointer)mixctlinfo->bcharp[0] );
- g_free( mixctlinfo );
- mixctls = mixctls->next;
- }
- g_slist_free( start );
- return;
-}
-
-
-gint i_seq_mixer_find_selem( snd_mixer_t * mixer_h , gchar * mixer_card ,
- gchar * mixer_control_name , gint mixer_control_id ,
- snd_mixer_elem_t ** mixer_elem )
-{
- snd_mixer_selem_id_t * mixer_selem_id = NULL;
- snd_mixer_selem_id_alloca( &mixer_selem_id );
- snd_mixer_selem_id_set_index( mixer_selem_id , mixer_control_id );
- snd_mixer_selem_id_set_name( mixer_selem_id , mixer_control_name );
- snd_mixer_attach( mixer_h , mixer_card );
- snd_mixer_selem_register( mixer_h , NULL , NULL);
- snd_mixer_load( mixer_h );
- /* assign the mixer element (can be NULL if there is no such element) */
- *mixer_elem = snd_mixer_find_selem( mixer_h , mixer_selem_id );
- /* always return 1 here */
- return 1;
-}
-
-
-gchar * i_configure_read_seq_ports_default( void )
-{
- FILE * fp = NULL;
- /* first try, get seq ports from proc on card0 */
- fp = fopen( "/proc/asound/card0/wavetableD1" , "rb" );
- if ( fp )
- {
- gchar buffer[100];
- while ( !feof( fp ) )
+ bint[0] = control id, bint[1] = (not used)
+ bcharp[0] = control name, bcharp[1] = (not used)
+ bpointer[0] = (not used), bpointer[1] = (not used) */
+GSList * i_seq_mixctl_get_list (int soundcard_id)
+{
+ GSList * mixctls = NULL;
+ snd_mixer_t * mixer_h;
+ snd_mixer_selem_id_t * mixer_selem_id;
+ snd_mixer_elem_t * mixer_elem;
+ char card[10];
+
+ snprintf (card, 8, "hw:%i", soundcard_id);
+ card[9] = '\0';
+
+ snd_mixer_selem_id_alloca (&mixer_selem_id);
+ snd_mixer_open (&mixer_h, 0);
+ snd_mixer_attach (mixer_h, card);
+ snd_mixer_selem_register (mixer_h, NULL, NULL);
+ snd_mixer_load (mixer_h);
+
+ for (mixer_elem = snd_mixer_first_elem (mixer_h) ; mixer_elem ;
+ mixer_elem = snd_mixer_elem_next (mixer_elem))
 {
- if (fgets( buffer , 100 , fp ) && ( strlen( buffer ) > 11 ) && ( !strncasecmp( buffer , "addresses: " , 11 ) ))
- {
- /* change spaces between ports (65:0 65:1 65:2 ...)
- into commas (65:0,65:1,65:2,...) */
- g_strdelimit( &buffer[11] , " " , ',' );
- /* remove lf and cr from the end of the string */
- g_strdelimit( &buffer[11] , "\r\n" , '\0' );
- /* ready to go */
- DEBUGMSG( "init, default values for seq ports detected: %s\n" , &buffer[11] );
- fclose( fp );
- return g_strdup( &buffer[11] );
- }
+ data_bucket_t * mixctlinfo = (data_bucket_t *) malloc (sizeof (data_bucket_t));
+ snd_mixer_selem_get_id (mixer_elem, mixer_selem_id);
+ mixctlinfo->bint[0] = snd_mixer_selem_id_get_index (mixer_selem_id);
+ mixctlinfo->bcharp[0] = g_strdup (snd_mixer_selem_id_get_name (mixer_selem_id));
+ mixctls = g_slist_append (mixctls, mixctlinfo);
 }
- fclose( fp );
- }
 
- /* second option: do not set ports at all, let the user
- select the right ones in the nice config window :) */
- return g_strdup( "" );
+ snd_mixer_close (mixer_h);
+ return mixctls;
 }
 
 
-/* count the number of occurrencies of a specific character 'c'
- in the string 'string' (it must be a null-terminated string) */
-gint i_util_str_count( gchar * string , gchar c )
+void i_seq_mixctl_free_list (GSList * mixctls)
 {
- gint i = 0 , count = 0;
- while ( string[i] != '\0' )
- {
- if ( string[i] == c )
- ++count;
- ++i;
- }
- return count;
-}
+ GSList * start = mixctls;
 
+ while (mixctls != NULL)
+ {
+ data_bucket_t * mixctlinfo = mixctls->data;
+ free ((void *) mixctlinfo->bcharp[0]);
+ free (mixctlinfo);
+ mixctls = mixctls->next;
+ }
 
-void i_cfg_read( i_cfg_get_file_cb callback )
-{
- pcfg_t *cfgfile;
- gchar * config_pathfilename = callback();
- cfgfile = i_pcfg_new_from_file( config_pathfilename );
-
- if ( !cfgfile )
- {
- /* alsa backend defaults */
- amidiplug_cfg_alsa.alsa_seq_wports = i_configure_read_seq_ports_default();
- amidiplug_cfg_alsa.alsa_mixer_card_id = 0;
- amidiplug_cfg_alsa.alsa_mixer_ctl_name = g_strdup( "Synth" );
- amidiplug_cfg_alsa.alsa_mixer_ctl_id = 0;
- }
- else
- {
- i_pcfg_read_string( cfgfile , "alsa" , "alsa_seq_wports" ,
- &amidiplug_cfg_alsa.alsa_seq_wports , NULL );
- if ( amidiplug_cfg_alsa.alsa_seq_wports == NULL )
- amidiplug_cfg_alsa.alsa_seq_wports = i_configure_read_seq_ports_default(); /* pick default values */
+ g_slist_free (start);
+ return;
+}
 
- i_pcfg_read_integer( cfgfile , "alsa" , "alsa_mixer_card_id" ,
- &amidiplug_cfg_alsa.alsa_mixer_card_id , 0 );
 
- i_pcfg_read_string( cfgfile , "alsa" , "alsa_mixer_ctl_name" ,
- &amidiplug_cfg_alsa.alsa_mixer_ctl_name , "Synth" );
+int i_seq_mixer_find_selem (snd_mixer_t * mixer_h, char * mixer_card,
+ char * mixer_control_name, int mixer_control_id,
+ snd_mixer_elem_t ** mixer_elem)
+{
+ snd_mixer_selem_id_t * mixer_selem_id = NULL;
+ snd_mixer_selem_id_alloca (&mixer_selem_id);
+ snd_mixer_selem_id_set_index (mixer_selem_id, mixer_control_id);
+ snd_mixer_selem_id_set_name (mixer_selem_id, mixer_control_name);
+ snd_mixer_attach (mixer_h, mixer_card);
+ snd_mixer_selem_register (mixer_h, NULL, NULL);
+ snd_mixer_load (mixer_h);
+ /* assign the mixer element (can be NULL if there is no such element) */
+ *mixer_elem = snd_mixer_find_selem (mixer_h, mixer_selem_id);
+ /* always return 1 here */
+ return 1;
+}
 
- i_pcfg_read_integer( cfgfile , "alsa" , "alsa_mixer_ctl_id" ,
- &amidiplug_cfg_alsa.alsa_mixer_ctl_id , 0 );
 
- i_pcfg_free( cfgfile );
- }
+/* count the number of occurrencies of a specific character 'c'
+ in the string 'string' (it must be a null-terminated string) */
+int i_util_str_count (char * string, char c)
+{
+ int i = 0, count = 0;
 
- g_free( config_pathfilename );
-}
+ while (string[i] != '\0')
+ {
+ if (string[i] == c)
+ ++count;
 
+ ++i;
+ }
 
-void i_cfg_free( void )
-{
- g_free( amidiplug_cfg_alsa.alsa_seq_wports );
- g_free( amidiplug_cfg_alsa.alsa_mixer_ctl_name );
+ return count;
 }

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/backend-alsa/b-alsa.h -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/backend-alsa/b-alsa.h Changed

@@ -21,44 +21,43 @@
 #ifndef _B_ALSA_H
 #define _B_ALSA_H 1
 
+#include <glib.h>
 #include <alsa/asoundlib.h>
+#include <libaudcore/core.h>
+
 #include "../i_common.h"
-#include "../i_configure_file.h"
-#include "../pcfg/i_pcfg.h"
 #include "../i_midievent.h"
 
 
 typedef struct
 {
- snd_seq_t * seq;
- gint client_port;
- gint queue;
+ snd_seq_t * seq;
+ int client_port;
+ int queue;
 
- snd_seq_addr_t * dest_port;
- gint dest_port_num;
+ snd_seq_addr_t * dest_port;
+ int dest_port_num;
 
- snd_seq_queue_tempo_t * queue_tempo;
+ snd_seq_queue_tempo_t * queue_tempo;
 
- snd_seq_event_t ev;
+ snd_seq_event_t ev;
 
- gboolean is_start;
+ bool_t is_start;
 }
 sequencer_client_t;
 
-gint i_seq_open( void );
-gint i_seq_close( void );
-gint i_seq_queue_create( void );
-gint i_seq_queue_free( void );
-gint i_seq_port_create( void );
-gint i_seq_port_connect( void );
-gint i_seq_port_disconnect( void );
-gint i_seq_port_wparse( gchar * );
-gint i_seq_event_common_init( midievent_t * );
-GSList * i_seq_mixctl_get_list( gint );
-void i_seq_mixctl_free_list( GSList * );
-gint i_seq_mixer_find_selem( snd_mixer_t * , gchar * , gchar * , gint , snd_mixer_elem_t ** );
-void i_cfg_read( i_cfg_get_file_cb );
-void i_cfg_free( void );
-gint i_util_str_count( gchar * , gchar );
+int i_seq_open (void);
+int i_seq_close (void);
+int i_seq_queue_create (void);
+int i_seq_queue_free (void);
+int i_seq_port_create (void);
+int i_seq_port_connect (void);
+int i_seq_port_disconnect (void);
+int i_seq_port_wparse (char *);
+int i_seq_event_common_init (midievent_t *);
+GSList * i_seq_mixctl_get_list (int);
+void i_seq_mixctl_free_list (GSList *);
+int i_seq_mixer_find_selem (snd_mixer_t *, char *, char *, int, snd_mixer_elem_t **);
+int i_util_str_count (char *, char);
 
 #endif /* !_B_ALSA_H */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/backend-fluidsynth/Makefile -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/backend-fluidsynth/Makefile Changed

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/backend-fluidsynth/b-fluidsynth.c -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/backend-fluidsynth/b-fluidsynth.c Changed

@@ -19,140 +19,151 @@
 */
 
 #include <pthread.h>
+#include <string.h>
 
+#include <audacious/i18n.h>
+#include <audacious/misc.h>
+
+#include "../i_configure.h"
 #include "b-fluidsynth.h"
-#include "b-fluidsynth-config.h"
 
 /* sequencer instance */
 static sequencer_client_t sc;
 /* options */
-static amidiplug_cfg_fsyn_t amidiplug_cfg_fsyn;
+static amidiplug_cfg_fsyn_t * fsyn_cfg;
 
 static pthread_mutex_t timer_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t timer_cond = PTHREAD_COND_INITIALIZER;
 static gint64 timer; /* microseconds */
 
-gint backend_info_get( gchar ** name , gchar ** longname , gchar ** desc , gint * ppos )
+int backend_info_get (char ** name, char ** longname, char ** desc, int * ppos)
 {
- if ( name != NULL )
- *name = g_strdup( "fluidsynth" );
- if ( longname != NULL )
- *longname = g_strjoin( "", _("FluidSynth Backend "), AMIDIPLUG_VERSION, NULL );
- if ( desc != NULL )
- *desc = g_strdup( _("This backend produces audio by sending MIDI events "
- "to FluidSynth, a real-time software synthesizer based "
- "on the SoundFont2 specification (www.fluidsynth.org).\n"
- "Produced audio can be manipulated via player effect "
- "plugins and is processed by chosen output plugin.\n"
- "Backend written by Giacomo Lozito.") );
- if ( ppos != NULL )
- *ppos = 2; /* preferred position in backend list */
- return 1;
+ if (name != NULL)
+ *name = g_strdup ("fluidsynth");
+
+ if (longname != NULL)
+ *longname = g_strdup (_("FluidSynth Backend "));
+
+ if (desc != NULL)
+ *desc = g_strdup (_("This backend produces audio by sending MIDI events "
+ "to FluidSynth, a real-time software synthesizer based "
+ "on the SoundFont2 specification (www.fluidsynth.org).\n"
+ "Produced audio can be manipulated via player effect "
+ "plugins and is processed by chosen output plugin.\n"
+ "Backend written by Giacomo Lozito."));
+
+ if (ppos != NULL)
+ *ppos = 2; /* preferred position in backend list */
+
+ return 1;
 }
 
 
-gint backend_init( i_cfg_get_file_cb callback )
+int backend_init (amidiplug_cfg_backend_t * cfg)
 {
- /* read configuration options */
- i_cfg_read( callback );
+ fsyn_cfg = cfg->fsyn;
+
+ sc.soundfont_ids = g_array_new (FALSE, FALSE, sizeof (int));
+ sc.sample_rate = fsyn_cfg->fsyn_synth_samplerate;
+ sc.settings = new_fluid_settings();
+
+ fluid_settings_setnum (sc.settings, "synth.sample-rate", fsyn_cfg->fsyn_synth_samplerate);
 
- sc.soundfont_ids = g_array_new( FALSE , FALSE , sizeof(gint) );
- sc.sample_rate = amidiplug_cfg_fsyn.fsyn_synth_samplerate;
- sc.settings = new_fluid_settings();
+ if (fsyn_cfg->fsyn_synth_gain != -1)
+ fluid_settings_setnum (sc.settings, "synth.gain", (gdouble) fsyn_cfg->fsyn_synth_gain / 10);
 
- fluid_settings_setnum( sc.settings , "synth.sample-rate" , amidiplug_cfg_fsyn.fsyn_synth_samplerate );
- if ( amidiplug_cfg_fsyn.fsyn_synth_gain != -1 )
- fluid_settings_setnum( sc.settings , "synth.gain" , (gdouble)amidiplug_cfg_fsyn.fsyn_synth_gain / 10 );
- if ( amidiplug_cfg_fsyn.fsyn_synth_polyphony != -1 )
- fluid_settings_setint( sc.settings , "synth.polyphony" , amidiplug_cfg_fsyn.fsyn_synth_polyphony );
- if ( amidiplug_cfg_fsyn.fsyn_synth_reverb == 1 )
- fluid_settings_setstr( sc.settings , "synth.reverb.active" , "yes" );
- else if ( amidiplug_cfg_fsyn.fsyn_synth_reverb == 0 )
- fluid_settings_setstr( sc.settings , "synth.reverb.active" , "no" );
- if ( amidiplug_cfg_fsyn.fsyn_synth_chorus == 1 )
- fluid_settings_setstr( sc.settings , "synth.chorus.active" , "yes" );
- else if ( amidiplug_cfg_fsyn.fsyn_synth_chorus == 0 )
- fluid_settings_setstr( sc.settings , "synth.chorus.active" , "no" );
+ if (fsyn_cfg->fsyn_synth_polyphony != -1)
+ fluid_settings_setint (sc.settings, "synth.polyphony", fsyn_cfg->fsyn_synth_polyphony);
 
- sc.synth = new_fluid_synth( sc.settings );
+ if (fsyn_cfg->fsyn_synth_reverb == 1)
+ fluid_settings_setstr (sc.settings, "synth.reverb.active", "yes");
+ else if (fsyn_cfg->fsyn_synth_reverb == 0)
+ fluid_settings_setstr (sc.settings, "synth.reverb.active", "no");
 
- /* soundfont loader, check if we should load soundfont on backend init */
- if ( amidiplug_cfg_fsyn.fsyn_soundfont_load == 0 )
- i_soundfont_load();
+ if (fsyn_cfg->fsyn_synth_chorus == 1)
+ fluid_settings_setstr (sc.settings, "synth.chorus.active", "yes");
+ else if (fsyn_cfg->fsyn_synth_chorus == 0)
+ fluid_settings_setstr (sc.settings, "synth.chorus.active", "no");
 
- return 1;
+ sc.synth = new_fluid_synth (sc.settings);
+
+ /* soundfont loader, check if we should load soundfont on backend init */
+ if (fsyn_cfg->fsyn_soundfont_load == 0)
+ i_soundfont_load();
+
+ return 1;
 }
 
 
-gint backend_cleanup( void )
+int backend_cleanup (void)
 {
- if ( sc.soundfont_ids->len > 0 )
- {
- /* unload soundfonts */
- gint i = 0;
- for ( i = 0 ; i < sc.soundfont_ids->len ; i++ )
- fluid_synth_sfunload( sc.synth , g_array_index( sc.soundfont_ids , gint , i ) , 0 );
- }
- g_array_free( sc.soundfont_ids , TRUE );
- delete_fluid_synth( sc.synth );
- delete_fluid_settings( sc.settings );
+ if (sc.soundfont_ids->len > 0)
+ {
+ /* unload soundfonts */
+ int i = 0;
 
- i_cfg_free(); /* free configuration options */
+ for (i = 0 ; i < sc.soundfont_ids->len ; i++)
+ fluid_synth_sfunload (sc.synth, g_array_index (sc.soundfont_ids, int, i), 0);
+ }
+
+ g_array_free (sc.soundfont_ids, TRUE);
+ delete_fluid_synth (sc.synth);
+ delete_fluid_settings (sc.settings);
 
- return 1;
+ return 1;
 }
 
 
-gint sequencer_get_port_count( void )
+int sequencer_get_port_count (void)
 {
- /* always return a single port here */
- return 1;
+ /* always return a single port here */
+ return 1;
 }
 
 
-gint sequencer_start( gchar * midi_fname )
+int sequencer_start (char * midi_fname)
 {
- /* soundfont loader, check if we should load soundfont on first midifile play */
- if (( amidiplug_cfg_fsyn.fsyn_soundfont_load == 1 ) && ( sc.soundfont_ids->len == 0 ))
- i_soundfont_load();
+ /* soundfont loader, check if we should load soundfont on first midifile play */
+ if ((fsyn_cfg->fsyn_soundfont_load == 1) && (sc.soundfont_ids->len == 0))
+ i_soundfont_load();
 
- return 1; /* success */
+ return 1; /* success */
 }
 
 
-gint sequencer_stop( void )
+int sequencer_stop (void)
 {
- return 1; /* success */
+ return 1; /* success */
 }
 
 
 /* activate sequencer client */
-gint sequencer_on( void )
+int sequencer_on (void)
 {
- sc.tick_offset = 0;
+ sc.tick_offset = 0;
 
- return 1; /* success */
+ return 1; /* success */
 }
 
 
 /* shutdown sequencer client */
-gint sequencer_off( void )
+int sequencer_off (void)
 {
- return 1; /* success */
+ return 1; /* success */
 }
 
 
 /* queue set tempo */
-gint sequencer_queue_tempo( gint tempo , gint ppq )
+int sequencer_queue_tempo (int tempo, int ppq)
 {
- sc.ppq = ppq;
- /* sc.cur_tick_per_sec = (gdouble)( ppq * 1000000 ) / (gdouble)tempo; */
- sc.cur_microsec_per_tick = (gdouble)tempo / (gdouble)ppq;
- return 1;
+ sc.ppq = ppq;
+ /* sc.cur_tick_per_sec = (gdouble)( ppq * 1000000 ) / (gdouble)tempo; */
+ sc.cur_microsec_per_tick = (gdouble) tempo / (gdouble) ppq;
+ return 1;
 }
 
 
-gint sequencer_queue_start (void)
+int sequencer_queue_start (void)
 {
 pthread_mutex_lock (& timer_mutex);
 timer = 0;
@@ -162,135 +173,137 @@
 }
 
 
-gint sequencer_queue_stop( void )
+int sequencer_queue_stop (void)
 {
- return 1;
+ return 1;
 }
 
 
-gint sequencer_event_init( void )
+int sequencer_event_init (void)
 {
- /* common settings for all our events */
- return 1;
+ /* common settings for all our events */
+ return 1;
 }
 
 
-gint sequencer_event_noteon( midievent_t * event )
+int sequencer_event_noteon (midievent_t * event)
 {
- i_sleep( event->tick_real );
- fluid_synth_noteon( sc.synth ,
- event->data.d[0] ,
- event->data.d[1] ,
- event->data.d[2] );
- return 1;
+ i_sleep (event->tick_real);
+ fluid_synth_noteon (sc.synth,
+ event->data.d[0],
+ event->data.d[1],
+ event->data.d[2]);
+ return 1;
 }
 
 
-gint sequencer_event_noteoff( midievent_t * event )
+int sequencer_event_noteoff (midievent_t * event)
 {
- i_sleep( event->tick_real );
- fluid_synth_noteoff( sc.synth ,
- event->data.d[0] ,
- event->data.d[1] );
- return 1;
+ i_sleep (event->tick_real);
+ fluid_synth_noteoff (sc.synth,
+ event->data.d[0],
+ event->data.d[1]);
+ return 1;
 }
 
 
-gint sequencer_event_keypress( midievent_t * event )
+int sequencer_event_keypress (midievent_t * event)
 {
- /* KEY PRESSURE events are not handled by FluidSynth sequencer? */
- DEBUGMSG( "KEYPRESS EVENT with FluidSynth backend (unhandled)\n" );
- i_sleep( event->tick_real );
- return 1;
+ /* KEY PRESSURE events are not handled by FluidSynth sequencer? */
+ DEBUGMSG ("KEYPRESS EVENT with FluidSynth backend (unhandled)\n");
+ i_sleep (event->tick_real);
+ return 1;
 }
 
 
-gint sequencer_event_controller( midievent_t * event )
+int sequencer_event_controller (midievent_t * event)
 {
- i_sleep( event->tick_real );
- fluid_synth_cc( sc.synth ,
- event->data.d[0] ,
- event->data.d[1] ,
- event->data.d[2] );
- return 1;
+ i_sleep (event->tick_real);
+ fluid_synth_cc (sc.synth,
+ event->data.d[0],
+ event->data.d[1],
+ event->data.d[2]);
+ return 1;
 }
 
 
-gint sequencer_event_pgmchange( midievent_t * event )
+int sequencer_event_pgmchange (midievent_t * event)
 {
- i_sleep( event->tick_real );
- fluid_synth_program_change( sc.synth ,
- event->data.d[0] ,
- event->data.d[1] );
- return 1;
+ i_sleep (event->tick_real);
+ fluid_synth_program_change (sc.synth,
+ event->data.d[0],
+ event->data.d[1]);
+ return 1;
 }
 
 
-gint sequencer_event_chanpress( midievent_t * event )
+int sequencer_event_chanpress (midievent_t * event)
 {
- /* CHANNEL PRESSURE events are not handled by FluidSynth sequencer? */
- DEBUGMSG( "CHANPRESS EVENT with FluidSynth backend (unhandled)\n" );
- i_sleep( event->tick_real );
- return 1;
+ /* CHANNEL PRESSURE events are not handled by FluidSynth sequencer? */
+ DEBUGMSG ("CHANPRESS EVENT with FluidSynth backend (unhandled)\n");
+ i_sleep (event->tick_real);
+ return 1;
 }
 
 
-gint sequencer_event_pitchbend( midievent_t * event )
+int sequencer_event_pitchbend (midievent_t * event)
 {
- gint pb_value = (((event->data.d[2]) & 0x7f) << 7) | ((event->data.d[1]) & 0x7f);
- i_sleep( event->tick_real );
- fluid_synth_pitch_bend( sc.synth ,
- event->data.d[0] ,
- pb_value );
- return 1;
+ int pb_value = (( (event->data.d[2]) & 0x7f) << 7) | ((event->data.d[1]) & 0x7f);
+ i_sleep (event->tick_real);
+ fluid_synth_pitch_bend (sc.synth,
+ event->data.d[0],
+ pb_value);
+ return 1;
 }
 
 
-gint sequencer_event_sysex( midievent_t * event )
+int sequencer_event_sysex (midievent_t * event)
 {
- DEBUGMSG( "SYSEX EVENT with FluidSynth backend (unhandled)\n" );
- i_sleep( event->tick_real );
- return 1;
+ DEBUGMSG ("SYSEX EVENT with FluidSynth backend (unhandled)\n");
+ i_sleep (event->tick_real);
+ return 1;
 }
 
 
-gint sequencer_event_tempo( midievent_t * event )
+int sequencer_event_tempo (midievent_t * event)
 {
- i_sleep( event->tick_real );
- /* sc.cur_tick_per_sec = (gdouble)( sc.ppq * 1000000 ) / (gdouble)event->data.tempo; */
- sc.cur_microsec_per_tick = (gdouble)event->data.tempo / (gdouble)sc.ppq;
- sc.tick_offset = event->tick_real;
+ i_sleep (event->tick_real);
+ /* sc.cur_tick_per_sec = (gdouble)( sc.ppq * 1000000 ) / (gdouble)event->data.tempo; */
+ sc.cur_microsec_per_tick = (gdouble) event->data.tempo / (gdouble) sc.ppq;
+ sc.tick_offset = event->tick_real;
 
- pthread_mutex_lock (& timer_mutex);
- timer = 0;
- pthread_mutex_unlock (& timer_mutex);
+ pthread_mutex_lock (& timer_mutex);
+ timer = 0;
+ pthread_mutex_unlock (& timer_mutex);
 
- return 1;
+ return 1;
 }
 
 
-gint sequencer_event_other( midievent_t * event )
+int sequencer_event_other (midievent_t * event)
 {
- /* unhandled */
- i_sleep( event->tick_real );
- return 1;
+ /* unhandled */
+ i_sleep (event->tick_real);
+ return 1;
 }
 
 
-gint sequencer_event_allnoteoff( gint unused )
+int sequencer_event_allnoteoff (int unused)
 {
- gint c = 0;
- for ( c = 0 ; c < 16 ; c++ )
- {
- fluid_synth_cc (sc.synth, c, 123 /* all notes off */, 0);
- }
- return 1;
+ int c = 0;
+
+ for (c = 0 ; c < 16 ; c++)
+ {
+ fluid_synth_cc (sc.synth, c, 123 /* all notes off */, 0);
+ }
+
+ return 1;
 }
 
 
-gint sequencer_output (void * * buffer, gint * length)
+int sequencer_output (void * * buffer, int * length)
 {
- gint frames = sc.sample_rate / 100;
+ int frames = sc.sample_rate / 100;
 
 * buffer = g_realloc (* buffer, 4 * frames);
 * length = 4 * frames;
@@ -305,38 +318,38 @@
 }
 
 
-gint sequencer_output_shut( guint max_tick , gint skip_offset )
+int sequencer_output_shut (unsigned max_tick, int skip_offset)
 {
- i_sleep (max_tick - skip_offset);
- fluid_synth_system_reset( sc.synth ); /* all notes off and channels reset */
- return 1;
+ i_sleep (max_tick - skip_offset);
+ fluid_synth_system_reset (sc.synth); /* all notes off and channels reset */
+ return 1;
 }
 
 
 /* unimplemented, for autonomous audio == FALSE volume is set by the
 output plugin mixer controls and is not handled by input plugins */
-gint audio_volume_get( gint * left_volume , gint * right_volume )
+int audio_volume_get (int * left_volume, int * right_volume)
 {
- return 0;
+ return 0;
 }
-gint audio_volume_set( gint left_volume , gint right_volume )
+int audio_volume_set (int left_volume, int right_volume)
 {
- return 0;
+ return 0;
 }
 
 
-gint audio_info_get( gint * channels , gint * bitdepth , gint * samplerate )
+int audio_info_get (int * channels, int * bitdepth, int * samplerate)
 {
- *channels = 2;
- *bitdepth = 16; /* always 16 bit, we use fluid_synth_write_s16() */
- *samplerate = amidiplug_cfg_fsyn.fsyn_synth_samplerate;
- return 1; /* valid information */
+ *channels = 2;
+ *bitdepth = 16; /* always 16 bit, we use fluid_synth_write_s16() */
+ *samplerate = fsyn_cfg->fsyn_synth_samplerate;
+ return 1; /* valid information */
 }
 
 
-gboolean audio_check_autonomous( void )
+bool_t audio_check_autonomous (void)
 {
- return FALSE; /* FluidSynth gives produced audio back to player */
+ return FALSE; /* FluidSynth gives produced audio back to player */
 }
 
 
@@ -346,117 +359,60 @@
 ****************************************************************** */
 
 
-void i_sleep( guint tick )
+void i_sleep (unsigned tick)
 {
- gdouble elapsed_tick_usecs = (gdouble)(tick - sc.tick_offset) * sc.cur_microsec_per_tick;
+ gdouble elapsed_tick_usecs = (gdouble) (tick - sc.tick_offset) * sc.cur_microsec_per_tick;
 
- pthread_mutex_lock (& timer_mutex);
+ pthread_mutex_lock (& timer_mutex);
 
- while (timer < elapsed_tick_usecs)
- pthread_cond_wait (& timer_cond, & timer_mutex);
+ while (timer < elapsed_tick_usecs)
+ pthread_cond_wait (& timer_cond, & timer_mutex);
 
- pthread_mutex_unlock (& timer_mutex);
+ pthread_mutex_unlock (& timer_mutex);
 }
 
 
-void i_soundfont_load( void )
+void i_soundfont_load (void)
 {
- if ( strcmp( amidiplug_cfg_fsyn.fsyn_soundfont_file , "" ) )
- {
- gchar **sffiles = g_strsplit( amidiplug_cfg_fsyn.fsyn_soundfont_file , ";" , 0 );
- gint i = 0;
- while ( sffiles[i] != NULL )
+ if (strcmp (fsyn_cfg->fsyn_soundfont_file, ""))
 {
- gint sf_id = 0;
- DEBUGMSG( "loading soundfont %s\n" , sffiles[i] );
- sf_id = fluid_synth_sfload( sc.synth , sffiles[i] , 0 );
- if ( sf_id == -1 )
- {
- g_warning( "unable to load SoundFont file %s\n" , sffiles[i] );
- }
- else
- {
- DEBUGMSG( "soundfont %s successfully loaded\n" , sffiles[i] );
- g_array_append_val( sc.soundfont_ids , sf_id );
- }
- i++;
+ char ** sffiles = g_strsplit (fsyn_cfg->fsyn_soundfont_file, ";", 0);
+ int i = 0;
+
+ while (sffiles[i] != NULL)
+ {
+ int sf_id = 0;
+ DEBUGMSG ("loading soundfont %s\n", sffiles[i]);
+ sf_id = fluid_synth_sfload (sc.synth, sffiles[i], 0);
+
+ if (sf_id == -1)
+ {
+ g_warning ("unable to load SoundFont file %s\n", sffiles[i]);
+ }
+ else
+ {
+ DEBUGMSG ("soundfont %s successfully loaded\n", sffiles[i]);
+ g_array_append_val (sc.soundfont_ids, sf_id);
+ }
+
+ i++;
+ }
+
+ g_strfreev (sffiles);
+
+ fluid_synth_system_reset (sc.synth);
+ }
+ else
+ {
+ g_warning ("FluidSynth backend was selected, but no SoundFont has been specified\n");
 }
- g_strfreev( sffiles );
-
- fluid_synth_system_reset (sc.synth);
- }
- else
- {
- g_warning( "FluidSynth backend was selected, but no SoundFont has been specified\n" );
- }
-}
-
-
-gboolean i_bounds_check( gint value , gint min , gint max )
-{
- if (( value >= min ) && ( value <= max ))
- return TRUE;
- else
- return FALSE;
-}
-
-
-void i_cfg_read( i_cfg_get_file_cb callback )
-{
- pcfg_t *cfgfile;
- gchar * config_pathfilename = callback();
- cfgfile = i_pcfg_new_from_file( config_pathfilename );
-
- if ( !cfgfile )
- {
- /* fluidsynth backend defaults */
- amidiplug_cfg_fsyn.fsyn_soundfont_file = g_strdup( "" );
- amidiplug_cfg_fsyn.fsyn_soundfont_load = 1;
- amidiplug_cfg_fsyn.fsyn_synth_samplerate = 44100;
- amidiplug_cfg_fsyn.fsyn_synth_gain = -1;
- amidiplug_cfg_fsyn.fsyn_synth_polyphony = -1;
- amidiplug_cfg_fsyn.fsyn_synth_reverb = -1;
- amidiplug_cfg_fsyn.fsyn_synth_chorus = -1;
- }
- else
- {
- i_pcfg_read_string( cfgfile , "fsyn" , "fsyn_soundfont_file" ,
- &amidiplug_cfg_fsyn.fsyn_soundfont_file , "" );
-
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_soundfont_load" ,
- &amidiplug_cfg_fsyn.fsyn_soundfont_load , 1 );
-
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_samplerate" ,
- &amidiplug_cfg_fsyn.fsyn_synth_samplerate , 44100 );
- if ( !i_bounds_check( amidiplug_cfg_fsyn.fsyn_synth_samplerate , 22050 , 96000 ) )
- amidiplug_cfg_fsyn.fsyn_synth_samplerate = 44100;
-
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_gain" ,
- &amidiplug_cfg_fsyn.fsyn_synth_gain , -1 );
- if (( amidiplug_cfg_fsyn.fsyn_synth_gain != -1 ) &&
- ( !i_bounds_check( amidiplug_cfg_fsyn.fsyn_synth_gain , 0 , 100 ) ))
- amidiplug_cfg_fsyn.fsyn_synth_gain = -1;
-
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_polyphony" ,
- &amidiplug_cfg_fsyn.fsyn_synth_polyphony , -1 );
- if (( amidiplug_cfg_fsyn.fsyn_synth_polyphony != -1 ) &&
- ( !i_bounds_check( amidiplug_cfg_fsyn.fsyn_synth_polyphony , 0 , 100 ) ))
- amidiplug_cfg_fsyn.fsyn_synth_polyphony = -1;
-
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_reverb" ,
- &amidiplug_cfg_fsyn.fsyn_synth_reverb , -1 );
-
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_chorus" ,
- &amidiplug_cfg_fsyn.fsyn_synth_chorus , -1 );
-
- i_pcfg_free( cfgfile );
- }
-
- g_free( config_pathfilename );
 }
 
 
-void i_cfg_free( void )
+bool_t i_bounds_check (int value, int min, int max)
 {
- g_free( amidiplug_cfg_fsyn.fsyn_soundfont_file );
+ if ((value >= min) && (value <= max))
+ return TRUE;
+ else
+ return FALSE;
 }

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/backend-fluidsynth/b-fluidsynth.h -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/backend-fluidsynth/b-fluidsynth.h Changed

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_backend.c -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_backend.c Changed

@@ -20,176 +20,161 @@
 
 #include "i_backend.h"
 
+#include <stdlib.h>
+
+#include "i_common.h"
+#include "i_configure.h"
+
 /* GCC does not like casting func * * to void * *. */
-static void * get_symbol (GModule * mod, const gchar * name)
+static void * get_symbol (GModule * mod, const char * name)
 {
 void * sym = NULL;
 g_module_symbol (mod, name, & sym);
 return sym;
 }
 
-gboolean i_str_has_pref_and_suff( const gchar *str , gchar *pref , gchar *suff )
+bool_t i_str_has_pref_and_suff (const char * str, char * pref, char * suff)
 {
- if ( (g_str_has_prefix( str , pref )) &&
- (g_str_has_suffix( str , suff )) )
- return TRUE;
- else
- return FALSE;
+ if ((g_str_has_prefix (str, pref)) &&
+ (g_str_has_suffix (str, suff)))
+ return TRUE;
+ else
+ return FALSE;
 }
 
-GSList * i_backend_list_lookup( void )
+GSList * i_backend_list_lookup (void)
 {
- GDir * backend_directory;
- GSList * backend_list = NULL;
-
- backend_directory = g_dir_open( AMIDIPLUGBACKENDDIR , 0 , NULL );
- if ( backend_directory != NULL )
- {
- const gchar * backend_directory_entry = g_dir_read_name( backend_directory );
- while ( backend_directory_entry != NULL )
+ GDir * backend_directory;
+ GSList * backend_list = NULL;
+
+ backend_directory = g_dir_open (AMIDIPLUGBACKENDDIR, 0, NULL);
+
+ if (backend_directory != NULL)
 {
- /* simple filename checking */
- if ( i_str_has_pref_and_suff( backend_directory_entry , "ap-" , ".so" ) == TRUE )
- {
- GModule * module;
- gchar * (*getapmoduleinfo)( gchar ** , gchar ** , gchar ** , gint * );
- gchar * module_pathfilename = g_strjoin( "" , AMIDIPLUGBACKENDDIR , "/" ,
- backend_directory_entry , NULL );
- /* seems to be a backend for amidi-plug , try to load it */
- module = g_module_open( module_pathfilename , G_MODULE_BIND_LOCAL );
- if ( module == NULL )
- g_warning( "Error loading module %s - %s\n" , module_pathfilename , g_module_error() );
- else
+ const char * backend_directory_entry = g_dir_read_name (backend_directory);
+
+ while (backend_directory_entry != NULL)
 {
- /* try to get the module name */
- if ((getapmoduleinfo = get_symbol (module , "backend_info_get")))
- {
- /* module name found, ok! add its name and filename to the list */
- amidiplug_sequencer_backend_name_t * mn = g_malloc(sizeof(amidiplug_sequencer_backend_name_t));
- /* name and desc dinamically allocated */
- getapmoduleinfo( &mn->name , &mn->longname , &mn->desc , &mn->ppos );
- mn->filename = g_strdup(module_pathfilename); /* dinamically allocated */
- DEBUGMSG( "Backend found and added in list, filename: %s and lname: %s\n" ,
- mn->filename, mn->longname );
- backend_list = g_slist_append( backend_list , mn );
- }
- else
- {
- /* module name not found, this is not a backend for amidi-plug */
- g_warning( "File %s is not a backend for amidi-plug!\n" , module_pathfilename );
- }
- g_module_close( module );
+ /* simple filename checking */
+ if (i_str_has_pref_and_suff (backend_directory_entry, "ap-", "." G_MODULE_SUFFIX) == TRUE)
+ {
+ GModule * module;
+ char * (*getapmoduleinfo) (char **, char **, char **, int *);
+ char * module_pathfilename = g_strjoin ("", AMIDIPLUGBACKENDDIR, "/",
+ backend_directory_entry, NULL);
+ /* seems to be a backend for amidi-plug, try to load it */
+ module = g_module_open (module_pathfilename, G_MODULE_BIND_LOCAL);
+
+ if (module == NULL)
+ g_warning ("Error loading module %s - %s\n", module_pathfilename, g_module_error());
+ else
+ {
+ /* try to get the module name */
+ if ((getapmoduleinfo = get_symbol (module, "backend_info_get")))
+ {
+ /* module name found, ok! add its name and filename to the list */
+ amidiplug_sequencer_backend_name_t * mn = malloc (sizeof (amidiplug_sequencer_backend_name_t));
+ /* name and desc dinamically allocated */
+ getapmoduleinfo (&mn->name, &mn->longname, &mn->desc, &mn->ppos);
+ mn->filename = g_strdup (module_pathfilename); /* dinamically allocated */
+ DEBUGMSG ("Backend found and added in list, filename: %s and lname: %s\n",
+ mn->filename, mn->longname);
+ backend_list = g_slist_append (backend_list, mn);
+ }
+ else
+ {
+ /* module name not found, this is not a backend for amidi-plug */
+ g_warning ("File %s is not a backend for amidi-plug!\n", module_pathfilename);
+ }
+
+ g_module_close (module);
+ }
+ }
+
+ backend_directory_entry = g_dir_read_name (backend_directory);
 }
- }
- backend_directory_entry = g_dir_read_name( backend_directory );
+
+ g_dir_close (backend_directory);
 }
- g_dir_close( backend_directory );
- }
- else
- g_warning( "Unable to open the backend directory %s\n" , AMIDIPLUGBACKENDDIR );
+ else
+ g_warning ("Unable to open the backend directory %s\n", AMIDIPLUGBACKENDDIR);
 
- return backend_list;
+ return backend_list;
 }
 
 
-void i_backend_list_free( GSList * backend_list )
+void i_backend_list_free (GSList * backend_list)
 {
- while ( backend_list != NULL )
- {
- amidiplug_sequencer_backend_name_t * mn = backend_list->data;
- g_free( mn->desc );
- g_free( mn->name );
- g_free( mn->longname );
- g_free( mn->filename );
- g_free( mn );
- backend_list = backend_list->next;
- }
- return;
+ while (backend_list != NULL)
+ {
+ amidiplug_sequencer_backend_name_t * mn = backend_list->data;
+ free (mn->desc);
+ free (mn->name);
+ free (mn->longname);
+ free (mn->filename);
+ free (mn);
+ backend_list = backend_list->next;
+ }
+
+ return;
 }
 
 
-gint i_backend_load( gchar * module_name )
+amidiplug_sequencer_backend_t * i_backend_load (const char * module_name)
 {
- gchar * module_pathfilename = NULL;
-
- if (module_name && module_name[0])
- {
- module_pathfilename = g_strjoin ("", AMIDIPLUGBACKENDDIR, "/ap-", module_name, ".so", NULL);
- DEBUGMSG ("loading backend '%s'\n", module_pathfilename);
- backend.gmodule = g_module_open (module_pathfilename, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
- }
- else
- backend.gmodule = NULL;
-
- if ( backend.gmodule != NULL )
- {
- gchar * (*getapmoduleinfo)( gchar ** , gchar ** , gchar ** , gint * );
- gboolean (*checkautonomousaudio)( void );
-
- backend.init = get_symbol (backend.gmodule, "backend_init");
- backend.cleanup = get_symbol (backend.gmodule, "backend_cleanup");
- backend.audio_info_get = get_symbol (backend.gmodule, "audio_info_get");
- backend.audio_volume_get = get_symbol (backend.gmodule, "audio_volume_get");
- backend.audio_volume_set = get_symbol (backend.gmodule, "audio_volume_set");
- backend.seq_start = get_symbol (backend.gmodule, "sequencer_start");
- backend.seq_stop = get_symbol (backend.gmodule, "sequencer_stop");
- backend.seq_on = get_symbol (backend.gmodule, "sequencer_on");
- backend.seq_off = get_symbol (backend.gmodule, "sequencer_off");
- backend.seq_queue_tempo = get_symbol (backend.gmodule, "sequencer_queue_tempo");
- backend.seq_queue_start = get_symbol (backend.gmodule, "sequencer_queue_start");
- backend.seq_queue_stop = get_symbol (backend.gmodule, "sequencer_queue_stop");
- backend.seq_event_init = get_symbol (backend.gmodule, "sequencer_event_init");
- backend.seq_event_noteon = get_symbol (backend.gmodule, "sequencer_event_noteon");
- backend.seq_event_noteoff = get_symbol (backend.gmodule, "sequencer_event_noteoff");
- backend.seq_event_allnoteoff = get_symbol (backend.gmodule, "sequencer_event_allnoteoff");
- backend.seq_event_keypress = get_symbol (backend.gmodule, "sequencer_event_keypress");
- backend.seq_event_controller = get_symbol (backend.gmodule, "sequencer_event_controller");
- backend.seq_event_pgmchange = get_symbol (backend.gmodule, "sequencer_event_pgmchange");
- backend.seq_event_chanpress = get_symbol (backend.gmodule, "sequencer_event_chanpress");
- backend.seq_event_pitchbend = get_symbol (backend.gmodule, "sequencer_event_pitchbend");
- backend.seq_event_sysex = get_symbol (backend.gmodule, "sequencer_event_sysex");
- backend.seq_event_tempo = get_symbol (backend.gmodule, "sequencer_event_tempo");
- backend.seq_event_other = get_symbol (backend.gmodule, "sequencer_event_other");
- backend.seq_output = get_symbol (backend.gmodule, "sequencer_output");
- backend.seq_output_shut = get_symbol (backend.gmodule, "sequencer_output_shut");
- backend.seq_get_port_count = get_symbol (backend.gmodule, "sequencer_get_port_count");
-
- getapmoduleinfo = get_symbol (backend.gmodule, "backend_info_get");
- checkautonomousaudio = get_symbol (backend.gmodule, "audio_check_autonomous");
-
- getapmoduleinfo( &backend.name , NULL , NULL , NULL );
- backend.autonomous_audio = checkautonomousaudio();
- DEBUGMSG( "backend %s (name '%s') successfully loaded\n" , module_pathfilename , backend.name );
- backend.init( i_configure_cfg_get_file );
- g_free( module_pathfilename );
- return 1;
- }
- else
- {
- if (module_pathfilename)
+ SPRINTF (path, AMIDIPLUGBACKENDDIR "/ap-%s." G_MODULE_SUFFIX, module_name);
+ GModule * module = g_module_open (path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
+
+ if (! module)
 {
- g_warning ("unable to load backend '%s'\n", module_pathfilename);
- g_free (module_pathfilename);
+ fprintf (stderr, "amidiplug: Unable to load backend \"%s\"\n", path);
+ return NULL;
 }
 
- backend.name = NULL;
- return 0;
- }
+ amidiplug_sequencer_backend_t * backend = malloc (sizeof (amidiplug_sequencer_backend_t));
+
+ backend->gmodule = module;
+
+ backend->init = get_symbol (module, "backend_init");
+ backend->cleanup = get_symbol (module, "backend_cleanup");
+ backend->audio_info_get = get_symbol (module, "audio_info_get");
+ backend->audio_volume_get = get_symbol (module, "audio_volume_get");
+ backend->audio_volume_set = get_symbol (module, "audio_volume_set");
+ backend->seq_start = get_symbol (module, "sequencer_start");
+ backend->seq_stop = get_symbol (module, "sequencer_stop");
+ backend->seq_on = get_symbol (module, "sequencer_on");
+ backend->seq_off = get_symbol (module, "sequencer_off");
+ backend->seq_queue_tempo = get_symbol (module, "sequencer_queue_tempo");
+ backend->seq_queue_start = get_symbol (module, "sequencer_queue_start");
+ backend->seq_queue_stop = get_symbol (module, "sequencer_queue_stop");
+ backend->seq_event_init = get_symbol (module, "sequencer_event_init");
+ backend->seq_event_noteon = get_symbol (module, "sequencer_event_noteon");
+ backend->seq_event_noteoff = get_symbol (module, "sequencer_event_noteoff");
+ backend->seq_event_allnoteoff = get_symbol (module, "sequencer_event_allnoteoff");
+ backend->seq_event_keypress = get_symbol (module, "sequencer_event_keypress");
+ backend->seq_event_controller = get_symbol (module, "sequencer_event_controller");
+ backend->seq_event_pgmchange = get_symbol (module, "sequencer_event_pgmchange");
+ backend->seq_event_chanpress = get_symbol (module, "sequencer_event_chanpress");
+ backend->seq_event_pitchbend = get_symbol (module, "sequencer_event_pitchbend");
+ backend->seq_event_sysex = get_symbol (module, "sequencer_event_sysex");
+ backend->seq_event_tempo = get_symbol (module, "sequencer_event_tempo");
+ backend->seq_event_other = get_symbol (module, "sequencer_event_other");
+ backend->seq_output = get_symbol (module, "sequencer_output");
+ backend->seq_output_shut = get_symbol (module, "sequencer_output_shut");
+ backend->seq_get_port_count = get_symbol (module, "sequencer_get_port_count");
+
+ bool_t (* checkautonomousaudio) (void) = get_symbol (module, "audio_check_autonomous");
+ backend->autonomous_audio = checkautonomousaudio ();
+
+ backend->init (amidiplug_cfg_backend);
+
+ return backend;
 }
 
 
-gint i_backend_unload( void )
+void i_backend_unload (amidiplug_sequencer_backend_t * backend)
 {
- if ( backend.gmodule != NULL )
- {
- DEBUGMSG( "unloading backend '%s'\n" , backend.name );
- backend.cleanup();
- g_module_close( backend.gmodule );
- DEBUGMSG( "backend '%s' unloaded\n" , backend.name );
- g_free( backend.name );
- backend.gmodule = NULL;
- return 1;
- }
- else
- return 0;
+ backend->cleanup ();
+ g_module_close (backend->gmodule);
+ free (backend);
 }

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_backend.h -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_backend.h Changed

@@ -22,64 +22,58 @@
 #define _I_BACKEND_H 1
 
 #include <gmodule.h>
-#include "i_midievent.h"
-#include "i_configure_file.h"
-#include "i_common.h"
+#include <libaudcore/core.h>
 
+struct amidiplug_cfg_backend_s;
+struct midievent_s;
 
 typedef struct
 {
- gchar * desc;
- gchar * filename;
- gchar * longname;
- gchar * name;
- gint ppos;
+ char * desc;
+ char * filename;
+ char * longname;
+ char * name;
+ int ppos;
 }
 amidiplug_sequencer_backend_name_t;
 
-
 typedef struct
 {
- gint id;
- GModule * gmodule;
- gchar * name;
- gint (*init)( i_cfg_get_file_cb );
- gint (*cleanup)( void );
- gint (*audio_info_get)( gint * , gint * , gint * );
- gint (*audio_volume_get)( gint * , gint * );
- gint (*audio_volume_set)( gint , gint );
- gint (* seq_start) (const gchar * filename);
- gint (*seq_stop)( void );
- gint (*seq_on)( void );
- gint (*seq_off)( void );
- gint (*seq_queue_tempo)( gint , gint );
- gint (*seq_queue_start)( void );
- gint (*seq_queue_stop)( void );
- gint (*seq_event_init)( void );
- gint (*seq_event_noteon)( midievent_t * );
- gint (*seq_event_noteoff)( midievent_t * );
- gint (*seq_event_allnoteoff)( gint );
- gint (*seq_event_keypress)( midievent_t * );
- gint (*seq_event_controller)( midievent_t * );
- gint (*seq_event_pgmchange)( midievent_t * );
- gint (*seq_event_chanpress)( midievent_t * );
- gint (*seq_event_pitchbend)( midievent_t * );
- gint (*seq_event_sysex)( midievent_t * );
- gint (*seq_event_tempo)( midievent_t * );
- gint (*seq_event_other)( midievent_t * );
- gint (*seq_output)( gpointer * , gint * );
- gint (*seq_output_shut)( guint , gint );
- gint (*seq_get_port_count)( void );
- gboolean autonomous_audio;
+ GModule * gmodule;
+ int (*init) (struct amidiplug_cfg_backend_s *);
+ int (*cleanup) (void);
+ int (*audio_info_get) (int *, int *, int *);
+ int (*audio_volume_get) (int *, int *);
+ int (*audio_volume_set) (int, int);
+ int (* seq_start) (const char * filename);
+ int (*seq_stop) (void);
+ int (*seq_on) (void);
+ int (*seq_off) (void);
+ int (*seq_queue_tempo) (int, int);
+ int (*seq_queue_start) (void);
+ int (*seq_queue_stop) (void);
+ int (*seq_event_init) (void);
+ int (*seq_event_noteon) (struct midievent_s *);
+ int (*seq_event_noteoff) (struct midievent_s *);
+ int (*seq_event_allnoteoff) (int);
+ int (*seq_event_keypress) (struct midievent_s *);
+ int (*seq_event_controller) (struct midievent_s *);
+ int (*seq_event_pgmchange) (struct midievent_s *);
+ int (*seq_event_chanpress) (struct midievent_s *);
+ int (*seq_event_pitchbend) (struct midievent_s *);
+ int (*seq_event_sysex) (struct midievent_s *);
+ int (*seq_event_tempo) (struct midievent_s *);
+ int (*seq_event_other) (struct midievent_s *);
+ int (*seq_output) (void * *, int *);
+ int (*seq_output_shut) (unsigned, int);
+ int (*seq_get_port_count) (void);
+ bool_t autonomous_audio;
 }
 amidiplug_sequencer_backend_t;
 
-extern amidiplug_sequencer_backend_t backend;
-
-
-GSList * i_backend_list_lookup( void );
-void i_backend_list_free( GSList * );
-gint i_backend_load( gchar * );
-gint i_backend_unload( void );
+GSList * i_backend_list_lookup (void);
+void i_backend_list_free (GSList *);
+amidiplug_sequencer_backend_t * i_backend_load (const char * module_name);
+void i_backend_unload (amidiplug_sequencer_backend_t * backend);
 
 #endif /* !_I_BACKEND_H */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_common.h -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_common.h Changed

@@ -21,45 +21,25 @@
 #ifndef _I_COMMON_H
 #define _I_COMMON_H 1
 
-#include "config.h"
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <glib.h>
-
-#include <audacious/i18n.h>
 
 /* #define DEBUG */
 
-#define textdomain(Domain)
-#define bindtextdomain(Package, Directory)
-
-#define WARNANDBREAK(...) { g_warning(__VA_ARGS__); break; }
-#define WARNANDBREAKANDPLAYERR(...) { amidiplug_playing_status = AMIDIPLUG_ERR; g_warning(__VA_ARGS__); break; }
+#define WARNANDBREAK(...) { fprintf (stderr, __VA_ARGS__); break; }
+#define WARNANDBREAKANDPLAYERR(...) { amidiplug_playing_status = AMIDIPLUG_ERR; WARNANDBREAK(__VA_ARGS__) }
 
 #ifdef DEBUG
-#define DEBUGMSG(...) { fprintf(stderr, "amidi-plug(%s:%s:%d): ", __FILE__, __FUNCTION__, (int) __LINE__); fprintf(stderr, __VA_ARGS__); }
+#define DEBUGMSG(...) fprintf(stderr, __VA_ARGS__)
 #else
 #define DEBUGMSG(...)
 #endif /* DEBUG */
 
-
-#define AMIDIPLUG_VERSION "0.8b2"
-#define PLAYER_NAME "Audacious"
-#define PLAYER_LOCALRCDIR ".audacious"
-#define G_PATH_GET_BASENAME(x) g_path_get_basename(x)
-#define G_STRING_PRINTF(...) g_string_printf(__VA_ARGS__)
-#define G_USLEEP(x) g_usleep(x)
-#define G_VFPRINTF(x,y,z) g_vfprintf(x,y,z)
-
-
 /* multi-purpose data bucket */
 typedef struct
 {
- gint bint[2];
- gchar * bcharp[2];
- gpointer bpointer[2];
+ int bint[2];
+ char * bcharp[2];
+ void * bpointer[2];
 }
 data_bucket_t;

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_configure-alsa.c -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_configure-alsa.c Changed

@@ -20,510 +20,548 @@
 
 #include "i_configure-alsa.h"
 
+#include <stdlib.h>
+#include <string.h>
+#include <strings.h>
+
+#include <audacious/i18n.h>
+#include <audacious/misc.h>
+
+#include "i_backend.h"
+#include "i_common.h"
+#include "i_configure.h"
+
 #ifdef AMIDIPLUG_ALSA
 
-#include "backend-alsa/b-alsa-config.h"
 #include "backend-alsa/backend-alsa-icon.xpm"
 
 enum
 {
- LISTPORT_TOGGLE_COLUMN = 0,
- LISTPORT_PORTNUM_COLUMN,
- LISTPORT_CLIENTNAME_COLUMN,
- LISTPORT_PORTNAME_COLUMN,
- LISTPORT_POINTER_COLUMN,
- LISTPORT_N_COLUMNS
+ LISTPORT_TOGGLE_COLUMN = 0,
+ LISTPORT_PORTNUM_COLUMN,
+ LISTPORT_CLIENTNAME_COLUMN,
+ LISTPORT_PORTNAME_COLUMN,
+ LISTPORT_POINTER_COLUMN,
+ LISTPORT_N_COLUMNS
 };
 
 enum
 {
- LISTCARD_NAME_COLUMN = 0,
- LISTCARD_ID_COLUMN,
- LISTCARD_MIXERPTR_COLUMN,
- LISTCARD_N_COLUMNS
+ LISTCARD_NAME_COLUMN = 0,
+ LISTCARD_ID_COLUMN,
+ LISTCARD_MIXERPTR_COLUMN,
+ LISTCARD_N_COLUMNS
 };
 
 enum
 {
- LISTMIXER_NAME_COLUMN = 0,
- LISTMIXER_ID_COLUMN,
- LISTMIXER_N_COLUMNS
+ LISTMIXER_NAME_COLUMN = 0,
+ LISTMIXER_ID_COLUMN,
+ LISTMIXER_N_COLUMNS
 };
 
 /* GCC does not like casting func * * to void * *. */
-static void * get_symbol (GModule * mod, const gchar * name)
+static void * get_symbol (GModule * mod, const char * name)
 {
 void * sym = NULL;
 g_module_symbol (mod, name, & sym);
 return sym;
 }
 
-void i_configure_ev_portlv_changetoggle( GtkCellRendererToggle * rdtoggle ,
- gchar * path_str , gpointer data )
+void i_configure_ev_portlv_changetoggle (GtkCellRendererToggle * rdtoggle,
+ char * path_str, void * data)
 {
- GtkTreeModel *model = (GtkTreeModel*)data;
- GtkTreeIter iter;
- GtkTreePath *path = gtk_tree_path_new_from_string( path_str );
- gboolean toggled;
+ GtkTreeModel * model = (GtkTreeModel *) data;
+ GtkTreeIter iter;
+ GtkTreePath * path = gtk_tree_path_new_from_string (path_str);
+ bool_t toggled;
 
- gtk_tree_model_get_iter( model , &iter , path );
- gtk_tree_model_get( model , &iter , LISTPORT_TOGGLE_COLUMN , &toggled , -1 );
+ gtk_tree_model_get_iter (model, &iter, path);
+ gtk_tree_model_get (model, &iter, LISTPORT_TOGGLE_COLUMN, &toggled, -1);
 
- toggled ^= 1;
- gtk_list_store_set( GTK_LIST_STORE(model), &iter , LISTPORT_TOGGLE_COLUMN , toggled , -1 );
+ toggled ^= 1;
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, LISTPORT_TOGGLE_COLUMN, toggled, -1);
 
- gtk_tree_path_free (path);
+ gtk_tree_path_free (path);
 }
 
 
-gboolean i_configure_ev_mixctlcmb_inspect( GtkTreeModel * store , GtkTreePath * path,
- GtkTreeIter * iter , gpointer mixctl_cmb )
+bool_t i_configure_ev_mixctlcmb_inspect (GtkTreeModel * store, GtkTreePath * path,
+ GtkTreeIter * iter, void * mixctl_cmb)
 {
- gint ctl_id;
- gchar * ctl_name;
- amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
- gtk_tree_model_get( GTK_TREE_MODEL(store) , iter ,
- LISTMIXER_ID_COLUMN , &ctl_id ,
- LISTMIXER_NAME_COLUMN , &ctl_name , -1 );
- if (( !strcmp( ctl_name , alsacfg->alsa_mixer_ctl_name ) ) &&
- ( ctl_id == alsacfg->alsa_mixer_ctl_id ))
- {
- /* this is the selected control in the mixer control combobox */
- gtk_combo_box_set_active_iter( GTK_COMBO_BOX(mixctl_cmb) , iter );
- return TRUE;
- }
- g_free( ctl_name );
- return FALSE;
+ int ctl_id;
+ char * ctl_name;
+ amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
+ gtk_tree_model_get (GTK_TREE_MODEL (store), iter,
+ LISTMIXER_ID_COLUMN, &ctl_id,
+ LISTMIXER_NAME_COLUMN, &ctl_name, -1);
+
+ if ((!strcmp (ctl_name, alsacfg->alsa_mixer_ctl_name)) &&
+ (ctl_id == alsacfg->alsa_mixer_ctl_id))
+ {
+ /* this is the selected control in the mixer control combobox */
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (mixctl_cmb), iter);
+ return TRUE;
+ }
+
+ free (ctl_name);
+ return FALSE;
 }
 
 
-void i_configure_ev_cardcmb_changed( GtkWidget * card_cmb , gpointer mixctl_cmb )
+void i_configure_ev_cardcmb_changed (GtkWidget * card_cmb, void * mixctl_cmb)
 {
- GtkTreeIter iter;
- if( gtk_combo_box_get_active_iter( GTK_COMBO_BOX(card_cmb) , &iter ) )
- {
- amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
- gpointer mixctl_store;
- gint card_id;
- GtkTreeModel * store = gtk_combo_box_get_model( GTK_COMBO_BOX(card_cmb) );
- gtk_tree_model_get( GTK_TREE_MODEL(store) , &iter ,
- LISTCARD_ID_COLUMN , &card_id ,
- LISTCARD_MIXERPTR_COLUMN , &mixctl_store , -1 );
- gtk_combo_box_set_model( GTK_COMBO_BOX(mixctl_cmb) , GTK_TREE_MODEL(mixctl_store) );
-
- /* check if the selected card is the one contained in configuration */
- if ( card_id == alsacfg->alsa_mixer_card_id )
+ GtkTreeIter iter;
+
+ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (card_cmb), &iter))
 {
- /* search for the selected mixer control in combo box */
- gtk_tree_model_foreach( GTK_TREE_MODEL(mixctl_store) ,
- i_configure_ev_mixctlcmb_inspect , mixctl_cmb );
+ amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
+ void * mixctl_store;
+ int card_id;
+ GtkTreeModel * store = gtk_combo_box_get_model (GTK_COMBO_BOX (card_cmb));
+ gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+ LISTCARD_ID_COLUMN, &card_id,
+ LISTCARD_MIXERPTR_COLUMN, &mixctl_store, -1);
+ gtk_combo_box_set_model (GTK_COMBO_BOX (mixctl_cmb), GTK_TREE_MODEL (mixctl_store));
+
+ /* check if the selected card is the one contained in configuration */
+ if (card_id == alsacfg->alsa_mixer_card_id)
+ {
+ /* search for the selected mixer control in combo box */
+ gtk_tree_model_foreach (GTK_TREE_MODEL (mixctl_store),
+ i_configure_ev_mixctlcmb_inspect, mixctl_cmb);
+ }
 }
- }
 }
 
 
-gboolean i_configure_ev_portlv_inspecttoggle( GtkTreeModel * model , GtkTreePath * path ,
- GtkTreeIter * iter , gpointer wpp )
+bool_t i_configure_ev_portlv_inspecttoggle (GtkTreeModel * model, GtkTreePath * path,
+ GtkTreeIter * iter, void * wpp)
 {
- gboolean toggled = FALSE;
- gchar * portstring;
- GString * wps = wpp;
- gtk_tree_model_get ( model , iter ,
- LISTPORT_TOGGLE_COLUMN , &toggled ,
- LISTPORT_PORTNUM_COLUMN , &portstring , -1 );
- if ( toggled ) /* check if the row points to an enabled port */
- {
- /* if this is not the first port added to wp, use comma as separator */
- if ( wps->str[0] != '\0' ) g_string_append_c( wps , ',' );
- g_string_append( wps , portstring );
- }
- g_free( portstring );
- return FALSE;
-}
+ bool_t toggled = FALSE;
+ char * portstring;
+ GString * wps = wpp;
+ gtk_tree_model_get (model, iter,
+ LISTPORT_TOGGLE_COLUMN, &toggled,
+ LISTPORT_PORTNUM_COLUMN, &portstring, -1);
+
+ if (toggled) /* check if the row points to an enabled port */
+ {
+ /* if this is not the first port added to wp, use comma as separator */
+ if (wps->str[0] != '\0') g_string_append_c (wps, ',');
 
+ g_string_append (wps, portstring);
+ }
 
-void i_configure_ev_portlv_commit( gpointer port_lv )
-{
- amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
- GtkTreeModel * store;
- GString *wp = g_string_new( "" );
- /* get the model of the port listview */
- store = gtk_tree_view_get_model( GTK_TREE_VIEW(port_lv) );
- /* after going through this foreach, wp contains a comma-separated list of selected ports */
- gtk_tree_model_foreach( store , i_configure_ev_portlv_inspecttoggle , wp );
- g_free( alsacfg->alsa_seq_wports ); /* free previous */
- alsacfg->alsa_seq_wports = g_strdup( wp->str ); /* set with new */
- g_string_free( wp , TRUE ); /* not needed anymore */
- return;
+ free (portstring);
+ return FALSE;
 }
 
-void i_configure_ev_cardcmb_commit( gpointer card_cmb )
+
+void i_configure_ev_portlv_commit (void * port_lv)
 {
- GtkTreeModel * store;
- GtkTreeIter iter;
- store = gtk_combo_box_get_model( GTK_COMBO_BOX(card_cmb) );
- /* get the selected item */
- if ( gtk_combo_box_get_active_iter( GTK_COMBO_BOX(card_cmb) , &iter ) )
- {
 amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
- /* update amidiplug_cfg.alsa_mixer_card_id */
- gtk_tree_model_get( GTK_TREE_MODEL(store) , &iter ,
- LISTCARD_ID_COLUMN ,
- &alsacfg->alsa_mixer_card_id , -1 );
- }
- return;
+ GtkTreeModel * store;
+ GString * wp = g_string_new ("");
+ /* get the model of the port listview */
+ store = gtk_tree_view_get_model (GTK_TREE_VIEW (port_lv));
+ /* after going through this foreach, wp contains a comma-separated list of selected ports */
+ gtk_tree_model_foreach (store, i_configure_ev_portlv_inspecttoggle, wp);
+ free (alsacfg->alsa_seq_wports); /* free previous */
+ alsacfg->alsa_seq_wports = g_strdup (wp->str); /* set with new */
+ g_string_free (wp, TRUE); /* not needed anymore */
+ return;
 }
 
-void i_configure_ev_mixctlcmb_commit( gpointer mixctl_cmb )
+void i_configure_ev_cardcmb_commit (void * card_cmb)
 {
- GtkTreeModel * store;
- GtkTreeIter iter;
- store = gtk_combo_box_get_model( GTK_COMBO_BOX(mixctl_cmb) );
- /* get the selected item */
- if ( gtk_combo_box_get_active_iter( GTK_COMBO_BOX(mixctl_cmb) , &iter ) )
- {
- amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
- g_free( alsacfg->alsa_mixer_ctl_name ); /* free previous */
- /* update amidiplug_cfg.alsa_mixer_card_id */
- gtk_tree_model_get( GTK_TREE_MODEL(store) , &iter ,
- LISTMIXER_NAME_COLUMN ,
- &alsacfg->alsa_mixer_ctl_name ,
- LISTMIXER_ID_COLUMN ,
- &alsacfg->alsa_mixer_ctl_id , -1 );
- }
- return;
-}
+ GtkTreeModel * store;
+ GtkTreeIter iter;
+ store = gtk_combo_box_get_model (GTK_COMBO_BOX (card_cmb));
 
+ /* get the selected item */
+ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (card_cmb), &iter))
+ {
+ amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
+ /* update amidiplug_cfg.alsa_mixer_card_id */
+ gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+ LISTCARD_ID_COLUMN,
+ &alsacfg->alsa_mixer_card_id, -1);
+ }
 
-void i_configure_gui_ctlcmb_datafunc( GtkCellLayout *cell_layout , GtkCellRenderer *cr ,
- GtkTreeModel *store , GtkTreeIter *iter , gpointer p )
-{
- gchar *ctl_display, *ctl_name;
- gint ctl_id;
- gtk_tree_model_get( store , iter ,
- LISTMIXER_NAME_COLUMN , &ctl_name ,
- LISTMIXER_ID_COLUMN , &ctl_id , -1 );
- if ( ctl_id == 0 )
- ctl_display = g_strdup_printf( "%s" , ctl_name );
- else
- ctl_display = g_strdup_printf( "%s (%i)" , ctl_name , ctl_id );
- g_object_set( G_OBJECT(cr) , "text" , ctl_display , NULL );
- g_free( ctl_display );
- g_free( ctl_name );
+ return;
 }
 
-
-void i_configure_gui_tab_alsa( GtkWidget * alsa_page_alignment ,
- gpointer backend_list_p ,
- gpointer commit_button )
+void i_configure_ev_mixctlcmb_commit (void * mixctl_cmb)
 {
- GSList * backend_list = backend_list_p;
- gchar * alsa_module_pathfilename = NULL;
-
- GtkWidget * content_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+ GtkTreeModel * store;
+ GtkTreeIter iter;
+ store = gtk_combo_box_get_model (GTK_COMBO_BOX (mixctl_cmb));
 
- /* check if the ALSA module is available */
- while ( backend_list != NULL )
- {
- amidiplug_sequencer_backend_name_t * mn = backend_list->data;
- if ( !strcmp( mn->name , "alsa" ) )
+ /* get the selected item */
+ if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (mixctl_cmb), &iter))
 {
- alsa_module_pathfilename = mn->filename;
- break;
+ amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
+ free (alsacfg->alsa_mixer_ctl_name); /* free previous */
+ /* update amidiplug_cfg.alsa_mixer_card_id */
+ gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+ LISTMIXER_NAME_COLUMN,
+ &alsacfg->alsa_mixer_ctl_name,
+ LISTMIXER_ID_COLUMN,
+ &alsacfg->alsa_mixer_ctl_id, -1);
 }
- backend_list = backend_list->next;
- }
-
- if (alsa_module_pathfilename)
- {
- GtkListStore *port_store, *mixer_card_store;
- GtkWidget *port_lv, *port_lv_sw, *port_lv_frame;
- GtkCellRenderer *port_lv_toggle_rndr, *port_lv_text_rndr;
- GtkTreeViewColumn *port_lv_toggle_col, *port_lv_portnum_col;
- GtkTreeViewColumn *port_lv_clientname_col, *port_lv_portname_col;
- GtkTreeSelection *port_lv_sel;
- GtkTreeIter iter;
- GtkWidget *mixer_grid, *mixer_frame;
- GtkCellRenderer *mixer_card_cmb_text_rndr, *mixer_ctl_cmb_text_rndr;
- GtkWidget *mixer_card_cmb_evbox, *mixer_card_cmb, *mixer_card_label;
- GtkWidget *mixer_ctl_cmb_evbox, *mixer_ctl_cmb, *mixer_ctl_label;
-
- amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
 
- gchar **portstring_from_cfg = NULL;
+ return;
+}
 
- GModule * alsa_module;
- GSList *wports = NULL, *wports_h = NULL, *scards = NULL, *scards_h = NULL;
- GSList * (*get_port_list)( void );
- void (*free_port_list)( GSList * );
- GSList * (*get_card_list)( void );
- void (*free_card_list)( GSList * );
 
- if ( strlen( alsacfg->alsa_seq_wports ) > 0 )
- portstring_from_cfg = g_strsplit( alsacfg->alsa_seq_wports , "," , 0 );
+void i_configure_gui_ctlcmb_datafunc (GtkCellLayout * cell_layout, GtkCellRenderer * cr,
+ GtkTreeModel * store, GtkTreeIter * iter, void * p)
+{
+ char * ctl_display, *ctl_name;
+ int ctl_id;
+ gtk_tree_model_get (store, iter,
+ LISTMIXER_NAME_COLUMN, &ctl_name,
+ LISTMIXER_ID_COLUMN, &ctl_id, -1);
+
+ if (ctl_id == 0)
+ ctl_display = g_strdup_printf ("%s", ctl_name);
+ else
+ ctl_display = g_strdup_printf ("%s (%i)", ctl_name, ctl_id);
+
+ g_object_set (G_OBJECT (cr), "text", ctl_display, NULL);
+ g_free (ctl_display);
+ g_free (ctl_name);
+}
 
- /* it's legit to assume that this can't fail,
- since the module is present in the backend_list */
- alsa_module = g_module_open( alsa_module_pathfilename , 0 );
 
- get_port_list = get_symbol (alsa_module, "sequencer_port_get_list");
- free_port_list = get_symbol (alsa_module, "sequencer_port_free_list");
- get_card_list = get_symbol (alsa_module, "alsa_card_get_list");
- free_card_list = get_symbol (alsa_module, "alsa_card_free_list");
+void i_configure_gui_tab_alsa (GtkWidget * alsa_page_alignment,
+ void * backend_list_p,
+ void * commit_button)
+{
+ GSList * backend_list = backend_list_p;
+ char * alsa_module_pathfilename = NULL;
 
- /* get an updated list of writable ALSA MIDI ports and ALSA-enabled sound cards*/
- wports = get_port_list(); wports_h = wports;
- scards = get_card_list(); scards_h = scards;
+ GtkWidget * content_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
 
- /* ALSA MIDI PORT LISTVIEW */
- port_store = gtk_list_store_new( LISTPORT_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING ,
- G_TYPE_STRING , G_TYPE_STRING , G_TYPE_POINTER );
- while ( wports != NULL )
+ /* check if the ALSA module is available */
+ while (backend_list != NULL)
 {
- gboolean toggled = FALSE;
- data_bucket_t * portinfo = (data_bucket_t *)wports->data;
- GString * portstring = g_string_new("");
- G_STRING_PRINTF( portstring , "%i:%i" , portinfo->bint[0] , portinfo->bint[1] );
- gtk_list_store_append( port_store , &iter );
- /* in the existing configuration there may be previously selected ports */
- if ( portstring_from_cfg != NULL )
- {
- gint i = 0;
- /* check if current row contains a port selected by user */
- for ( i = 0 ; portstring_from_cfg[i] != NULL ; i++ )
+ amidiplug_sequencer_backend_name_t * mn = backend_list->data;
+
+ if (!strcmp (mn->name, "alsa"))
 {
- /* if it's one of the selected ports, toggle its checkbox */
- if ( !strcmp( portstring->str, portstring_from_cfg[i] ) )
- toggled = TRUE;
+ alsa_module_pathfilename = mn->filename;
+ break;
 }
- }
- gtk_list_store_set( port_store , &iter ,
- LISTPORT_TOGGLE_COLUMN , toggled ,
- LISTPORT_PORTNUM_COLUMN , portstring->str ,
- LISTPORT_CLIENTNAME_COLUMN , portinfo->bcharp[0] ,
- LISTPORT_PORTNAME_COLUMN , portinfo->bcharp[1] ,
- LISTPORT_POINTER_COLUMN , portinfo , -1 );
- g_string_free( portstring , TRUE );
- /* on with next */
- wports = wports->next;
+
+ backend_list = backend_list->next;
 }
- g_strfreev( portstring_from_cfg ); /* not needed anymore */
- port_lv = gtk_tree_view_new_with_model( GTK_TREE_MODEL(port_store) );
- gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(port_lv), TRUE );
- g_object_unref( port_store );
- port_lv_toggle_rndr = gtk_cell_renderer_toggle_new();
- gtk_cell_renderer_toggle_set_radio( GTK_CELL_RENDERER_TOGGLE(port_lv_toggle_rndr) , FALSE );
- gtk_cell_renderer_toggle_set_active( GTK_CELL_RENDERER_TOGGLE(port_lv_toggle_rndr) , TRUE );
- g_signal_connect( port_lv_toggle_rndr , "toggled" ,
- G_CALLBACK(i_configure_ev_portlv_changetoggle) , port_store );
- port_lv_text_rndr = gtk_cell_renderer_text_new();
- port_lv_toggle_col = gtk_tree_view_column_new_with_attributes( "", port_lv_toggle_rndr,
- "active", LISTPORT_TOGGLE_COLUMN, NULL );
- port_lv_portnum_col = gtk_tree_view_column_new_with_attributes( _("Port"), port_lv_text_rndr,
- "text", LISTPORT_PORTNUM_COLUMN, NULL );
- port_lv_clientname_col = gtk_tree_view_column_new_with_attributes( _("Client name"), port_lv_text_rndr,
- "text", LISTPORT_CLIENTNAME_COLUMN, NULL );
- port_lv_portname_col = gtk_tree_view_column_new_with_attributes( _("Port name"), port_lv_text_rndr,
- "text", LISTPORT_PORTNAME_COLUMN, NULL );
- gtk_tree_view_append_column( GTK_TREE_VIEW(port_lv), port_lv_toggle_col );
- gtk_tree_view_append_column( GTK_TREE_VIEW(port_lv), port_lv_portnum_col );
- gtk_tree_view_append_column( GTK_TREE_VIEW(port_lv), port_lv_clientname_col );
- gtk_tree_view_append_column( GTK_TREE_VIEW(port_lv), port_lv_portname_col );
- port_lv_sel = gtk_tree_view_get_selection( GTK_TREE_VIEW(port_lv) );
- gtk_tree_selection_set_mode( GTK_TREE_SELECTION(port_lv_sel) , GTK_SELECTION_NONE );
-
- port_lv_sw = gtk_scrolled_window_new( NULL , NULL );
- gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) port_lv_sw, GTK_SHADOW_IN);
- gtk_scrolled_window_set_policy ((GtkScrolledWindow *) port_lv_sw,
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
- port_lv_frame = gtk_frame_new( _("ALSA output ports") );
- gtk_container_add( GTK_CONTAINER(port_lv_sw) , port_lv );
- gtk_container_add( GTK_CONTAINER(port_lv_frame) , port_lv_sw );
- gtk_box_pack_start( GTK_BOX(content_vbox) , port_lv_frame , TRUE , TRUE , 0 );
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_portlv_commit) , port_lv );
-
- /* MIXER CARD/CONTROL COMBOBOXES */
- mixer_card_store = gtk_list_store_new( LISTCARD_N_COLUMNS , G_TYPE_STRING , G_TYPE_INT , G_TYPE_POINTER );
- mixer_card_cmb = gtk_combo_box_new_with_model( GTK_TREE_MODEL(mixer_card_store) ); /* soundcard combo box */
- mixer_ctl_cmb = gtk_combo_box_new(); /* mixer control combo box */
- g_signal_connect( mixer_card_cmb , "changed" , G_CALLBACK(i_configure_ev_cardcmb_changed) , mixer_ctl_cmb );
- while ( scards != NULL )
+
+ if (alsa_module_pathfilename)
 {
- GtkListStore *mixer_ctl_store;
- GtkTreeIter itermix;
- data_bucket_t * cardinfo = (data_bucket_t *)scards->data;
- GSList *mixctl_list = cardinfo->bpointer[0];
- mixer_ctl_store = gtk_list_store_new( LISTMIXER_N_COLUMNS , G_TYPE_STRING , G_TYPE_INT );
- while ( mixctl_list != NULL )
- {
- data_bucket_t * mixctlinfo = (data_bucket_t *)mixctl_list->data;
- gtk_list_store_append( mixer_ctl_store , &itermix );
- gtk_list_store_set( mixer_ctl_store , &itermix ,
- LISTMIXER_NAME_COLUMN , mixctlinfo->bcharp[0] ,
- LISTMIXER_ID_COLUMN , mixctlinfo->bint[0] , -1 );
- mixctl_list = mixctl_list->next; /* on with next mixer control */
- }
- gtk_list_store_append( mixer_card_store , &iter );
- gtk_list_store_set( mixer_card_store , &iter ,
- LISTCARD_NAME_COLUMN , cardinfo->bcharp[0] ,
- LISTCARD_ID_COLUMN , cardinfo->bint[0] ,
- LISTCARD_MIXERPTR_COLUMN , mixer_ctl_store , -1 );
- /* check if this corresponds to the value previously selected by user */
- if ( cardinfo->bint[0] == alsacfg->alsa_mixer_card_id )
- gtk_combo_box_set_active_iter( GTK_COMBO_BOX(mixer_card_cmb) , &iter );
- scards = scards->next; /* on with next card */
+ GtkListStore * port_store, *mixer_card_store;
+ GtkWidget * port_lv, *port_lv_sw, *port_lv_frame;
+ GtkCellRenderer * port_lv_toggle_rndr, *port_lv_text_rndr;
+ GtkTreeViewColumn * port_lv_toggle_col, *port_lv_portnum_col;
+ GtkTreeViewColumn * port_lv_clientname_col, *port_lv_portname_col;
+ GtkTreeSelection * port_lv_sel;
+ GtkTreeIter iter;
+ GtkWidget * mixer_grid, *mixer_frame;
+ GtkCellRenderer * mixer_card_cmb_text_rndr, *mixer_ctl_cmb_text_rndr;
+ GtkWidget * mixer_card_cmb_evbox, *mixer_card_cmb, *mixer_card_label;
+ GtkWidget * mixer_ctl_cmb_evbox, *mixer_ctl_cmb, *mixer_ctl_label;
+
+ amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
+
+ char ** portstring_from_cfg = NULL;
+
+ GModule * alsa_module;
+ GSList * wports = NULL, *wports_h = NULL, *scards = NULL, *scards_h = NULL;
+ GSList * (*get_port_list) (void);
+ void (*free_port_list) (GSList *);
+ GSList * (*get_card_list) (void);
+ void (*free_card_list) (GSList *);
+
+ if (strlen (alsacfg->alsa_seq_wports) > 0)
+ portstring_from_cfg = g_strsplit (alsacfg->alsa_seq_wports, ",", 0);
+
+ /* it's legit to assume that this can't fail,
+ since the module is present in the backend_list */
+ alsa_module = g_module_open (alsa_module_pathfilename, 0);
+
+ get_port_list = get_symbol (alsa_module, "sequencer_port_get_list");
+ free_port_list = get_symbol (alsa_module, "sequencer_port_free_list");
+ get_card_list = get_symbol (alsa_module, "alsa_card_get_list");
+ free_card_list = get_symbol (alsa_module, "alsa_card_free_list");
+
+ /* get an updated list of writable ALSA MIDI ports and ALSA-enabled sound cards*/
+ wports = get_port_list();
+ wports_h = wports;
+ scards = get_card_list();
+ scards_h = scards;
+
+ /* ALSA MIDI PORT LISTVIEW */
+ port_store = gtk_list_store_new (LISTPORT_N_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
+
+ while (wports != NULL)
+ {
+ bool_t toggled = FALSE;
+ data_bucket_t * portinfo = (data_bucket_t *) wports->data;
+ GString * portstring = g_string_new ("");
+ g_string_printf (portstring, "%i:%i", portinfo->bint[0], portinfo->bint[1]);
+ gtk_list_store_append (port_store, &iter);
+
+ /* in the existing configuration there may be previously selected ports */
+ if (portstring_from_cfg != NULL)
+ {
+ int i = 0;
+
+ /* check if current row contains a port selected by user */
+ for (i = 0 ; portstring_from_cfg[i] != NULL ; i++)
+ {
+ /* if it's one of the selected ports, toggle its checkbox */
+ if (!strcmp (portstring->str, portstring_from_cfg[i]))
+ toggled = TRUE;
+ }
+ }
+
+ gtk_list_store_set (port_store, &iter,
+ LISTPORT_TOGGLE_COLUMN, toggled,
+ LISTPORT_PORTNUM_COLUMN, portstring->str,
+ LISTPORT_CLIENTNAME_COLUMN, portinfo->bcharp[0],
+ LISTPORT_PORTNAME_COLUMN, portinfo->bcharp[1],
+ LISTPORT_POINTER_COLUMN, portinfo, -1);
+ g_string_free (portstring, TRUE);
+ /* on with next */
+ wports = wports->next;
+ }
+
+ g_strfreev (portstring_from_cfg); /* not needed anymore */
+ port_lv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (port_store));
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (port_lv), TRUE);
+ g_object_unref (port_store);
+ port_lv_toggle_rndr = gtk_cell_renderer_toggle_new();
+ gtk_cell_renderer_toggle_set_radio (GTK_CELL_RENDERER_TOGGLE (port_lv_toggle_rndr), FALSE);
+ gtk_cell_renderer_toggle_set_active (GTK_CELL_RENDERER_TOGGLE (port_lv_toggle_rndr), TRUE);
+ g_signal_connect (port_lv_toggle_rndr, "toggled",
+ G_CALLBACK (i_configure_ev_portlv_changetoggle), port_store);
+ port_lv_text_rndr = gtk_cell_renderer_text_new();
+ port_lv_toggle_col = gtk_tree_view_column_new_with_attributes ("", port_lv_toggle_rndr,
+ "active", LISTPORT_TOGGLE_COLUMN, NULL);
+ port_lv_portnum_col = gtk_tree_view_column_new_with_attributes (_("Port"), port_lv_text_rndr,
+ "text", LISTPORT_PORTNUM_COLUMN, NULL);
+ port_lv_clientname_col = gtk_tree_view_column_new_with_attributes (_("Client name"), port_lv_text_rndr,
+ "text", LISTPORT_CLIENTNAME_COLUMN, NULL);
+ port_lv_portname_col = gtk_tree_view_column_new_with_attributes (_("Port name"), port_lv_text_rndr,
+ "text", LISTPORT_PORTNAME_COLUMN, NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (port_lv), port_lv_toggle_col);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (port_lv), port_lv_portnum_col);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (port_lv), port_lv_clientname_col);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (port_lv), port_lv_portname_col);
+ port_lv_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (port_lv));
+ gtk_tree_selection_set_mode (GTK_TREE_SELECTION (port_lv_sel), GTK_SELECTION_NONE);
+
+ port_lv_sw = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) port_lv_sw, GTK_SHADOW_IN);
+ gtk_scrolled_window_set_policy ((GtkScrolledWindow *) port_lv_sw,
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+ port_lv_frame = gtk_frame_new (_("ALSA output ports"));
+ gtk_container_add (GTK_CONTAINER (port_lv_sw), port_lv);
+ gtk_container_add (GTK_CONTAINER (port_lv_frame), port_lv_sw);
+ gtk_box_pack_start (GTK_BOX (content_vbox), port_lv_frame, TRUE, TRUE, 0);
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_portlv_commit), port_lv);
+
+ /* MIXER CARD/CONTROL COMBOBOXES */
+ mixer_card_store = gtk_list_store_new (LISTCARD_N_COLUMNS, G_TYPE_STRING, G_TYPE_INT, G_TYPE_POINTER);
+ mixer_card_cmb = gtk_combo_box_new_with_model (GTK_TREE_MODEL (mixer_card_store)); /* soundcard combo box */
+ mixer_ctl_cmb = gtk_combo_box_new(); /* mixer control combo box */
+ g_signal_connect (mixer_card_cmb, "changed", G_CALLBACK (i_configure_ev_cardcmb_changed), mixer_ctl_cmb);
+
+ while (scards != NULL)
+ {
+ GtkListStore * mixer_ctl_store;
+ GtkTreeIter itermix;
+ data_bucket_t * cardinfo = (data_bucket_t *) scards->data;
+ GSList * mixctl_list = cardinfo->bpointer[0];
+ mixer_ctl_store = gtk_list_store_new (LISTMIXER_N_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
+
+ while (mixctl_list != NULL)
+ {
+ data_bucket_t * mixctlinfo = (data_bucket_t *) mixctl_list->data;
+ gtk_list_store_append (mixer_ctl_store, &itermix);
+ gtk_list_store_set (mixer_ctl_store, &itermix,
+ LISTMIXER_NAME_COLUMN, mixctlinfo->bcharp[0],
+ LISTMIXER_ID_COLUMN, mixctlinfo->bint[0], -1);
+ mixctl_list = mixctl_list->next; /* on with next mixer control */
+ }
+
+ gtk_list_store_append (mixer_card_store, &iter);
+ gtk_list_store_set (mixer_card_store, &iter,
+ LISTCARD_NAME_COLUMN, cardinfo->bcharp[0],
+ LISTCARD_ID_COLUMN, cardinfo->bint[0],
+ LISTCARD_MIXERPTR_COLUMN, mixer_ctl_store, -1);
+
+ /* check if this corresponds to the value previously selected by user */
+ if (cardinfo->bint[0] == alsacfg->alsa_mixer_card_id)
+ gtk_combo_box_set_active_iter (GTK_COMBO_BOX (mixer_card_cmb), &iter);
+
+ scards = scards->next; /* on with next card */
+ }
+
+ g_object_unref (mixer_card_store); /* free a reference, no longer needed */
+ /* create renderer to display text in the mixer combo box */
+ mixer_card_cmb_text_rndr = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (mixer_card_cmb), mixer_card_cmb_text_rndr, TRUE);
+ gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (mixer_card_cmb), mixer_card_cmb_text_rndr,
+ "text", LISTCARD_NAME_COLUMN);
+ mixer_ctl_cmb_text_rndr = gtk_cell_renderer_text_new();
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (mixer_ctl_cmb), mixer_ctl_cmb_text_rndr, TRUE);
+ gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (mixer_ctl_cmb), mixer_ctl_cmb_text_rndr,
+ i_configure_gui_ctlcmb_datafunc, NULL, NULL);
+ /* the event box is needed to display a tooltip for the mixer combo box */
+ mixer_card_cmb_evbox = gtk_event_box_new();
+ gtk_widget_set_hexpand (mixer_card_cmb_evbox, TRUE);
+ gtk_container_add (GTK_CONTAINER (mixer_card_cmb_evbox), mixer_card_cmb);
+ mixer_ctl_cmb_evbox = gtk_event_box_new();
+ gtk_widget_set_hexpand (mixer_ctl_cmb_evbox, TRUE);
+ gtk_container_add (GTK_CONTAINER (mixer_ctl_cmb_evbox), mixer_ctl_cmb);
+ mixer_card_label = gtk_label_new (_("Soundcard: "));
+ gtk_misc_set_alignment (GTK_MISC (mixer_card_label), 0, 0.5);
+ mixer_ctl_label = gtk_label_new (_("Mixer control: "));
+ gtk_misc_set_alignment (GTK_MISC (mixer_ctl_label), 0, 0.5);
+ mixer_grid = gtk_grid_new();
+ gtk_grid_set_row_spacing (GTK_GRID (mixer_grid), 4);
+ gtk_grid_set_column_spacing (GTK_GRID (mixer_grid), 2);
+ gtk_container_set_border_width (GTK_CONTAINER (mixer_grid), 5);
+ gtk_grid_attach (GTK_GRID (mixer_grid), mixer_card_label, 0, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID (mixer_grid), mixer_card_cmb_evbox, 1, 0, 1, 1);
+ gtk_grid_attach (GTK_GRID (mixer_grid), mixer_ctl_label, 0, 1, 1, 1);
+ gtk_grid_attach (GTK_GRID (mixer_grid), mixer_ctl_cmb_evbox, 1, 1, 1, 1);
+ mixer_frame = gtk_frame_new (_("Mixer settings"));
+ gtk_container_add (GTK_CONTAINER (mixer_frame), mixer_grid);
+ gtk_box_pack_start (GTK_BOX (content_vbox), mixer_frame, TRUE, TRUE, 0);
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_cardcmb_commit), mixer_card_cmb);
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_mixctlcmb_commit), mixer_ctl_cmb);
+
+ free_card_list (scards_h);
+ free_port_list (wports_h);
+ g_module_close (alsa_module);
 }
- g_object_unref( mixer_card_store ); /* free a reference, no longer needed */
- /* create renderer to display text in the mixer combo box */
- mixer_card_cmb_text_rndr = gtk_cell_renderer_text_new();
- gtk_cell_layout_pack_start( GTK_CELL_LAYOUT(mixer_card_cmb) , mixer_card_cmb_text_rndr , TRUE );
- gtk_cell_layout_add_attribute( GTK_CELL_LAYOUT(mixer_card_cmb) , mixer_card_cmb_text_rndr ,
- "text" , LISTCARD_NAME_COLUMN );
- mixer_ctl_cmb_text_rndr = gtk_cell_renderer_text_new();
- gtk_cell_layout_pack_start( GTK_CELL_LAYOUT(mixer_ctl_cmb) , mixer_ctl_cmb_text_rndr , TRUE );
- gtk_cell_layout_set_cell_data_func( GTK_CELL_LAYOUT(mixer_ctl_cmb) , mixer_ctl_cmb_text_rndr ,
- i_configure_gui_ctlcmb_datafunc , NULL , NULL );
- /* the event box is needed to display a tooltip for the mixer combo box */
- mixer_card_cmb_evbox = gtk_event_box_new();
- gtk_widget_set_hexpand( mixer_card_cmb_evbox , TRUE );
- gtk_container_add( GTK_CONTAINER(mixer_card_cmb_evbox) , mixer_card_cmb );
- mixer_ctl_cmb_evbox = gtk_event_box_new();
- gtk_widget_set_hexpand( mixer_ctl_cmb_evbox , TRUE );
- gtk_container_add( GTK_CONTAINER(mixer_ctl_cmb_evbox) , mixer_ctl_cmb );
- mixer_card_label = gtk_label_new( _("Soundcard: ") );
- gtk_misc_set_alignment( GTK_MISC(mixer_card_label) , 0 , 0.5 );
- mixer_ctl_label = gtk_label_new( _("Mixer control: ") );
- gtk_misc_set_alignment( GTK_MISC(mixer_ctl_label) , 0 , 0.5 );
- mixer_grid = gtk_grid_new();
- gtk_grid_set_row_spacing( GTK_GRID(mixer_grid) , 4 );
- gtk_grid_set_column_spacing( GTK_GRID(mixer_grid) , 2 );
- gtk_container_set_border_width( GTK_CONTAINER(mixer_grid) , 5 );
- gtk_grid_attach( GTK_GRID(mixer_grid) , mixer_card_label , 0 , 0 , 1 , 1 );
- gtk_grid_attach( GTK_GRID(mixer_grid) , mixer_card_cmb_evbox , 1 , 0 , 1 , 1 );
- gtk_grid_attach( GTK_GRID(mixer_grid) , mixer_ctl_label , 0 , 1 , 1 , 1 );
- gtk_grid_attach( GTK_GRID(mixer_grid) , mixer_ctl_cmb_evbox , 1 , 1 , 1 , 1 );
- mixer_frame = gtk_frame_new( _("Mixer settings") );
- gtk_container_add( GTK_CONTAINER(mixer_frame) , mixer_grid );
- gtk_box_pack_start( GTK_BOX(content_vbox) , mixer_frame , TRUE , TRUE , 0 );
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_cardcmb_commit) , mixer_card_cmb );
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_mixctlcmb_commit) , mixer_ctl_cmb );
-
- free_card_list( scards_h );
- free_port_list( wports_h );
- g_module_close( alsa_module );
- }
-
- gtk_container_add ((GtkContainer *) alsa_page_alignment, content_vbox);
+
+ gtk_container_add ((GtkContainer *) alsa_page_alignment, content_vbox);
 }
 
 
-void i_configure_gui_tablabel_alsa( GtkWidget * alsa_page_alignment ,
- gpointer backend_list_p ,
- gpointer commit_button )
+void i_configure_gui_tablabel_alsa (GtkWidget * alsa_page_alignment,
+ void * backend_list_p,
+ void * commit_button)
 {
- GtkWidget *pagelabel_vbox, *pagelabel_image, *pagelabel_label;
- GdkPixbuf *pagelabel_image_pix;
- pagelabel_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1 );
- pagelabel_image_pix = gdk_pixbuf_new_from_xpm_data( (const gchar **)backend_alsa_icon_xpm );
- pagelabel_image = gtk_image_new_from_pixbuf( pagelabel_image_pix ); g_object_unref( pagelabel_image_pix );
- pagelabel_label = gtk_label_new( "" );
- gtk_label_set_markup( GTK_LABEL(pagelabel_label) , _("ALSA\nbackend") );
- gtk_label_set_justify( GTK_LABEL(pagelabel_label) , GTK_JUSTIFY_CENTER );
- gtk_box_pack_start( GTK_BOX(pagelabel_vbox) , pagelabel_image , FALSE , FALSE , 1 );
- gtk_box_pack_start( GTK_BOX(pagelabel_vbox) , pagelabel_label , FALSE , FALSE , 1 );
- gtk_container_add( GTK_CONTAINER(alsa_page_alignment) , pagelabel_vbox );
- gtk_widget_show_all( alsa_page_alignment );
- return;
+ GtkWidget * pagelabel_vbox, *pagelabel_image, *pagelabel_label;
+ GdkPixbuf * pagelabel_image_pix;
+ pagelabel_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
+ pagelabel_image_pix = gdk_pixbuf_new_from_xpm_data ((const char **) backend_alsa_icon_xpm);
+ pagelabel_image = gtk_image_new_from_pixbuf (pagelabel_image_pix);
+ g_object_unref (pagelabel_image_pix);
+ pagelabel_label = gtk_label_new ("");
+ gtk_label_set_markup (GTK_LABEL (pagelabel_label), _("ALSA\nbackend"));
+ gtk_label_set_justify (GTK_LABEL (pagelabel_label), GTK_JUSTIFY_CENTER);
+ gtk_box_pack_start (GTK_BOX (pagelabel_vbox), pagelabel_image, FALSE, FALSE, 1);
+ gtk_box_pack_start (GTK_BOX (pagelabel_vbox), pagelabel_label, FALSE, FALSE, 1);
+ gtk_container_add (GTK_CONTAINER (alsa_page_alignment), pagelabel_vbox);
+ gtk_widget_show_all (alsa_page_alignment);
+ return;
 }
 
 
-gchar * i_configure_read_seq_ports_default( void )
+char * i_configure_read_seq_ports_default (void)
 {
- FILE * fp = NULL;
- /* first try, get seq ports from proc on card0 */
- fp = fopen( "/proc/asound/card0/wavetableD1" , "rb" );
- if ( fp )
- {
- gchar buffer[100];
- while ( !feof( fp ) )
+ FILE * fp = NULL;
+ /* first try, get seq ports from proc on card0 */
+ fp = fopen ("/proc/asound/card0/wavetableD1", "rb");
+
+ if (fp)
 {
- if(!fgets( buffer , 100 , fp ))
- break;
- if (( strlen( buffer ) > 11 ) && ( !strncasecmp( buffer , "addresses: " , 11 ) ))
- {
- /* change spaces between ports (65:0 65:1 65:2 ...)
- into commas (65:0,65:1,65:2,...) */
- g_strdelimit( &buffer[11] , " " , ',' );
- /* remove lf and cr from the end of the string */
- g_strdelimit( &buffer[11] , "\r\n" , '\0' );
- /* ready to go */
- DEBUGMSG( "init, default values for seq ports detected: %s\n" , &buffer[11] );
- fclose( fp );
- return g_strdup( &buffer[11] );
- }
+ char buffer[100];
+
+ while (!feof (fp))
+ {
+ if (!fgets (buffer, 100, fp))
+ break;
+
+ if ((strlen (buffer) > 11) && (!strncasecmp (buffer, "addresses: ", 11)))
+ {
+ /* change spaces between ports (65:0 65:1 65:2 ...)
+ into commas (65:0,65:1,65:2,...) */
+ g_strdelimit (&buffer[11], " ", ',');
+ /* remove lf and cr from the end of the string */
+ g_strdelimit (&buffer[11], "\r\n", '\0');
+ /* ready to go */
+ DEBUGMSG ("init, default values for seq ports detected: %s\n", &buffer[11]);
+ fclose (fp);
+ return g_strdup (&buffer[11]);
+ }
+ }
+
+ fclose (fp);
 }
- fclose( fp );
- }
 
- /* second option: do not set ports at all, let the user
- select the right ones in the nice config window :) */
- return g_strdup( "" );
+ /* second option: do not set ports at all, let the user
+ select the right ones in the nice config window :) */
+ return g_strdup ("");
 }
 
 
 
-void i_configure_cfg_alsa_alloc( void )
+void i_configure_cfg_alsa_free (void)
 {
- amidiplug_cfg_alsa_t * alsacfg = g_malloc(sizeof(amidiplug_cfg_alsa_t));
- amidiplug_cfg_backend->alsa = alsacfg;
+ amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
+ free (alsacfg->alsa_seq_wports);
+ free (alsacfg->alsa_mixer_ctl_name);
+ free (amidiplug_cfg_backend->alsa);
 }
 
 
-void i_configure_cfg_alsa_free( void )
+void i_configure_cfg_alsa_read (void)
 {
- amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
- g_free( alsacfg->alsa_seq_wports );
- g_free( alsacfg->alsa_mixer_ctl_name );
- g_free( amidiplug_cfg_backend->alsa );
-}
+ static const char * const defaults[] =
+ {
+ "alsa_mixer_card_id", "0",
+ "alsa_mixer_ctl_name", "Synth",
+ "alsa_mixer_ctl_id", "0",
+ NULL
+ };
 
+ aud_config_set_defaults ("amidiplug", defaults);
 
-void i_configure_cfg_alsa_read( pcfg_t * cfgfile )
-{
- amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
-
- if (!cfgfile)
- {
- /* alsa backend defaults */
- alsacfg->alsa_seq_wports = i_configure_read_seq_ports_default();
- alsacfg->alsa_mixer_card_id = 0;
- alsacfg->alsa_mixer_ctl_name = g_strdup( "Synth" );
- alsacfg->alsa_mixer_ctl_id = 0;
- }
- else
- {
- i_pcfg_read_string( cfgfile , "alsa" , "alsa_seq_wports" , &alsacfg->alsa_seq_wports , NULL );
- if ( alsacfg->alsa_seq_wports == NULL )
- alsacfg->alsa_seq_wports = i_configure_read_seq_ports_default(); /* pick default values */
- i_pcfg_read_integer( cfgfile , "alsa" , "alsa_mixer_card_id" , &alsacfg->alsa_mixer_card_id , 0 );
- i_pcfg_read_string( cfgfile , "alsa" , "alsa_mixer_ctl_name" , &alsacfg->alsa_mixer_ctl_name , "Synth" );
- i_pcfg_read_integer( cfgfile , "alsa" , "alsa_mixer_ctl_id" , &alsacfg->alsa_mixer_ctl_id , 0 );
- }
+ amidiplug_cfg_alsa_t * alsacfg = malloc (sizeof (amidiplug_cfg_alsa_t));
+ amidiplug_cfg_backend->alsa = alsacfg;
+
+ alsacfg->alsa_seq_wports = aud_get_string ("amidiplug", "alsa_seq_wports");
+ alsacfg->alsa_mixer_card_id = aud_get_int ("amidiplug", "alsa_mixer_card_id");
+ alsacfg->alsa_mixer_ctl_name = aud_get_string ("amidiplug", "alsa_mixer_ctl_name");
+ alsacfg->alsa_mixer_ctl_id = aud_get_int ("amidiplug", "alsa_mixer_ctl_id");
+
+ if (! alsacfg->alsa_seq_wports[0])
+ {
+ free (alsacfg->alsa_seq_wports);
+ alsacfg->alsa_seq_wports = i_configure_read_seq_ports_default ();
+ }
 }
 
 
-void i_configure_cfg_alsa_save( pcfg_t * cfgfile )
+void i_configure_cfg_alsa_save (void)
 {
- amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
-
- i_pcfg_write_string( cfgfile , "alsa" , "alsa_seq_wports" , alsacfg->alsa_seq_wports );
- i_pcfg_write_integer( cfgfile , "alsa" , "alsa_mixer_card_id" , alsacfg->alsa_mixer_card_id );
- i_pcfg_write_string( cfgfile , "alsa" , "alsa_mixer_ctl_name" , alsacfg->alsa_mixer_ctl_name );
- i_pcfg_write_integer( cfgfile , "alsa" , "alsa_mixer_ctl_id" , alsacfg->alsa_mixer_ctl_id );
+ amidiplug_cfg_alsa_t * alsacfg = amidiplug_cfg_backend->alsa;
+ aud_set_string ("amidiplug", "alsa_seq_wports", alsacfg->alsa_seq_wports);
+ aud_set_int ("amidiplug", "alsa_mixer_card_id", alsacfg->alsa_mixer_card_id);
+ aud_set_string ("amidiplug", "alsa_mixer_ctl_name", alsacfg->alsa_mixer_ctl_name);
+ aud_set_int ("amidiplug", "alsa_mixer_ctl_id", alsacfg->alsa_mixer_ctl_id);
 }
 
 #endif /* AMIDIPLUG_ALSA */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_configure-alsa.h -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_configure-alsa.h Changed

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_configure-ap.c -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_configure-ap.c Changed

@@ -18,313 +18,334 @@
 *
 */
 
+#include "i_configure-ap.h"
+
+#include <stdlib.h>
+#include <string.h>
 #include <gtk/gtk.h>
+#include <audacious/i18n.h>
 
+#include "i_backend.h"
+#include "i_configure.h"
 
-#include "i_configure-ap.h"
 #include "amidi-plug-icon.xpm"
 
-
 enum
 {
- LISTBACKEND_NAME_COLUMN = 0,
- LISTBACKEND_LONGNAME_COLUMN,
- LISTBACKEND_DESC_COLUMN,
- LISTBACKEND_FILENAME_COLUMN,
- LISTBACKEND_PPOS_COLUMN,
- LISTBACKEND_N_COLUMNS
+ LISTBACKEND_NAME_COLUMN = 0,
+ LISTBACKEND_LONGNAME_COLUMN,
+ LISTBACKEND_DESC_COLUMN,
+ LISTBACKEND_FILENAME_COLUMN,
+ LISTBACKEND_PPOS_COLUMN,
+ LISTBACKEND_N_COLUMNS
 };
 
 
-void i_configure_ev_backendlv_info( gpointer backend_lv )
+void i_configure_ev_backendlv_info (void * backend_lv)
 {
- GtkTreeModel * store;
- GtkTreeIter iter;
- GtkTreeSelection *sel = gtk_tree_view_get_selection( GTK_TREE_VIEW(backend_lv) );
- /* get the selected item */
- if ( gtk_tree_selection_get_selected( sel , &store , &iter ) )
- {
- GtkWidget *bidialog;
- GtkWidget *title_label;
- GtkWidget *filename_label;
- GtkWidget *description_label;
- GtkWidget *parent_window = gtk_widget_get_toplevel( backend_lv );
- gchar *longname_title, *longname, *filename, *description;
- gtk_tree_model_get( GTK_TREE_MODEL(store) , &iter ,
- LISTBACKEND_LONGNAME_COLUMN , &longname ,
- LISTBACKEND_DESC_COLUMN , &description ,
- LISTBACKEND_FILENAME_COLUMN , &filename , -1 );
- bidialog = gtk_dialog_new_with_buttons( _("AMIDI-Plug - backend information") ,
- GTK_WINDOW(parent_window) ,
- GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL ,
- GTK_STOCK_OK , GTK_RESPONSE_NONE , NULL );
- gtk_window_set_resizable ((GtkWindow *) bidialog, FALSE);
-
- longname_title = g_markup_printf_escaped( "%s" , longname );
- title_label = gtk_label_new( "" );
- gtk_label_set_markup( GTK_LABEL(title_label) , longname_title );
- g_free( longname_title ); g_free( longname );
- gtk_box_pack_start ((GtkBox *) gtk_dialog_get_content_area ((GtkDialog *)
- bidialog), title_label, FALSE, FALSE, 0);
-
- filename_label = gtk_label_new (filename);
- g_free( filename );
- gtk_box_pack_start ((GtkBox *) gtk_dialog_get_content_area ((GtkDialog *)
- bidialog), filename_label, FALSE, FALSE, 0);
-
- description_label = gtk_label_new( description );
- gtk_label_set_line_wrap( GTK_LABEL(description_label) , TRUE );
- g_free( description );
- gtk_box_pack_start ((GtkBox *) gtk_dialog_get_content_area ((GtkDialog *)
- bidialog), description_label, FALSE, FALSE, 0);
-
- gtk_widget_show_all( bidialog );
- gtk_dialog_run( GTK_DIALOG(bidialog) );
- gtk_widget_destroy( bidialog );
- }
- return;
+ GtkTreeModel * store;
+ GtkTreeIter iter;
+ GtkTreeSelection * sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (backend_lv));
+
+ /* get the selected item */
+ if (gtk_tree_selection_get_selected (sel, &store, &iter))
+ {
+ GtkWidget * bidialog;
+ GtkWidget * title_label;
+ GtkWidget * filename_label;
+ GtkWidget * description_label;
+ GtkWidget * parent_window = gtk_widget_get_toplevel (backend_lv);
+ char * longname_title, *longname, *filename, *description;
+ gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+ LISTBACKEND_LONGNAME_COLUMN, &longname,
+ LISTBACKEND_DESC_COLUMN, &description,
+ LISTBACKEND_FILENAME_COLUMN, &filename, -1);
+ bidialog = gtk_dialog_new_with_buttons (_("AMIDI-Plug - backend information"),
+ GTK_WINDOW (parent_window),
+ GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
+ GTK_STOCK_OK, GTK_RESPONSE_NONE, NULL);
+ gtk_window_set_resizable ((GtkWindow *) bidialog, FALSE);
+
+ longname_title = g_markup_printf_escaped ("%s", longname);
+ title_label = gtk_label_new ("");
+ gtk_label_set_markup (GTK_LABEL (title_label), longname_title);
+ free (longname_title);
+ free (longname);
+ gtk_box_pack_start ((GtkBox *) gtk_dialog_get_content_area ((GtkDialog *)
+ bidialog), title_label, FALSE, FALSE, 0);
+
+ filename_label = gtk_label_new (filename);
+ free (filename);
+ gtk_box_pack_start ((GtkBox *) gtk_dialog_get_content_area ((GtkDialog *)
+ bidialog), filename_label, FALSE, FALSE, 0);
+
+ description_label = gtk_label_new (description);
+ gtk_label_set_line_wrap (GTK_LABEL (description_label), TRUE);
+ free (description);
+ gtk_box_pack_start ((GtkBox *) gtk_dialog_get_content_area ((GtkDialog *)
+ bidialog), description_label, FALSE, FALSE, 0);
+
+ gtk_widget_show_all (bidialog);
+ gtk_dialog_run (GTK_DIALOG (bidialog));
+ gtk_widget_destroy (bidialog);
+ }
+
+ return;
 }
 
 
-void i_configure_ev_backendlv_commit( gpointer backend_lv )
+void i_configure_ev_backendlv_commit (void * backend_lv)
 {
- GtkTreeModel * store;
- GtkTreeIter iter;
- GtkTreeSelection *sel = gtk_tree_view_get_selection( GTK_TREE_VIEW(backend_lv) );
- /* get the selected item */
- if ( gtk_tree_selection_get_selected( sel , &store , &iter ) )
- {
- g_free( amidiplug_cfg_ap.ap_seq_backend ); /* free previous */
- /* update amidiplug_cfg_ap.ap_seq_backend */
- gtk_tree_model_get( GTK_TREE_MODEL(store) , &iter ,
- LISTBACKEND_NAME_COLUMN , &amidiplug_cfg_ap.ap_seq_backend , -1 );
- }
- return;
+ GtkTreeModel * store;
+ GtkTreeIter iter;
+ GtkTreeSelection * sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (backend_lv));
+
+ /* get the selected item */
+ if (gtk_tree_selection_get_selected (sel, &store, &iter))
+ {
+ free (amidiplug_cfg_ap->ap_seq_backend); /* free previous */
+ /* update amidiplug_cfg_ap->ap_seq_backend */
+ gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+ LISTBACKEND_NAME_COLUMN, &amidiplug_cfg_ap->ap_seq_backend, -1);
+ }
+
+ return;
 }
 
 
-void i_configure_ev_settplay_commit( gpointer settplay_vbox )
+void i_configure_ev_settplay_commit (void * settplay_vbox)
 {
- GtkWidget *settplay_transpose_spinbt = g_object_get_data( G_OBJECT(settplay_vbox) ,
- "ap_opts_transpose_value" );
- GtkWidget *settplay_drumshift_spinbt = g_object_get_data( G_OBJECT(settplay_vbox) ,
- "ap_opts_drumshift_value" );
- amidiplug_cfg_ap.ap_opts_transpose_value = gtk_spin_button_get_value_as_int(
- GTK_SPIN_BUTTON(settplay_transpose_spinbt) );
- amidiplug_cfg_ap.ap_opts_drumshift_value = gtk_spin_button_get_value_as_int(
- GTK_SPIN_BUTTON(settplay_drumshift_spinbt) );
- return;
+ GtkWidget * settplay_transpose_spinbt = g_object_get_data (G_OBJECT (settplay_vbox),
+ "ap_opts_transpose_value");
+ GtkWidget * settplay_drumshift_spinbt = g_object_get_data (G_OBJECT (settplay_vbox),
+ "ap_opts_drumshift_value");
+ amidiplug_cfg_ap->ap_opts_transpose_value = gtk_spin_button_get_value_as_int (
+ GTK_SPIN_BUTTON (settplay_transpose_spinbt));
+ amidiplug_cfg_ap->ap_opts_drumshift_value = gtk_spin_button_get_value_as_int (
+ GTK_SPIN_BUTTON (settplay_drumshift_spinbt));
+ return;
 }
 
 
-void i_configure_ev_settadva_commit( gpointer settadva_vbox )
+void i_configure_ev_settadva_commit (void * settadva_vbox)
 {
- GtkWidget *settadva_precalc_checkbt = g_object_get_data( G_OBJECT(settadva_vbox) ,
- "ap_opts_length_precalc" );
- GtkWidget *settadva_extractlyr_checkbt = g_object_get_data( G_OBJECT(settadva_vbox) ,
- "ap_opts_lyrics_extract" );
- GtkWidget *settadva_extractcomm_checkbt = g_object_get_data( G_OBJECT(settadva_vbox) ,
- "ap_opts_comments_extract" );
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(settadva_precalc_checkbt) ) )
- amidiplug_cfg_ap.ap_opts_length_precalc = 1;
- else
- amidiplug_cfg_ap.ap_opts_length_precalc = 0;
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(settadva_extractlyr_checkbt) ) )
- amidiplug_cfg_ap.ap_opts_lyrics_extract = 1;
- else
- amidiplug_cfg_ap.ap_opts_lyrics_extract = 0;
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(settadva_extractcomm_checkbt) ) )
- amidiplug_cfg_ap.ap_opts_comments_extract = 1;
- else
- amidiplug_cfg_ap.ap_opts_comments_extract = 0;
- return;
+ GtkWidget * settadva_precalc_checkbt = g_object_get_data (G_OBJECT (settadva_vbox),
+ "ap_opts_length_precalc");
+ GtkWidget * settadva_extractlyr_checkbt = g_object_get_data (G_OBJECT (settadva_vbox),
+ "ap_opts_lyrics_extract");
+ GtkWidget * settadva_extractcomm_checkbt = g_object_get_data (G_OBJECT (settadva_vbox),
+ "ap_opts_comments_extract");
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (settadva_precalc_checkbt)))
+ amidiplug_cfg_ap->ap_opts_length_precalc = 1;
+ else
+ amidiplug_cfg_ap->ap_opts_length_precalc = 0;
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (settadva_extractlyr_checkbt)))
+ amidiplug_cfg_ap->ap_opts_lyrics_extract = 1;
+ else
+ amidiplug_cfg_ap->ap_opts_lyrics_extract = 0;
+
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (settadva_extractcomm_checkbt)))
+ amidiplug_cfg_ap->ap_opts_comments_extract = 1;
+ else
+ amidiplug_cfg_ap->ap_opts_comments_extract = 0;
+
+ return;
 }
 
 
-gint i_configure_backendlist_sortf( GtkTreeModel * model , GtkTreeIter * a ,
- GtkTreeIter * b , gpointer data )
+int i_configure_backendlist_sortf (GtkTreeModel * model, GtkTreeIter * a,
+ GtkTreeIter * b, void * data)
 {
- gint v_a = 0, v_b = 0;
- gtk_tree_model_get( model , a , LISTBACKEND_PPOS_COLUMN , &v_a , -1 );
- gtk_tree_model_get( model , b , LISTBACKEND_PPOS_COLUMN , &v_b , -1 );
- return (v_a - v_b);
+ int v_a = 0, v_b = 0;
+ gtk_tree_model_get (model, a, LISTBACKEND_PPOS_COLUMN, &v_a, -1);
+ gtk_tree_model_get (model, b, LISTBACKEND_PPOS_COLUMN, &v_b, -1);
+ return (v_a - v_b);
 }
 
 
-void i_configure_gui_tab_ap( GtkWidget * ap_page_alignment ,
- gpointer backend_list_p ,
- gpointer commit_button )
+void i_configure_gui_tab_ap (GtkWidget * ap_page_alignment,
+ void * backend_list_p,
+ void * commit_button)
 {
- GtkWidget *settings_vbox; /* this vbox will contain all settings vbox (playback, advanced) */
- GtkWidget *settplay_frame, *settplay_vbox;
- GtkWidget *settplay_transpose_and_drumshift_hbox;
- GtkWidget *settplay_transpose_hbox, *settplay_transpose_label1, *settplay_transpose_spinbt;
- GtkWidget *settplay_drumshift_hbox, *settplay_drumshift_label1, *settplay_drumshift_spinbt;
- GtkWidget *settadva_frame, *settadva_vbox;
- GtkWidget *settadva_precalc_checkbt, *settadva_extractcomm_checkbt, *settadva_extractlyr_checkbt;
- GtkWidget *backend_lv_frame, *backend_lv, *backend_lv_sw;
- GtkWidget *backend_lv_hbox, *backend_lv_vbbox, *backend_lv_infobt;
- GtkListStore *backend_store;
- GtkCellRenderer *backend_lv_text_rndr;
- GtkTreeViewColumn *backend_lv_name_col;
- GtkTreeIter backend_lv_iter_selected;
- GtkTreeSelection *backend_lv_sel;
- GtkTreeIter iter;
- GSList * backend_list = backend_list_p;
-
- GtkWidget * content_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-
- backend_store = gtk_list_store_new( LISTBACKEND_N_COLUMNS , G_TYPE_STRING , G_TYPE_STRING ,
- G_TYPE_STRING , G_TYPE_STRING , G_TYPE_INT );
- gtk_tree_sortable_set_default_sort_func( GTK_TREE_SORTABLE(backend_store) ,
- i_configure_backendlist_sortf , NULL , NULL );
- gtk_tree_sortable_set_sort_column_id( GTK_TREE_SORTABLE(backend_store) ,
- GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID ,
- GTK_SORT_ASCENDING );
-
- gboolean backend_lv_iter_selected_valid = FALSE;
-
- while ( backend_list != NULL )
- {
- amidiplug_sequencer_backend_name_t * mn = backend_list->data;
- gtk_list_store_append( backend_store , &iter );
- gtk_list_store_set ( backend_store, &iter,
- LISTBACKEND_NAME_COLUMN , mn->name ,
- LISTBACKEND_LONGNAME_COLUMN , mn->longname ,
- LISTBACKEND_DESC_COLUMN , mn->desc ,
- LISTBACKEND_FILENAME_COLUMN , mn->filename ,
- LISTBACKEND_PPOS_COLUMN , mn->ppos , -1 );
-
- if ( !strcmp( mn->name , amidiplug_cfg_ap.ap_seq_backend ) )
+ GtkWidget * settings_vbox; /* this vbox will contain all settings vbox (playback, advanced) */
+ GtkWidget * settplay_frame, *settplay_vbox;
+ GtkWidget * settplay_transpose_and_drumshift_hbox;
+ GtkWidget * settplay_transpose_hbox, *settplay_transpose_label1, *settplay_transpose_spinbt;
+ GtkWidget * settplay_drumshift_hbox, *settplay_drumshift_label1, *settplay_drumshift_spinbt;
+ GtkWidget * settadva_frame, *settadva_vbox;
+ GtkWidget * settadva_precalc_checkbt, *settadva_extractcomm_checkbt, *settadva_extractlyr_checkbt;
+ GtkWidget * backend_lv_frame, *backend_lv, *backend_lv_sw;
+ GtkWidget * backend_lv_hbox, *backend_lv_vbbox, *backend_lv_infobt;
+ GtkListStore * backend_store;
+ GtkCellRenderer * backend_lv_text_rndr;
+ GtkTreeViewColumn * backend_lv_name_col;
+ GtkTreeIter backend_lv_iter_selected;
+ GtkTreeSelection * backend_lv_sel;
+ GtkTreeIter iter;
+ GSList * backend_list = backend_list_p;
+
+ GtkWidget * content_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+
+ backend_store = gtk_list_store_new (LISTBACKEND_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT);
+ gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (backend_store),
+ i_configure_backendlist_sortf, NULL, NULL);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (backend_store),
+ GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+ GTK_SORT_ASCENDING);
+
+ bool_t backend_lv_iter_selected_valid = FALSE;
+
+ while (backend_list != NULL)
 {
- backend_lv_iter_selected = iter;
- backend_lv_iter_selected_valid = TRUE;
+ amidiplug_sequencer_backend_name_t * mn = backend_list->data;
+ gtk_list_store_append (backend_store, &iter);
+ gtk_list_store_set (backend_store, &iter,
+ LISTBACKEND_NAME_COLUMN, mn->name,
+ LISTBACKEND_LONGNAME_COLUMN, mn->longname,
+ LISTBACKEND_DESC_COLUMN, mn->desc,
+ LISTBACKEND_FILENAME_COLUMN, mn->filename,
+ LISTBACKEND_PPOS_COLUMN, mn->ppos, -1);
+
+ if (!strcmp (mn->name, amidiplug_cfg_ap->ap_seq_backend))
+ {
+ backend_lv_iter_selected = iter;
+ backend_lv_iter_selected_valid = TRUE;
+ }
+
+ backend_list = backend_list->next;
 }
 
- backend_list = backend_list->next;
- }
-
- backend_lv_frame = gtk_frame_new( _("Backend selection") );
-
- backend_lv = gtk_tree_view_new_with_model( GTK_TREE_MODEL(backend_store) );
- gtk_tree_view_set_headers_visible ((GtkTreeView *) backend_lv, FALSE);
- g_object_unref( backend_store );
-
- backend_lv_text_rndr = gtk_cell_renderer_text_new();
- backend_lv_name_col = gtk_tree_view_column_new_with_attributes( NULL ,
- backend_lv_text_rndr ,
- "text" , 1 , NULL );
- gtk_tree_view_append_column( GTK_TREE_VIEW(backend_lv), backend_lv_name_col );
-
- backend_lv_sel = gtk_tree_view_get_selection( GTK_TREE_VIEW(backend_lv) );
- gtk_tree_selection_set_mode( GTK_TREE_SELECTION(backend_lv_sel) , GTK_SELECTION_BROWSE );
-
- if (backend_lv_iter_selected_valid)
- gtk_tree_selection_select_iter (backend_lv_sel, & backend_lv_iter_selected);
-
- backend_lv_sw = gtk_scrolled_window_new( NULL , NULL );
- gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) backend_lv_sw, GTK_SHADOW_IN);
- gtk_scrolled_window_set_policy ((GtkScrolledWindow *) backend_lv_sw,
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_container_add( GTK_CONTAINER(backend_lv_sw) , backend_lv );
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_backendlv_commit) , backend_lv );
-
- backend_lv_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0 );
- gtk_box_pack_start( GTK_BOX(backend_lv_hbox) , backend_lv_sw , TRUE , TRUE , 0 );
- backend_lv_vbbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2 );
- gtk_box_pack_start( GTK_BOX(backend_lv_hbox) , backend_lv_vbbox , FALSE , FALSE , 3 );
- backend_lv_infobt = gtk_button_new();
- gtk_button_set_image( GTK_BUTTON(backend_lv_infobt) ,
- gtk_image_new_from_stock( GTK_STOCK_DIALOG_INFO , GTK_ICON_SIZE_BUTTON ) );
- g_signal_connect_swapped( G_OBJECT(backend_lv_infobt) , "clicked" ,
- G_CALLBACK(i_configure_ev_backendlv_info) , backend_lv );
- gtk_box_pack_start( GTK_BOX(backend_lv_vbbox) , backend_lv_infobt , FALSE , FALSE , 0 );
- gtk_container_add( GTK_CONTAINER(backend_lv_frame) , backend_lv_hbox );
-
- settings_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2 );
-
- settplay_frame = gtk_frame_new( _("Playback settings") );
- settplay_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0 );
- gtk_container_set_border_width( GTK_CONTAINER(settplay_vbox), 4 );
- settplay_transpose_and_drumshift_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12 );
- settplay_transpose_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0 );
- settplay_transpose_label1 = gtk_label_new( _("Transpose: ") );
- settplay_transpose_spinbt = gtk_spin_button_new_with_range( -20 , 20 , 1 );
- gtk_spin_button_set_value( GTK_SPIN_BUTTON(settplay_transpose_spinbt) ,
- amidiplug_cfg_ap.ap_opts_transpose_value );
- gtk_box_pack_start( GTK_BOX(settplay_transpose_hbox) , settplay_transpose_label1 , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(settplay_transpose_hbox) , settplay_transpose_spinbt , FALSE , FALSE , 2 );
- gtk_box_pack_start( GTK_BOX(settplay_transpose_and_drumshift_hbox) ,
- settplay_transpose_hbox , FALSE , FALSE , 0 );
- settplay_drumshift_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0 );
- settplay_drumshift_label1 = gtk_label_new( _("Drum shift: ") );
- settplay_drumshift_spinbt = gtk_spin_button_new_with_range( 0 , 127 , 1 );
- gtk_spin_button_set_value( GTK_SPIN_BUTTON(settplay_drumshift_spinbt) ,
- amidiplug_cfg_ap.ap_opts_drumshift_value );
- gtk_box_pack_start( GTK_BOX(settplay_drumshift_hbox) , settplay_drumshift_label1 , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(settplay_drumshift_hbox) , settplay_drumshift_spinbt , FALSE , FALSE , 2 );
- gtk_box_pack_start( GTK_BOX(settplay_transpose_and_drumshift_hbox) ,
- settplay_drumshift_hbox , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(settplay_vbox) ,
- settplay_transpose_and_drumshift_hbox , FALSE , FALSE , 2 );
- gtk_container_add( GTK_CONTAINER(settplay_frame) , settplay_vbox );
- /* attach pointers of options to settplay_vbox so we can handle all of them in a single callback */
- g_object_set_data( G_OBJECT(settplay_vbox) , "ap_opts_transpose_value" , settplay_transpose_spinbt );
- g_object_set_data( G_OBJECT(settplay_vbox) , "ap_opts_drumshift_value" , settplay_drumshift_spinbt );
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_settplay_commit) , settplay_vbox );
- gtk_box_pack_start( GTK_BOX(settings_vbox) , settplay_frame , TRUE , TRUE , 0 );
-
- settadva_frame = gtk_frame_new( _("Advanced settings") );
- settadva_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0 );
- gtk_container_set_border_width( GTK_CONTAINER(settadva_vbox), 4 );
- settadva_precalc_checkbt = gtk_check_button_new_with_label(
- _("pre-calculate length of MIDI files in playlist") );
- if ( amidiplug_cfg_ap.ap_opts_length_precalc )
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(settadva_precalc_checkbt) , TRUE );
- gtk_box_pack_start( GTK_BOX(settadva_vbox) , settadva_precalc_checkbt , FALSE , FALSE , 2 );
- settadva_extractcomm_checkbt = gtk_check_button_new_with_label(
- _("extract comments from MIDI file (if available)") );
- if ( amidiplug_cfg_ap.ap_opts_comments_extract )
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(settadva_extractcomm_checkbt) , TRUE );
- gtk_box_pack_start( GTK_BOX(settadva_vbox) , settadva_extractcomm_checkbt , FALSE , FALSE , 2 );
- settadva_extractlyr_checkbt = gtk_check_button_new_with_label(
- _("extract lyrics from MIDI file (if available)") );
- if ( amidiplug_cfg_ap.ap_opts_lyrics_extract )
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(settadva_extractlyr_checkbt) , TRUE );
- gtk_box_pack_start( GTK_BOX(settadva_vbox) , settadva_extractlyr_checkbt , FALSE , FALSE , 2 );
- gtk_container_add( GTK_CONTAINER(settadva_frame) , settadva_vbox );
- /* attach pointers of options to settadva_vbox so we can handle all of them in a single callback */
- g_object_set_data( G_OBJECT(settadva_vbox) , "ap_opts_length_precalc" , settadva_precalc_checkbt );
- g_object_set_data( G_OBJECT(settadva_vbox) , "ap_opts_comments_extract" , settadva_extractcomm_checkbt );
- g_object_set_data( G_OBJECT(settadva_vbox) , "ap_opts_lyrics_extract" , settadva_extractlyr_checkbt );
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_settadva_commit) , settadva_vbox );
- gtk_box_pack_start( GTK_BOX(settings_vbox) , settadva_frame , TRUE , TRUE , 0 );
-
- gtk_box_pack_start( GTK_BOX(content_vbox) , backend_lv_frame , TRUE , TRUE , 0 );
- gtk_box_pack_start( GTK_BOX(content_vbox) , settings_vbox , TRUE , TRUE , 0 );
-
- gtk_container_add ((GtkContainer *) ap_page_alignment, content_vbox);
+ backend_lv_frame = gtk_frame_new (_("Backend selection"));
+
+ backend_lv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (backend_store));
+ gtk_tree_view_set_headers_visible ((GtkTreeView *) backend_lv, FALSE);
+ g_object_unref (backend_store);
+
+ backend_lv_text_rndr = gtk_cell_renderer_text_new();
+ backend_lv_name_col = gtk_tree_view_column_new_with_attributes (NULL,
+ backend_lv_text_rndr,
+ "text", 1, NULL);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (backend_lv), backend_lv_name_col);
+
+ backend_lv_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (backend_lv));
+ gtk_tree_selection_set_mode (GTK_TREE_SELECTION (backend_lv_sel), GTK_SELECTION_BROWSE);
+
+ if (backend_lv_iter_selected_valid)
+ gtk_tree_selection_select_iter (backend_lv_sel, & backend_lv_iter_selected);
+
+ backend_lv_sw = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) backend_lv_sw, GTK_SHADOW_IN);
+ gtk_scrolled_window_set_policy ((GtkScrolledWindow *) backend_lv_sw,
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_container_add (GTK_CONTAINER (backend_lv_sw), backend_lv);
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_backendlv_commit), backend_lv);
+
+ backend_lv_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ gtk_box_pack_start (GTK_BOX (backend_lv_hbox), backend_lv_sw, TRUE, TRUE, 0);
+ backend_lv_vbbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+ gtk_box_pack_start (GTK_BOX (backend_lv_hbox), backend_lv_vbbox, FALSE, FALSE, 3);
+ backend_lv_infobt = gtk_button_new();
+ gtk_button_set_image (GTK_BUTTON (backend_lv_infobt),
+ gtk_image_new_from_stock (GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON));
+ g_signal_connect_swapped (G_OBJECT (backend_lv_infobt), "clicked",
+ G_CALLBACK (i_configure_ev_backendlv_info), backend_lv);
+ gtk_box_pack_start (GTK_BOX (backend_lv_vbbox), backend_lv_infobt, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (backend_lv_frame), backend_lv_hbox);
+
+ settings_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+
+ settplay_frame = gtk_frame_new (_("Playback settings"));
+ settplay_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (settplay_vbox), 4);
+ settplay_transpose_and_drumshift_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+ settplay_transpose_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ settplay_transpose_label1 = gtk_label_new (_("Transpose: "));
+ settplay_transpose_spinbt = gtk_spin_button_new_with_range (-20, 20, 1);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (settplay_transpose_spinbt),
+ amidiplug_cfg_ap->ap_opts_transpose_value);
+ gtk_box_pack_start (GTK_BOX (settplay_transpose_hbox), settplay_transpose_label1, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (settplay_transpose_hbox), settplay_transpose_spinbt, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (settplay_transpose_and_drumshift_hbox),
+ settplay_transpose_hbox, FALSE, FALSE, 0);
+ settplay_drumshift_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ settplay_drumshift_label1 = gtk_label_new (_("Drum shift: "));
+ settplay_drumshift_spinbt = gtk_spin_button_new_with_range (0, 127, 1);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (settplay_drumshift_spinbt),
+ amidiplug_cfg_ap->ap_opts_drumshift_value);
+ gtk_box_pack_start (GTK_BOX (settplay_drumshift_hbox), settplay_drumshift_label1, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (settplay_drumshift_hbox), settplay_drumshift_spinbt, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (settplay_transpose_and_drumshift_hbox),
+ settplay_drumshift_hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (settplay_vbox),
+ settplay_transpose_and_drumshift_hbox, FALSE, FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (settplay_frame), settplay_vbox);
+ /* attach pointers of options to settplay_vbox so we can handle all of them in a single callback */
+ g_object_set_data (G_OBJECT (settplay_vbox), "ap_opts_transpose_value", settplay_transpose_spinbt);
+ g_object_set_data (G_OBJECT (settplay_vbox), "ap_opts_drumshift_value", settplay_drumshift_spinbt);
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_settplay_commit), settplay_vbox);
+ gtk_box_pack_start (GTK_BOX (settings_vbox), settplay_frame, TRUE, TRUE, 0);
+
+ settadva_frame = gtk_frame_new (_("Advanced settings"));
+ settadva_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (settadva_vbox), 4);
+ settadva_precalc_checkbt = gtk_check_button_new_with_label (
+ _("pre-calculate length of MIDI files in playlist"));
+
+ if (amidiplug_cfg_ap->ap_opts_length_precalc)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (settadva_precalc_checkbt), TRUE);
+
+ gtk_box_pack_start (GTK_BOX (settadva_vbox), settadva_precalc_checkbt, FALSE, FALSE, 2);
+ settadva_extractcomm_checkbt = gtk_check_button_new_with_label (
+ _("extract comments from MIDI file (if available)"));
+
+ if (amidiplug_cfg_ap->ap_opts_comments_extract)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (settadva_extractcomm_checkbt), TRUE);
+
+ gtk_box_pack_start (GTK_BOX (settadva_vbox), settadva_extractcomm_checkbt, FALSE, FALSE, 2);
+ settadva_extractlyr_checkbt = gtk_check_button_new_with_label (
+ _("extract lyrics from MIDI file (if available)"));
+
+ if (amidiplug_cfg_ap->ap_opts_lyrics_extract)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (settadva_extractlyr_checkbt), TRUE);
+
+ gtk_box_pack_start (GTK_BOX (settadva_vbox), settadva_extractlyr_checkbt, FALSE, FALSE, 2);
+ gtk_container_add (GTK_CONTAINER (settadva_frame), settadva_vbox);
+ /* attach pointers of options to settadva_vbox so we can handle all of them in a single callback */
+ g_object_set_data (G_OBJECT (settadva_vbox), "ap_opts_length_precalc", settadva_precalc_checkbt);
+ g_object_set_data (G_OBJECT (settadva_vbox), "ap_opts_comments_extract", settadva_extractcomm_checkbt);
+ g_object_set_data (G_OBJECT (settadva_vbox), "ap_opts_lyrics_extract", settadva_extractlyr_checkbt);
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_settadva_commit), settadva_vbox);
+ gtk_box_pack_start (GTK_BOX (settings_vbox), settadva_frame, TRUE, TRUE, 0);
+
+ gtk_box_pack_start (GTK_BOX (content_vbox), backend_lv_frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_vbox), settings_vbox, TRUE, TRUE, 0);
+
+ gtk_container_add ((GtkContainer *) ap_page_alignment, content_vbox);
 }
 
 
-void i_configure_gui_tablabel_ap( GtkWidget * ap_page_alignment ,
- gpointer backend_list_p ,
- gpointer commit_button )
+void i_configure_gui_tablabel_ap (GtkWidget * ap_page_alignment,
+ void * backend_list_p,
+ void * commit_button)
 {
- GtkWidget *pagelabel_vbox, *pagelabel_image, *pagelabel_label;
- GdkPixbuf *pagelabel_image_pix;
- pagelabel_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1 );
- pagelabel_image_pix = gdk_pixbuf_new_from_xpm_data( (const gchar **)amidi_plug_icon_xpm );
- pagelabel_image = gtk_image_new_from_pixbuf( pagelabel_image_pix ); g_object_unref( pagelabel_image_pix );
- pagelabel_label = gtk_label_new( "" );
- gtk_label_set_markup( GTK_LABEL(pagelabel_label) , _("AMIDI\nPlug") );
- gtk_label_set_justify( GTK_LABEL(pagelabel_label) , GTK_JUSTIFY_CENTER );
- gtk_box_pack_start( GTK_BOX(pagelabel_vbox) , pagelabel_image , FALSE , FALSE , 1 );
- gtk_box_pack_start( GTK_BOX(pagelabel_vbox) , pagelabel_label , FALSE , FALSE , 1 );
- gtk_container_add( GTK_CONTAINER(ap_page_alignment) , pagelabel_vbox );
- gtk_widget_show_all( ap_page_alignment );
- return;
+ GtkWidget * pagelabel_vbox, *pagelabel_image, *pagelabel_label;
+ GdkPixbuf * pagelabel_image_pix;
+ pagelabel_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
+ pagelabel_image_pix = gdk_pixbuf_new_from_xpm_data ((const char **) amidi_plug_icon_xpm);
+ pagelabel_image = gtk_image_new_from_pixbuf (pagelabel_image_pix);
+ g_object_unref (pagelabel_image_pix);
+ pagelabel_label = gtk_label_new ("");
+ gtk_label_set_markup (GTK_LABEL (pagelabel_label), _("AMIDI\nPlug"));
+ gtk_label_set_justify (GTK_LABEL (pagelabel_label), GTK_JUSTIFY_CENTER);
+ gtk_box_pack_start (GTK_BOX (pagelabel_vbox), pagelabel_image, FALSE, FALSE, 1);
+ gtk_box_pack_start (GTK_BOX (pagelabel_vbox), pagelabel_label, FALSE, FALSE, 1);
+ gtk_container_add (GTK_CONTAINER (ap_page_alignment), pagelabel_vbox);
+ gtk_widget_show_all (ap_page_alignment);
+ return;
 }

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_configure-ap.h -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_configure-ap.h Changed

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_configure-fluidsynth.c -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_configure-fluidsynth.c Changed

@@ -18,655 +18,703 @@
 *
 */
 
-#include <glib/gstdio.h>
+#include "i_configure-fluidsynth.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
 #include <gtk/gtk.h>
+#include <audacious/i18n.h>
+#include <audacious/misc.h>
 
-#include "i_configure-fluidsynth.h"
+#include "i_common.h"
+#include "i_configure.h"
 
 #ifdef AMIDIPLUG_FLUIDSYNTH
 
-#include "backend-fluidsynth/b-fluidsynth-config.h"
 #include "backend-fluidsynth/backend-fluidsynth-icon.xpm"
 
 enum
 {
- LISTSFONT_FILENAME_COLUMN = 0,
- LISTSFONT_FILESIZE_COLUMN,
- LISTSFONT_N_COLUMNS
+ LISTSFONT_FILENAME_COLUMN = 0,
+ LISTSFONT_FILESIZE_COLUMN,
+ LISTSFONT_N_COLUMNS
 };
 
 
-void i_configure_ev_toggle_default( GtkToggleButton *togglebutton , gpointer hbox )
+void i_configure_ev_toggle_default (GtkToggleButton * togglebutton, void * hbox)
 {
- if ( gtk_toggle_button_get_active( togglebutton ) )
- gtk_widget_set_sensitive( GTK_WIDGET(hbox) , FALSE );
- else
- gtk_widget_set_sensitive( GTK_WIDGET(hbox) , TRUE );
+ if (gtk_toggle_button_get_active (togglebutton))
+ gtk_widget_set_sensitive (GTK_WIDGET (hbox), FALSE);
+ else
+ gtk_widget_set_sensitive (GTK_WIDGET (hbox), TRUE);
 }
 
 
-void i_configure_ev_sflist_add( gpointer sfont_lv )
+void i_configure_ev_sflist_add (void * sfont_lv)
 {
- GtkWidget *parent_window = gtk_widget_get_toplevel( sfont_lv );
- if (gtk_widget_is_toplevel (parent_window))
- {
- GtkTreeSelection *listsel = gtk_tree_view_get_selection( GTK_TREE_VIEW(sfont_lv) );
- GtkTreeIter itersel, iterapp;
- GtkWidget *browse_dialog = gtk_file_chooser_dialog_new( _("AMIDI-Plug - select SoundFont file") ,
- GTK_WINDOW(parent_window) ,
- GTK_FILE_CHOOSER_ACTION_OPEN ,
- GTK_STOCK_CANCEL , GTK_RESPONSE_CANCEL ,
- GTK_STOCK_OPEN , GTK_RESPONSE_ACCEPT , NULL );
- if ( gtk_tree_selection_get_selected( listsel , NULL , &itersel ) )
- {
- gchar *selfilename = NULL, *selfiledir = NULL;
- GtkTreeModel *store = gtk_tree_view_get_model( GTK_TREE_VIEW(sfont_lv) );
- gtk_tree_model_get( GTK_TREE_MODEL(store) , &itersel , LISTSFONT_FILENAME_COLUMN , &selfilename , -1 );
- selfiledir = g_path_get_dirname( selfilename );
- gtk_file_chooser_set_current_folder( GTK_FILE_CHOOSER(browse_dialog) , selfiledir );
- g_free( selfiledir ); g_free( selfilename );
- }
- if ( gtk_dialog_run(GTK_DIALOG(browse_dialog)) == GTK_RESPONSE_ACCEPT )
+ GtkWidget * parent_window = gtk_widget_get_toplevel (sfont_lv);
+
+ if (gtk_widget_is_toplevel (parent_window))
 {
- struct stat finfo;
- GtkTreeModel *store = gtk_tree_view_get_model( GTK_TREE_VIEW(sfont_lv) );
- gchar *filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(browse_dialog) );
- gint filesize = -1;
- if ( g_stat( filename , &finfo ) == 0 )
- filesize = finfo.st_size;
- gtk_list_store_append( GTK_LIST_STORE(store) , &iterapp );
- gtk_list_store_set( GTK_LIST_STORE(store) , &iterapp ,
- LISTSFONT_FILENAME_COLUMN , filename ,
- LISTSFONT_FILESIZE_COLUMN , filesize , -1 );
- DEBUGMSG( "selected file: %s\n" , filename );
- g_free( filename );
+ GtkTreeSelection * listsel = gtk_tree_view_get_selection (GTK_TREE_VIEW (sfont_lv));
+ GtkTreeIter itersel, iterapp;
+ GtkWidget * browse_dialog = gtk_file_chooser_dialog_new (_("AMIDI-Plug - select SoundFont file"),
+ GTK_WINDOW (parent_window),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
+
+ if (gtk_tree_selection_get_selected (listsel, NULL, &itersel))
+ {
+ char * selfilename = NULL, *selfiledir = NULL;
+ GtkTreeModel * store = gtk_tree_view_get_model (GTK_TREE_VIEW (sfont_lv));
+ gtk_tree_model_get (GTK_TREE_MODEL (store), &itersel, LISTSFONT_FILENAME_COLUMN, &selfilename, -1);
+ selfiledir = g_path_get_dirname (selfilename);
+ gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (browse_dialog), selfiledir);
+ free (selfiledir);
+ free (selfilename);
+ }
+
+ if (gtk_dialog_run (GTK_DIALOG (browse_dialog)) == GTK_RESPONSE_ACCEPT)
+ {
+ struct stat finfo;
+ GtkTreeModel * store = gtk_tree_view_get_model (GTK_TREE_VIEW (sfont_lv));
+ char * filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (browse_dialog));
+ int filesize = -1;
+
+ if (stat (filename, &finfo) == 0)
+ filesize = finfo.st_size;
+
+ gtk_list_store_append (GTK_LIST_STORE (store), &iterapp);
+ gtk_list_store_set (GTK_LIST_STORE (store), &iterapp,
+ LISTSFONT_FILENAME_COLUMN, filename,
+ LISTSFONT_FILESIZE_COLUMN, filesize, -1);
+ DEBUGMSG ("selected file: %s\n", filename);
+ free (filename);
+ }
+
+ gtk_widget_destroy (browse_dialog);
 }
- gtk_widget_destroy( browse_dialog );
- }
 }
 
 
-void i_configure_ev_sflist_rem( gpointer sfont_lv )
+void i_configure_ev_sflist_rem (void * sfont_lv)
 {
- GtkTreeModel *store;
- GtkTreeIter iter;
- GtkTreeSelection *listsel = gtk_tree_view_get_selection( GTK_TREE_VIEW(sfont_lv) );
- if ( gtk_tree_selection_get_selected( listsel , &store , &iter ) )
- gtk_list_store_remove( GTK_LIST_STORE(store) , &iter );
+ GtkTreeModel * store;
+ GtkTreeIter iter;
+ GtkTreeSelection * listsel = gtk_tree_view_get_selection (GTK_TREE_VIEW (sfont_lv));
+
+ if (gtk_tree_selection_get_selected (listsel, &store, &iter))
+ gtk_list_store_remove (GTK_LIST_STORE (store), &iter);
 }
 
 
-void i_configure_ev_sflist_swap( GtkWidget * button , gpointer sfont_lv )
+void i_configure_ev_sflist_swap (GtkWidget * button, void * sfont_lv)
 {
- GtkTreeModel *store;
- GtkTreeIter iter;
- GtkTreeSelection *listsel = gtk_tree_view_get_selection( GTK_TREE_VIEW(sfont_lv) );
-
- if ( gtk_tree_selection_get_selected( listsel , &store , &iter ) )
- {
- guint swapdire = GPOINTER_TO_UINT(g_object_get_data( G_OBJECT(button) , "swapdire" ));
- if ( swapdire == 0 ) /* move up */
- {
- GtkTreePath *treepath = gtk_tree_model_get_path( store, &iter );
- if ( gtk_tree_path_prev( treepath ) )
- {
- GtkTreeIter iter_prev;
- if ( gtk_tree_model_get_iter( store , &iter_prev , treepath ) )
- gtk_list_store_swap( GTK_LIST_STORE(store) , &iter , &iter_prev );
- }
- gtk_tree_path_free( treepath );
- }
- else /* move down */
+ GtkTreeModel * store;
+ GtkTreeIter iter;
+ GtkTreeSelection * listsel = gtk_tree_view_get_selection (GTK_TREE_VIEW (sfont_lv));
+
+ if (gtk_tree_selection_get_selected (listsel, &store, &iter))
 {
- GtkTreeIter iter_prev = iter;
- if ( gtk_tree_model_iter_next( store , &iter ) )
- gtk_list_store_swap( GTK_LIST_STORE(store) , &iter , &iter_prev );
+ unsigned swapdire = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (button), "swapdire"));
+
+ if (swapdire == 0) /* move up */
+ {
+ GtkTreePath * treepath = gtk_tree_model_get_path (store, &iter);
+
+ if (gtk_tree_path_prev (treepath))
+ {
+ GtkTreeIter iter_prev;
+
+ if (gtk_tree_model_get_iter (store, &iter_prev, treepath))
+ gtk_list_store_swap (GTK_LIST_STORE (store), &iter, &iter_prev);
+ }
+
+ gtk_tree_path_free (treepath);
+ }
+ else /* move down */
+ {
+ GtkTreeIter iter_prev = iter;
+
+ if (gtk_tree_model_iter_next (store, &iter))
+ gtk_list_store_swap (GTK_LIST_STORE (store), &iter, &iter_prev);
+ }
 }
- }
 }
 
 
-void i_configure_ev_sflist_commit( gpointer sfont_lv )
+void i_configure_ev_sflist_commit (void * sfont_lv)
 {
- amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
- GtkTreeIter iter;
- GtkTreeModel *store = gtk_tree_view_get_model( GTK_TREE_VIEW(sfont_lv) );
- GString *sflist_string = g_string_new( "" );
-
- if ( gtk_tree_model_get_iter_first( GTK_TREE_MODEL(store) , &iter ) == TRUE )
- {
- gboolean iter_is_valid = FALSE;
- do
+ amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
+ GtkTreeIter iter;
+ GtkTreeModel * store = gtk_tree_view_get_model (GTK_TREE_VIEW (sfont_lv));
+ GString * sflist_string = g_string_new ("");
+
+ if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter) == TRUE)
 {
- gchar *fname;
- gtk_tree_model_get( GTK_TREE_MODEL(store) , &iter ,
- LISTSFONT_FILENAME_COLUMN , &fname , -1 );
- g_string_prepend_c( sflist_string , ';' );
- g_string_prepend( sflist_string , fname );
- g_free( fname );
- iter_is_valid = gtk_tree_model_iter_next( GTK_TREE_MODEL(store) , &iter );
+ bool_t iter_is_valid = FALSE;
+
+ do
+ {
+ char * fname;
+ gtk_tree_model_get (GTK_TREE_MODEL (store), &iter,
+ LISTSFONT_FILENAME_COLUMN, &fname, -1);
+ g_string_prepend_c (sflist_string, ';');
+ g_string_prepend (sflist_string, fname);
+ free (fname);
+ iter_is_valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter);
+ }
+ while (iter_is_valid == TRUE);
 }
- while ( iter_is_valid == TRUE );
- }
 
- if ( sflist_string->len > 0 )
- g_string_truncate( sflist_string , sflist_string->len - 1 );
+ if (sflist_string->len > 0)
+ g_string_truncate (sflist_string, sflist_string->len - 1);
 
- g_free( fsyncfg->fsyn_soundfont_file ); /* free previous */
- fsyncfg->fsyn_soundfont_file = g_strdup( sflist_string->str );
- g_string_free( sflist_string , TRUE );
+ free (fsyncfg->fsyn_soundfont_file); /* free previous */
+ fsyncfg->fsyn_soundfont_file = g_strdup (sflist_string->str);
+ g_string_free (sflist_string, TRUE);
 }
 
 
-void i_configure_ev_sfload_commit( gpointer sfload_radiobt )
+void i_configure_ev_sfload_commit (void * sfload_radiobt)
 {
- amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
- GSList *group = gtk_radio_button_get_group( GTK_RADIO_BUTTON(sfload_radiobt) );
- while ( group != NULL )
- {
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(group->data) ) )
- fsyncfg->fsyn_soundfont_load = GPOINTER_TO_INT(g_object_get_data( G_OBJECT(group->data) , "val" ));
- group = group->next;
- }
-}
+ amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
+ GSList * group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (sfload_radiobt));
 
+ while (group != NULL)
+ {
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (group->data)))
+ fsyncfg->fsyn_soundfont_load = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (group->data), "val"));
 
-void i_configure_ev_sygain_commit( gpointer gain_spinbt )
-{
- amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
- if (gtk_widget_get_sensitive (gain_spinbt))
- fsyncfg->fsyn_synth_gain = (gint)(gtk_spin_button_get_value(GTK_SPIN_BUTTON(gain_spinbt)) * 10);
- else
- fsyncfg->fsyn_synth_gain = -1;
+ group = group->next;
+ }
 }
 
 
-void i_configure_ev_sypoly_commit( gpointer poly_spinbt )
+void i_configure_ev_sygain_commit (void * gain_spinbt)
 {
- amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
- if (gtk_widget_get_sensitive (poly_spinbt))
- fsyncfg->fsyn_synth_polyphony = (gint)(gtk_spin_button_get_value(GTK_SPIN_BUTTON(poly_spinbt)));
- else
- fsyncfg->fsyn_synth_polyphony = -1;
+ amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
+
+ if (gtk_widget_get_sensitive (gain_spinbt))
+ fsyncfg->fsyn_synth_gain = (int) (gtk_spin_button_get_value (GTK_SPIN_BUTTON (gain_spinbt)) * 10);
+ else
+ fsyncfg->fsyn_synth_gain = -1;
 }
 
 
-void i_configure_ev_syreverb_commit( gpointer reverb_yes_radiobt )
+void i_configure_ev_sypoly_commit (void * poly_spinbt)
 {
- amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
- if (gtk_widget_get_sensitive (reverb_yes_radiobt))
- {
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(reverb_yes_radiobt) ) )
- fsyncfg->fsyn_synth_reverb = 1;
+ amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
+
+ if (gtk_widget_get_sensitive (poly_spinbt))
+ fsyncfg->fsyn_synth_polyphony = (int) (gtk_spin_button_get_value (GTK_SPIN_BUTTON (poly_spinbt)));
 else
- fsyncfg->fsyn_synth_reverb = 0;
- }
- else
- fsyncfg->fsyn_synth_reverb = -1;
+ fsyncfg->fsyn_synth_polyphony = -1;
 }
 
 
-void i_configure_ev_sychorus_commit( gpointer chorus_yes_radiobt )
+void i_configure_ev_syreverb_commit (void * reverb_yes_radiobt)
 {
- amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
- if (gtk_widget_get_sensitive (chorus_yes_radiobt))
- {
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(chorus_yes_radiobt) ) )
- fsyncfg->fsyn_synth_chorus = 1;
+ amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
+
+ if (gtk_widget_get_sensitive (reverb_yes_radiobt))
+ {
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (reverb_yes_radiobt)))
+ fsyncfg->fsyn_synth_reverb = 1;
+ else
+ fsyncfg->fsyn_synth_reverb = 0;
+ }
 else
- fsyncfg->fsyn_synth_chorus = 0;
- }
- else
- fsyncfg->fsyn_synth_chorus = -1;
+ fsyncfg->fsyn_synth_reverb = -1;
 }
 
 
-void i_configure_ev_sysamplerate_togglecustom( GtkToggleButton *custom_radiobt , gpointer custom_entry )
+void i_configure_ev_sychorus_commit (void * chorus_yes_radiobt)
 {
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(custom_radiobt) ) )
- gtk_widget_set_sensitive( GTK_WIDGET(custom_entry) , TRUE );
- else
- gtk_widget_set_sensitive( GTK_WIDGET(custom_entry) , FALSE );
+ amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
+
+ if (gtk_widget_get_sensitive (chorus_yes_radiobt))
+ {
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (chorus_yes_radiobt)))
+ fsyncfg->fsyn_synth_chorus = 1;
+ else
+ fsyncfg->fsyn_synth_chorus = 0;
+ }
+ else
+ fsyncfg->fsyn_synth_chorus = -1;
 }
 
 
-void i_configure_ev_sysamplerate_commit( gpointer samplerate_custom_radiobt )
+void i_configure_ev_sysamplerate_togglecustom (GtkToggleButton * custom_radiobt, void * custom_entry)
 {
- amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
- if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(samplerate_custom_radiobt)) )
- {
- GtkWidget *customentry = g_object_get_data( G_OBJECT(samplerate_custom_radiobt) , "customentry" );
- gint customvalue = strtol( gtk_entry_get_text(GTK_ENTRY(customentry)) , NULL , 10 );
- if (( customvalue > 22050 ) && ( customvalue < 96000 ))
- fsyncfg->fsyn_synth_samplerate = customvalue;
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (custom_radiobt)))
+ gtk_widget_set_sensitive (GTK_WIDGET (custom_entry), TRUE);
 else
- fsyncfg->fsyn_synth_samplerate = 44100;
- }
- else
- {
- GSList *group = gtk_radio_button_get_group( GTK_RADIO_BUTTON(samplerate_custom_radiobt) );
- while ( group != NULL )
- {
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(group->data) ) )
- fsyncfg->fsyn_synth_samplerate = GPOINTER_TO_INT(g_object_get_data( G_OBJECT(group->data) , "val" ));
- group = group->next;
- }
- }
+ gtk_widget_set_sensitive (GTK_WIDGET (custom_entry), FALSE);
 }
 
 
-void i_configure_gui_tab_fsyn( GtkWidget * fsyn_page_alignment ,
- gpointer backend_list_p ,
- gpointer commit_button )
+void i_configure_ev_sysamplerate_commit (void * samplerate_custom_radiobt)
 {
- GtkWidget * content_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
-
- if (1)
- {
- GtkWidget *soundfont_frame, *soundfont_vbox;
- GtkListStore *soundfont_file_store;
- GtkCellRenderer *soundfont_file_lv_text_rndr;
- GtkTreeViewColumn *soundfont_file_lv_fname_col, *soundfont_file_lv_fsize_col;
- GtkWidget *soundfont_file_hbox, *soundfont_file_lv, *soundfont_file_lv_sw;
- GtkTreeSelection *soundfont_file_lv_sel;
- GtkWidget *soundfont_file_bbox_vbox, *soundfont_file_bbox_addbt, *soundfont_file_bbox_rembt;
- GtkWidget *soundfont_file_bbox_mvupbt, *soundfont_file_bbox_mvdownbt;
- GtkWidget *soundfont_load_hbox, *soundfont_load_option[2];
- GtkWidget *synth_frame, *synth_hbox, *synth_leftcol_vbox, *synth_rightcol_vbox;
- GtkWidget *synth_samplerate_frame, *synth_samplerate_vbox, *synth_samplerate_option[4];
- GtkWidget *synth_samplerate_optionhbox, *synth_samplerate_optionentry, *synth_samplerate_optionlabel;
- GtkWidget *synth_gain_frame, *synth_gain_hbox, *synth_gain_value_hbox;
- GtkWidget *synth_gain_value_label, *synth_gain_value_spin, *synth_gain_defcheckbt;
- GtkWidget *synth_poly_frame, *synth_poly_hbox, *synth_poly_value_hbox;
- GtkWidget *synth_poly_value_label, *synth_poly_value_spin, *synth_poly_defcheckbt;
- GtkWidget *synth_reverb_frame, *synth_reverb_hbox, *synth_reverb_value_hbox;
- GtkWidget *synth_reverb_value_option[2], *synth_reverb_defcheckbt;
- GtkWidget *synth_chorus_frame, *synth_chorus_hbox, *synth_chorus_value_hbox;
- GtkWidget *synth_chorus_value_option[2], *synth_chorus_defcheckbt;
-
 amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
 
- /* soundfont settings */
- soundfont_frame = gtk_frame_new( _("SoundFont settings") );
- soundfont_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2 );
- gtk_container_set_border_width( GTK_CONTAINER(soundfont_vbox), 4 );
- gtk_container_add( GTK_CONTAINER(soundfont_frame) , soundfont_vbox );
- /* soundfont settings - soundfont files - listview */
- soundfont_file_store = gtk_list_store_new( LISTSFONT_N_COLUMNS, G_TYPE_STRING , G_TYPE_INT );
- if ( strlen(fsyncfg->fsyn_soundfont_file) > 0 )
- {
- /* fill soundfont list with fsyn_soundfont_file information */
- gchar **sffiles = g_strsplit( fsyncfg->fsyn_soundfont_file , ";" , 0 );
- GtkTreeIter iter;
- gint i = 0;
- while ( sffiles[i] != NULL )
- {
- gint filesize = -1;
- struct stat finfo;
- if ( g_stat( sffiles[i] , &finfo ) == 0 )
- filesize = finfo.st_size;
- gtk_list_store_prepend( GTK_LIST_STORE(soundfont_file_store) , &iter );
- gtk_list_store_set( GTK_LIST_STORE(soundfont_file_store) , &iter ,
- LISTSFONT_FILENAME_COLUMN , sffiles[i] ,
- LISTSFONT_FILESIZE_COLUMN , filesize , -1 );
- i++;
- }
- g_strfreev( sffiles );
- }
- soundfont_file_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2 );
- soundfont_file_lv = gtk_tree_view_new_with_model( GTK_TREE_MODEL(soundfont_file_store) );
- gtk_tree_view_set_rules_hint( GTK_TREE_VIEW(soundfont_file_lv), TRUE );
- g_object_unref( soundfont_file_store );
- soundfont_file_lv_text_rndr = gtk_cell_renderer_text_new();
- soundfont_file_lv_fname_col = gtk_tree_view_column_new_with_attributes(
- _("Filename") , soundfont_file_lv_text_rndr , "text" ,
- LISTSFONT_FILENAME_COLUMN, NULL );
- gtk_tree_view_column_set_expand( GTK_TREE_VIEW_COLUMN(soundfont_file_lv_fname_col) , TRUE );
- soundfont_file_lv_fsize_col = gtk_tree_view_column_new_with_attributes(
- _("Size (bytes)") , soundfont_file_lv_text_rndr , "text" ,
- LISTSFONT_FILESIZE_COLUMN, NULL );
- gtk_tree_view_column_set_expand( GTK_TREE_VIEW_COLUMN(soundfont_file_lv_fsize_col) , FALSE );
- gtk_tree_view_append_column( GTK_TREE_VIEW(soundfont_file_lv), soundfont_file_lv_fname_col );
- gtk_tree_view_append_column( GTK_TREE_VIEW(soundfont_file_lv), soundfont_file_lv_fsize_col );
- soundfont_file_lv_sel = gtk_tree_view_get_selection( GTK_TREE_VIEW(soundfont_file_lv) );
- gtk_tree_selection_set_mode( GTK_TREE_SELECTION(soundfont_file_lv_sel) , GTK_SELECTION_SINGLE );
-
- soundfont_file_lv_sw = gtk_scrolled_window_new( NULL , NULL );
- gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) soundfont_file_lv_sw, GTK_SHADOW_IN);
- gtk_scrolled_window_set_policy ((GtkScrolledWindow *) soundfont_file_lv_sw,
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_container_add( GTK_CONTAINER(soundfont_file_lv_sw) , soundfont_file_lv );
-
- /* soundfont settings - soundfont files - buttonbox */
- soundfont_file_bbox_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0 );
- soundfont_file_bbox_addbt = gtk_button_new();
- gtk_button_set_image( GTK_BUTTON(soundfont_file_bbox_addbt) ,
- gtk_image_new_from_stock( GTK_STOCK_ADD , GTK_ICON_SIZE_MENU ) );
- g_signal_connect_swapped( G_OBJECT(soundfont_file_bbox_addbt) , "clicked" ,
- G_CALLBACK(i_configure_ev_sflist_add) , soundfont_file_lv );
- gtk_box_pack_start( GTK_BOX(soundfont_file_bbox_vbox) , soundfont_file_bbox_addbt , FALSE , FALSE , 0 );
- soundfont_file_bbox_rembt = gtk_button_new();
- gtk_button_set_image( GTK_BUTTON(soundfont_file_bbox_rembt) ,
- gtk_image_new_from_stock( GTK_STOCK_REMOVE , GTK_ICON_SIZE_MENU ) );
- g_signal_connect_swapped( G_OBJECT(soundfont_file_bbox_rembt) , "clicked" ,
- G_CALLBACK(i_configure_ev_sflist_rem) , soundfont_file_lv );
- gtk_box_pack_start( GTK_BOX(soundfont_file_bbox_vbox) , soundfont_file_bbox_rembt , FALSE , FALSE , 0 );
- soundfont_file_bbox_mvupbt = gtk_button_new();
- gtk_button_set_image( GTK_BUTTON(soundfont_file_bbox_mvupbt) ,
- gtk_image_new_from_stock( GTK_STOCK_GO_UP , GTK_ICON_SIZE_MENU ) );
- g_object_set_data( G_OBJECT(soundfont_file_bbox_mvupbt) , "swapdire" , GUINT_TO_POINTER(0) );
- g_signal_connect( G_OBJECT(soundfont_file_bbox_mvupbt) , "clicked" ,
- G_CALLBACK(i_configure_ev_sflist_swap) , soundfont_file_lv );
- gtk_box_pack_start( GTK_BOX(soundfont_file_bbox_vbox) , soundfont_file_bbox_mvupbt , FALSE , FALSE , 0 );
- soundfont_file_bbox_mvdownbt = gtk_button_new();
- gtk_button_set_image( GTK_BUTTON(soundfont_file_bbox_mvdownbt) ,
- gtk_image_new_from_stock( GTK_STOCK_GO_DOWN , GTK_ICON_SIZE_MENU ) );
- g_object_set_data( G_OBJECT(soundfont_file_bbox_mvdownbt) , "swapdire" , GUINT_TO_POINTER(1) );
- g_signal_connect( G_OBJECT(soundfont_file_bbox_mvdownbt) , "clicked" ,
- G_CALLBACK(i_configure_ev_sflist_swap) , soundfont_file_lv );
- gtk_box_pack_start( GTK_BOX(soundfont_file_bbox_vbox) , soundfont_file_bbox_mvdownbt , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(soundfont_file_hbox) , soundfont_file_lv_sw , TRUE , TRUE , 0 );
- gtk_box_pack_start( GTK_BOX(soundfont_file_hbox) , soundfont_file_bbox_vbox , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(soundfont_vbox) , soundfont_file_hbox , FALSE , FALSE , 0 );
-
- /* soundfont settings - load */
- soundfont_load_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
- soundfont_load_option[0] = gtk_radio_button_new_with_label( NULL ,
- _("Load SF on player start") );
- g_object_set_data( G_OBJECT(soundfont_load_option[0]) , "val" , GINT_TO_POINTER(0) );
- soundfont_load_option[1] = gtk_radio_button_new_with_label_from_widget(
- GTK_RADIO_BUTTON(soundfont_load_option[0]) ,
- _("Load SF on first MIDI file play") );
- g_object_set_data( G_OBJECT(soundfont_load_option[1]) , "val" , GINT_TO_POINTER(1) );
- if ( fsyncfg->fsyn_soundfont_load == 0 )
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(soundfont_load_option[0]) , TRUE );
- else
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(soundfont_load_option[1]) , TRUE );
- gtk_box_pack_start( GTK_BOX(soundfont_load_hbox) , soundfont_load_option[0] , TRUE , TRUE , 0 );
- gtk_box_pack_start( GTK_BOX(soundfont_load_hbox) , soundfont_load_option[1] , TRUE , TRUE , 0 );
- gtk_box_pack_start( GTK_BOX(soundfont_vbox) , soundfont_load_hbox , FALSE , FALSE , 0 );
-
- gtk_box_pack_start( GTK_BOX(content_vbox) , soundfont_frame , FALSE , FALSE , 0 );
-
- /* synth settings */
- synth_frame = gtk_frame_new( _("Synthesizer settings") );
- synth_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4 );
- gtk_container_set_border_width( GTK_CONTAINER(synth_hbox), 4 );
- gtk_container_add( GTK_CONTAINER(synth_frame) , synth_hbox );
- synth_leftcol_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0 );
- synth_rightcol_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0 );
- gtk_box_pack_start( GTK_BOX(synth_hbox) , synth_leftcol_vbox , TRUE , TRUE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_hbox) , synth_rightcol_vbox , FALSE , FALSE , 0 );
- /* synth settings - gain */
- synth_gain_frame = gtk_frame_new( _("gain") );
- gtk_frame_set_label_align( GTK_FRAME(synth_gain_frame) , 0.5 , 0.5 );
- gtk_box_pack_start( GTK_BOX(synth_leftcol_vbox) , synth_gain_frame , TRUE , TRUE , 0 );
- synth_gain_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2 );
- gtk_container_set_border_width( GTK_CONTAINER(synth_gain_hbox), 2 );
- gtk_container_add( GTK_CONTAINER(synth_gain_frame) , synth_gain_hbox );
- synth_gain_defcheckbt = gtk_check_button_new_with_label( _("use default") );
- gtk_box_pack_start( GTK_BOX(synth_gain_hbox) , synth_gain_defcheckbt , FALSE , FALSE , 0 );
- synth_gain_value_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4 );
- synth_gain_value_label = gtk_label_new( _("value:") );
- synth_gain_value_spin = gtk_spin_button_new_with_range( 0.0 , 10.0 , 0.1 );
- gtk_spin_button_set_value( GTK_SPIN_BUTTON(synth_gain_value_spin) , 0.2 );
- g_signal_connect( G_OBJECT(synth_gain_defcheckbt) , "toggled" ,
- G_CALLBACK(i_configure_ev_toggle_default) , synth_gain_value_hbox );
- if ( fsyncfg->fsyn_synth_gain < 0 )
- {
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_gain_defcheckbt) , TRUE );
- }
- else
- {
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_gain_defcheckbt) , FALSE );
- gtk_spin_button_set_value( GTK_SPIN_BUTTON(synth_gain_value_spin) ,
- (gdouble)fsyncfg->fsyn_synth_gain / 10 );
- }
- gtk_box_pack_start( GTK_BOX(synth_gain_hbox) , synth_gain_value_hbox , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_gain_value_hbox) , synth_gain_value_label , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_gain_value_hbox) , synth_gain_value_spin , FALSE , FALSE , 0 );
- /* synth settings - polyphony */
- synth_poly_frame = gtk_frame_new( _("polyphony") );
- gtk_frame_set_label_align( GTK_FRAME(synth_poly_frame) , 0.5 , 0.5 );
- gtk_box_pack_start( GTK_BOX(synth_leftcol_vbox) , synth_poly_frame , TRUE , TRUE , 0 );
- synth_poly_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2 );
- gtk_container_set_border_width( GTK_CONTAINER(synth_poly_hbox), 2 );
- gtk_container_add( GTK_CONTAINER(synth_poly_frame) , synth_poly_hbox );
- synth_poly_defcheckbt = gtk_check_button_new_with_label( _("use default") );
- gtk_box_pack_start( GTK_BOX(synth_poly_hbox) , synth_poly_defcheckbt , FALSE , FALSE , 0 );
- synth_poly_value_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4 );
- synth_poly_value_label = gtk_label_new( _("value:") );
- synth_poly_value_spin = gtk_spin_button_new_with_range( 16 , 4096 , 1 );
- gtk_spin_button_set_value( GTK_SPIN_BUTTON(synth_poly_value_spin) , 256 );
- g_signal_connect( G_OBJECT(synth_poly_defcheckbt) , "toggled" ,
- G_CALLBACK(i_configure_ev_toggle_default) , synth_poly_value_hbox );
- if ( fsyncfg->fsyn_synth_polyphony < 0 )
- {
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_poly_defcheckbt) , TRUE );
- }
- else
- {
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_poly_defcheckbt) , FALSE );
- gtk_spin_button_set_value( GTK_SPIN_BUTTON(synth_poly_value_spin) ,
- (gdouble)fsyncfg->fsyn_synth_polyphony );
- }
- gtk_box_pack_start( GTK_BOX(synth_poly_hbox) , synth_poly_value_hbox , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_poly_value_hbox) , synth_poly_value_label , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_poly_value_hbox) , synth_poly_value_spin , FALSE , FALSE , 0 );
- /* synth settings - reverb */
- synth_reverb_frame = gtk_frame_new( _("reverb") );
- gtk_frame_set_label_align( GTK_FRAME(synth_reverb_frame) , 0.5 , 0.5 );
- gtk_box_pack_start( GTK_BOX(synth_leftcol_vbox) , synth_reverb_frame , TRUE , TRUE , 0 );
- synth_reverb_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2 );
- gtk_container_set_border_width( GTK_CONTAINER(synth_reverb_hbox), 2 );
- gtk_container_add( GTK_CONTAINER(synth_reverb_frame) , synth_reverb_hbox );
- synth_reverb_defcheckbt = gtk_check_button_new_with_label( _("use default") );
- gtk_box_pack_start( GTK_BOX(synth_reverb_hbox) , synth_reverb_defcheckbt , FALSE , FALSE , 0 );
- synth_reverb_value_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4 );
- synth_reverb_value_option[0] = gtk_radio_button_new_with_label( NULL , _("yes") );
- synth_reverb_value_option[1] = gtk_radio_button_new_with_label_from_widget(
- GTK_RADIO_BUTTON(synth_reverb_value_option[0]) , _("no") );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_reverb_value_option[0]) , TRUE );
- g_signal_connect( G_OBJECT(synth_reverb_defcheckbt) , "toggled" ,
- G_CALLBACK(i_configure_ev_toggle_default) , synth_reverb_value_hbox );
- if ( fsyncfg->fsyn_synth_reverb < 0 )
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (samplerate_custom_radiobt)))
 {
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_reverb_defcheckbt) , TRUE );
- }
- else
- {
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_reverb_defcheckbt) , FALSE );
- if ( fsyncfg->fsyn_synth_reverb == 0 )
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_reverb_value_option[1]) , TRUE );
- else
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_reverb_value_option[0]) , TRUE );
- }
- gtk_box_pack_start( GTK_BOX(synth_reverb_hbox) , synth_reverb_value_hbox , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_reverb_value_hbox) , synth_reverb_value_option[0] , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_reverb_value_hbox) , synth_reverb_value_option[1] , FALSE , FALSE , 0 );
- /* synth settings - chorus */
- synth_chorus_frame = gtk_frame_new( _("chorus") );
- gtk_frame_set_label_align( GTK_FRAME(synth_chorus_frame) , 0.5 , 0.5 );
- gtk_box_pack_start( GTK_BOX(synth_leftcol_vbox) , synth_chorus_frame , TRUE , TRUE , 0 );
- synth_chorus_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2 );
- gtk_container_set_border_width( GTK_CONTAINER(synth_chorus_hbox), 2 );
- gtk_container_add( GTK_CONTAINER(synth_chorus_frame) , synth_chorus_hbox );
- synth_chorus_defcheckbt = gtk_check_button_new_with_label( _("use default") );
- gtk_box_pack_start( GTK_BOX(synth_chorus_hbox) , synth_chorus_defcheckbt , FALSE , FALSE , 0 );
- synth_chorus_value_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4 );
- synth_chorus_value_option[0] = gtk_radio_button_new_with_label( NULL , _("yes") );
- synth_chorus_value_option[1] = gtk_radio_button_new_with_label_from_widget(
- GTK_RADIO_BUTTON(synth_chorus_value_option[0]) , _("no") );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_chorus_value_option[0]) , TRUE );
- g_signal_connect( G_OBJECT(synth_chorus_defcheckbt) , "toggled" ,
- G_CALLBACK(i_configure_ev_toggle_default) , synth_chorus_value_hbox );
- if ( fsyncfg->fsyn_synth_chorus < 0 )
- {
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_chorus_defcheckbt) , TRUE );
+ GtkWidget * customentry = g_object_get_data (G_OBJECT (samplerate_custom_radiobt), "customentry");
+ int customvalue = strtol (gtk_entry_get_text (GTK_ENTRY (customentry)), NULL, 10);
+
+ if ((customvalue > 22050) && (customvalue < 96000))
+ fsyncfg->fsyn_synth_samplerate = customvalue;
+ else
+ fsyncfg->fsyn_synth_samplerate = 44100;
 }
 else
 {
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_chorus_defcheckbt) , FALSE );
- if ( fsyncfg->fsyn_synth_chorus == 0 )
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_chorus_value_option[1]) , TRUE );
- else
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_chorus_value_option[0]) , TRUE );
- }
- gtk_box_pack_start( GTK_BOX(synth_chorus_hbox) , synth_chorus_value_hbox , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_chorus_value_hbox) , synth_chorus_value_option[0] , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_chorus_value_hbox) , synth_chorus_value_option[1] , FALSE , FALSE , 0 );
- /* synth settings - samplerate */
- synth_samplerate_frame = gtk_frame_new( _("sample rate") );
- gtk_frame_set_label_align( GTK_FRAME(synth_samplerate_frame) , 0.5 , 0.5 );
- synth_samplerate_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0 );
- gtk_container_set_border_width( GTK_CONTAINER(synth_samplerate_vbox), 6 );
- gtk_container_add( GTK_CONTAINER(synth_samplerate_frame) , synth_samplerate_vbox );
- gtk_box_pack_start( GTK_BOX(synth_rightcol_vbox) , synth_samplerate_frame , FALSE , FALSE , 0 );
- synth_samplerate_option[0] = gtk_radio_button_new_with_label( NULL , _("22050 Hz ") );
- g_object_set_data( G_OBJECT(synth_samplerate_option[0]) , "val" , GINT_TO_POINTER(22050) );
- synth_samplerate_option[1] = gtk_radio_button_new_with_label_from_widget(
- GTK_RADIO_BUTTON(synth_samplerate_option[0]) , _("44100 Hz ") );
- g_object_set_data( G_OBJECT(synth_samplerate_option[1]) , "val" , GINT_TO_POINTER(44100) );
- synth_samplerate_option[2] = gtk_radio_button_new_with_label_from_widget(
- GTK_RADIO_BUTTON(synth_samplerate_option[0]) , _("96000 Hz ") );
- g_object_set_data( G_OBJECT(synth_samplerate_option[2]) , "val" , GINT_TO_POINTER(96000) );
- synth_samplerate_option[3] = gtk_radio_button_new_with_label_from_widget(
- GTK_RADIO_BUTTON(synth_samplerate_option[0]) , _("custom ") );
- synth_samplerate_optionhbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4 );
- synth_samplerate_optionentry = gtk_entry_new();
- gtk_widget_set_sensitive( GTK_WIDGET(synth_samplerate_optionentry) , FALSE );
- gtk_entry_set_width_chars( GTK_ENTRY(synth_samplerate_optionentry) , 8 );
- gtk_entry_set_max_length( GTK_ENTRY(synth_samplerate_optionentry) , 5 );
- g_object_set_data( G_OBJECT(synth_samplerate_option[3]) , "customentry" , synth_samplerate_optionentry );
- g_signal_connect( G_OBJECT(synth_samplerate_option[3]) , "toggled" ,
- G_CALLBACK(i_configure_ev_sysamplerate_togglecustom) , synth_samplerate_optionentry );
- synth_samplerate_optionlabel = gtk_label_new( _("Hz ") );
- gtk_box_pack_start( GTK_BOX(synth_samplerate_optionhbox) , synth_samplerate_optionentry , TRUE , TRUE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_samplerate_optionhbox) , synth_samplerate_optionlabel , FALSE , FALSE , 0 );
- switch ( fsyncfg->fsyn_synth_samplerate )
- {
- case 22050:
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_samplerate_option[0]) , TRUE );
- break;
- case 44100:
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_samplerate_option[1]) , TRUE );
- break;
- case 96000:
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_samplerate_option[2]) , TRUE );
- break;
- default:
- if (( fsyncfg->fsyn_synth_samplerate > 22050 ) && ( fsyncfg->fsyn_synth_samplerate < 96000 ))
+ GSList * group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (samplerate_custom_radiobt));
+
+ while (group != NULL)
 {
- gchar *samplerate_value = g_strdup_printf( "%i" , fsyncfg->fsyn_synth_samplerate );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_samplerate_option[3]) , TRUE );
- gtk_entry_set_text( GTK_ENTRY(synth_samplerate_optionentry) , samplerate_value );
- g_free( samplerate_value );
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (group->data)))
+ fsyncfg->fsyn_synth_samplerate = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (group->data), "val"));
+
+ group = group->next;
 }
- else
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(synth_samplerate_option[1]) , TRUE );
 }
- gtk_box_pack_start( GTK_BOX(synth_samplerate_vbox) , synth_samplerate_option[0] , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_samplerate_vbox) , synth_samplerate_option[1] , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_samplerate_vbox) , synth_samplerate_option[2] , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_samplerate_vbox) , synth_samplerate_option[3] , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(synth_samplerate_vbox) , synth_samplerate_optionhbox , FALSE , FALSE , 0 );
-
- gtk_box_pack_start( GTK_BOX(content_vbox) , synth_frame , TRUE , TRUE , 0 );
-
- /* commit events */
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_sflist_commit) , soundfont_file_lv );
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_sfload_commit) , soundfont_load_option[0] );
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_sygain_commit) , synth_gain_value_spin );
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_sypoly_commit) , synth_poly_value_spin );
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_syreverb_commit) , synth_reverb_value_option[0] );
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_sychorus_commit) , synth_chorus_value_option[0] );
- g_signal_connect_swapped( G_OBJECT(commit_button) , "ap-commit" ,
- G_CALLBACK(i_configure_ev_sysamplerate_commit) , synth_samplerate_option[3] );
- }
-
- gtk_container_add ((GtkContainer *) fsyn_page_alignment, content_vbox);
 }
 
 
-void i_configure_gui_tablabel_fsyn( GtkWidget * fsyn_page_alignment ,
- gpointer backend_list_p ,
- gpointer commit_button )
+void i_configure_gui_tab_fsyn (GtkWidget * fsyn_page_alignment,
+ void * backend_list_p,
+ void * commit_button)
 {
- GtkWidget *pagelabel_vbox, *pagelabel_image, *pagelabel_label;
- GdkPixbuf *pagelabel_image_pix;
- pagelabel_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1 );
- pagelabel_image_pix = gdk_pixbuf_new_from_xpm_data( (const gchar **)backend_fluidsynth_icon_xpm );
- pagelabel_image = gtk_image_new_from_pixbuf( pagelabel_image_pix ); g_object_unref( pagelabel_image_pix );
- pagelabel_label = gtk_label_new( "" );
- gtk_label_set_markup( GTK_LABEL(pagelabel_label) , _("FluidSynth\nbackend") );
- gtk_label_set_justify( GTK_LABEL(pagelabel_label) , GTK_JUSTIFY_CENTER );
- gtk_box_pack_start( GTK_BOX(pagelabel_vbox) , pagelabel_image , FALSE , FALSE , 1 );
- gtk_box_pack_start( GTK_BOX(pagelabel_vbox) , pagelabel_label , FALSE , FALSE , 1 );
- gtk_container_add( GTK_CONTAINER(fsyn_page_alignment) , pagelabel_vbox );
- gtk_widget_show_all( fsyn_page_alignment );
- return;
+ GtkWidget * content_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+
+ if (1)
+ {
+ GtkWidget * soundfont_frame, *soundfont_vbox;
+ GtkListStore * soundfont_file_store;
+ GtkCellRenderer * soundfont_file_lv_text_rndr;
+ GtkTreeViewColumn * soundfont_file_lv_fname_col, *soundfont_file_lv_fsize_col;
+ GtkWidget * soundfont_file_hbox, *soundfont_file_lv, *soundfont_file_lv_sw;
+ GtkTreeSelection * soundfont_file_lv_sel;
+ GtkWidget * soundfont_file_bbox_vbox, *soundfont_file_bbox_addbt, *soundfont_file_bbox_rembt;
+ GtkWidget * soundfont_file_bbox_mvupbt, *soundfont_file_bbox_mvdownbt;
+ GtkWidget * soundfont_load_hbox, *soundfont_load_option[2];
+ GtkWidget * synth_frame, *synth_hbox, *synth_leftcol_vbox, *synth_rightcol_vbox;
+ GtkWidget * synth_samplerate_frame, *synth_samplerate_vbox, *synth_samplerate_option[4];
+ GtkWidget * synth_samplerate_optionhbox, *synth_samplerate_optionentry, *synth_samplerate_optionlabel;
+ GtkWidget * synth_gain_frame, *synth_gain_hbox, *synth_gain_value_hbox;
+ GtkWidget * synth_gain_value_label, *synth_gain_value_spin, *synth_gain_defcheckbt;
+ GtkWidget * synth_poly_frame, *synth_poly_hbox, *synth_poly_value_hbox;
+ GtkWidget * synth_poly_value_label, *synth_poly_value_spin, *synth_poly_defcheckbt;
+ GtkWidget * synth_reverb_frame, *synth_reverb_hbox, *synth_reverb_value_hbox;
+ GtkWidget * synth_reverb_value_option[2], *synth_reverb_defcheckbt;
+ GtkWidget * synth_chorus_frame, *synth_chorus_hbox, *synth_chorus_value_hbox;
+ GtkWidget * synth_chorus_value_option[2], *synth_chorus_defcheckbt;
+
+ amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
+
+ /* soundfont settings */
+ soundfont_frame = gtk_frame_new (_("SoundFont settings"));
+ soundfont_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+ gtk_container_set_border_width (GTK_CONTAINER (soundfont_vbox), 4);
+ gtk_container_add (GTK_CONTAINER (soundfont_frame), soundfont_vbox);
+ /* soundfont settings - soundfont files - listview */
+ soundfont_file_store = gtk_list_store_new (LISTSFONT_N_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
+
+ if (strlen (fsyncfg->fsyn_soundfont_file) > 0)
+ {
+ /* fill soundfont list with fsyn_soundfont_file information */
+ char ** sffiles = g_strsplit (fsyncfg->fsyn_soundfont_file, ";", 0);
+ GtkTreeIter iter;
+ int i = 0;
+
+ while (sffiles[i] != NULL)
+ {
+ int filesize = -1;
+ struct stat finfo;
+
+ if (stat (sffiles[i], &finfo) == 0)
+ filesize = finfo.st_size;
+
+ gtk_list_store_prepend (GTK_LIST_STORE (soundfont_file_store), &iter);
+ gtk_list_store_set (GTK_LIST_STORE (soundfont_file_store), &iter,
+ LISTSFONT_FILENAME_COLUMN, sffiles[i],
+ LISTSFONT_FILESIZE_COLUMN, filesize, -1);
+ i++;
+ }
+
+ g_strfreev (sffiles);
+ }
+
+ soundfont_file_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ soundfont_file_lv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (soundfont_file_store));
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (soundfont_file_lv), TRUE);
+ g_object_unref (soundfont_file_store);
+ soundfont_file_lv_text_rndr = gtk_cell_renderer_text_new();
+ soundfont_file_lv_fname_col = gtk_tree_view_column_new_with_attributes (
+ _("Filename"), soundfont_file_lv_text_rndr, "text",
+ LISTSFONT_FILENAME_COLUMN, NULL);
+ gtk_tree_view_column_set_expand (GTK_TREE_VIEW_COLUMN (soundfont_file_lv_fname_col), TRUE);
+ soundfont_file_lv_fsize_col = gtk_tree_view_column_new_with_attributes (
+ _("Size (bytes)"), soundfont_file_lv_text_rndr, "text",
+ LISTSFONT_FILESIZE_COLUMN, NULL);
+ gtk_tree_view_column_set_expand (GTK_TREE_VIEW_COLUMN (soundfont_file_lv_fsize_col), FALSE);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (soundfont_file_lv), soundfont_file_lv_fname_col);
+ gtk_tree_view_append_column (GTK_TREE_VIEW (soundfont_file_lv), soundfont_file_lv_fsize_col);
+ soundfont_file_lv_sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (soundfont_file_lv));
+ gtk_tree_selection_set_mode (GTK_TREE_SELECTION (soundfont_file_lv_sel), GTK_SELECTION_SINGLE);
+
+ soundfont_file_lv_sw = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) soundfont_file_lv_sw, GTK_SHADOW_IN);
+ gtk_scrolled_window_set_policy ((GtkScrolledWindow *) soundfont_file_lv_sw,
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ gtk_container_add (GTK_CONTAINER (soundfont_file_lv_sw), soundfont_file_lv);
+
+ /* soundfont settings - soundfont files - buttonbox */
+ soundfont_file_bbox_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ soundfont_file_bbox_addbt = gtk_button_new();
+ gtk_button_set_image (GTK_BUTTON (soundfont_file_bbox_addbt),
+ gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_MENU));
+ g_signal_connect_swapped (G_OBJECT (soundfont_file_bbox_addbt), "clicked",
+ G_CALLBACK (i_configure_ev_sflist_add), soundfont_file_lv);
+ gtk_box_pack_start (GTK_BOX (soundfont_file_bbox_vbox), soundfont_file_bbox_addbt, FALSE, FALSE, 0);
+ soundfont_file_bbox_rembt = gtk_button_new();
+ gtk_button_set_image (GTK_BUTTON (soundfont_file_bbox_rembt),
+ gtk_image_new_from_stock (GTK_STOCK_REMOVE, GTK_ICON_SIZE_MENU));
+ g_signal_connect_swapped (G_OBJECT (soundfont_file_bbox_rembt), "clicked",
+ G_CALLBACK (i_configure_ev_sflist_rem), soundfont_file_lv);
+ gtk_box_pack_start (GTK_BOX (soundfont_file_bbox_vbox), soundfont_file_bbox_rembt, FALSE, FALSE, 0);
+ soundfont_file_bbox_mvupbt = gtk_button_new();
+ gtk_button_set_image (GTK_BUTTON (soundfont_file_bbox_mvupbt),
+ gtk_image_new_from_stock (GTK_STOCK_GO_UP, GTK_ICON_SIZE_MENU));
+ g_object_set_data (G_OBJECT (soundfont_file_bbox_mvupbt), "swapdire", GUINT_TO_POINTER (0));
+ g_signal_connect (G_OBJECT (soundfont_file_bbox_mvupbt), "clicked",
+ G_CALLBACK (i_configure_ev_sflist_swap), soundfont_file_lv);
+ gtk_box_pack_start (GTK_BOX (soundfont_file_bbox_vbox), soundfont_file_bbox_mvupbt, FALSE, FALSE, 0);
+ soundfont_file_bbox_mvdownbt = gtk_button_new();
+ gtk_button_set_image (GTK_BUTTON (soundfont_file_bbox_mvdownbt),
+ gtk_image_new_from_stock (GTK_STOCK_GO_DOWN, GTK_ICON_SIZE_MENU));
+ g_object_set_data (G_OBJECT (soundfont_file_bbox_mvdownbt), "swapdire", GUINT_TO_POINTER (1));
+ g_signal_connect (G_OBJECT (soundfont_file_bbox_mvdownbt), "clicked",
+ G_CALLBACK (i_configure_ev_sflist_swap), soundfont_file_lv);
+ gtk_box_pack_start (GTK_BOX (soundfont_file_bbox_vbox), soundfont_file_bbox_mvdownbt, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (soundfont_file_hbox), soundfont_file_lv_sw, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (soundfont_file_hbox), soundfont_file_bbox_vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (soundfont_vbox), soundfont_file_hbox, FALSE, FALSE, 0);
+
+ /* soundfont settings - load */
+ soundfont_load_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+ soundfont_load_option[0] = gtk_radio_button_new_with_label (NULL,
+ _("Load SF on player start"));
+ g_object_set_data (G_OBJECT (soundfont_load_option[0]), "val", GINT_TO_POINTER (0));
+ soundfont_load_option[1] = gtk_radio_button_new_with_label_from_widget (
+ GTK_RADIO_BUTTON (soundfont_load_option[0]),
+ _("Load SF on first MIDI file play"));
+ g_object_set_data (G_OBJECT (soundfont_load_option[1]), "val", GINT_TO_POINTER (1));
+
+ if (fsyncfg->fsyn_soundfont_load == 0)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (soundfont_load_option[0]), TRUE);
+ else
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (soundfont_load_option[1]), TRUE);
+
+ gtk_box_pack_start (GTK_BOX (soundfont_load_hbox), soundfont_load_option[0], TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (soundfont_load_hbox), soundfont_load_option[1], TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (soundfont_vbox), soundfont_load_hbox, FALSE, FALSE, 0);
+
+ gtk_box_pack_start (GTK_BOX (content_vbox), soundfont_frame, FALSE, FALSE, 0);
+
+ /* synth settings */
+ synth_frame = gtk_frame_new (_("Synthesizer settings"));
+ synth_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+ gtk_container_set_border_width (GTK_CONTAINER (synth_hbox), 4);
+ gtk_container_add (GTK_CONTAINER (synth_frame), synth_hbox);
+ synth_leftcol_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ synth_rightcol_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_box_pack_start (GTK_BOX (synth_hbox), synth_leftcol_vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_hbox), synth_rightcol_vbox, FALSE, FALSE, 0);
+ /* synth settings - gain */
+ synth_gain_frame = gtk_frame_new (_("gain"));
+ gtk_frame_set_label_align (GTK_FRAME (synth_gain_frame), 0.5, 0.5);
+ gtk_box_pack_start (GTK_BOX (synth_leftcol_vbox), synth_gain_frame, TRUE, TRUE, 0);
+ synth_gain_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ gtk_container_set_border_width (GTK_CONTAINER (synth_gain_hbox), 2);
+ gtk_container_add (GTK_CONTAINER (synth_gain_frame), synth_gain_hbox);
+ synth_gain_defcheckbt = gtk_check_button_new_with_label (_("use default"));
+ gtk_box_pack_start (GTK_BOX (synth_gain_hbox), synth_gain_defcheckbt, FALSE, FALSE, 0);
+ synth_gain_value_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+ synth_gain_value_label = gtk_label_new (_("value:"));
+ synth_gain_value_spin = gtk_spin_button_new_with_range (0.0, 10.0, 0.1);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (synth_gain_value_spin), 0.2);
+ g_signal_connect (G_OBJECT (synth_gain_defcheckbt), "toggled",
+ G_CALLBACK (i_configure_ev_toggle_default), synth_gain_value_hbox);
+
+ if (fsyncfg->fsyn_synth_gain < 0)
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_gain_defcheckbt), TRUE);
+ }
+ else
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_gain_defcheckbt), FALSE);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (synth_gain_value_spin),
+ (gdouble) fsyncfg->fsyn_synth_gain / 10);
+ }
+
+ gtk_box_pack_start (GTK_BOX (synth_gain_hbox), synth_gain_value_hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_gain_value_hbox), synth_gain_value_label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_gain_value_hbox), synth_gain_value_spin, FALSE, FALSE, 0);
+ /* synth settings - polyphony */
+ synth_poly_frame = gtk_frame_new (_("polyphony"));
+ gtk_frame_set_label_align (GTK_FRAME (synth_poly_frame), 0.5, 0.5);
+ gtk_box_pack_start (GTK_BOX (synth_leftcol_vbox), synth_poly_frame, TRUE, TRUE, 0);
+ synth_poly_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ gtk_container_set_border_width (GTK_CONTAINER (synth_poly_hbox), 2);
+ gtk_container_add (GTK_CONTAINER (synth_poly_frame), synth_poly_hbox);
+ synth_poly_defcheckbt = gtk_check_button_new_with_label (_("use default"));
+ gtk_box_pack_start (GTK_BOX (synth_poly_hbox), synth_poly_defcheckbt, FALSE, FALSE, 0);
+ synth_poly_value_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+ synth_poly_value_label = gtk_label_new (_("value:"));
+ synth_poly_value_spin = gtk_spin_button_new_with_range (16, 4096, 1);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (synth_poly_value_spin), 256);
+ g_signal_connect (G_OBJECT (synth_poly_defcheckbt), "toggled",
+ G_CALLBACK (i_configure_ev_toggle_default), synth_poly_value_hbox);
+
+ if (fsyncfg->fsyn_synth_polyphony < 0)
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_poly_defcheckbt), TRUE);
+ }
+ else
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_poly_defcheckbt), FALSE);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (synth_poly_value_spin),
+ (gdouble) fsyncfg->fsyn_synth_polyphony);
+ }
+
+ gtk_box_pack_start (GTK_BOX (synth_poly_hbox), synth_poly_value_hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_poly_value_hbox), synth_poly_value_label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_poly_value_hbox), synth_poly_value_spin, FALSE, FALSE, 0);
+ /* synth settings - reverb */
+ synth_reverb_frame = gtk_frame_new (_("reverb"));
+ gtk_frame_set_label_align (GTK_FRAME (synth_reverb_frame), 0.5, 0.5);
+ gtk_box_pack_start (GTK_BOX (synth_leftcol_vbox), synth_reverb_frame, TRUE, TRUE, 0);
+ synth_reverb_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ gtk_container_set_border_width (GTK_CONTAINER (synth_reverb_hbox), 2);
+ gtk_container_add (GTK_CONTAINER (synth_reverb_frame), synth_reverb_hbox);
+ synth_reverb_defcheckbt = gtk_check_button_new_with_label (_("use default"));
+ gtk_box_pack_start (GTK_BOX (synth_reverb_hbox), synth_reverb_defcheckbt, FALSE, FALSE, 0);
+ synth_reverb_value_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+ synth_reverb_value_option[0] = gtk_radio_button_new_with_label (NULL, _("yes"));
+ synth_reverb_value_option[1] = gtk_radio_button_new_with_label_from_widget (
+ GTK_RADIO_BUTTON (synth_reverb_value_option[0]), _("no"));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_reverb_value_option[0]), TRUE);
+ g_signal_connect (G_OBJECT (synth_reverb_defcheckbt), "toggled",
+ G_CALLBACK (i_configure_ev_toggle_default), synth_reverb_value_hbox);
+
+ if (fsyncfg->fsyn_synth_reverb < 0)
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_reverb_defcheckbt), TRUE);
+ }
+ else
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_reverb_defcheckbt), FALSE);
+
+ if (fsyncfg->fsyn_synth_reverb == 0)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_reverb_value_option[1]), TRUE);
+ else
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_reverb_value_option[0]), TRUE);
+ }
+
+ gtk_box_pack_start (GTK_BOX (synth_reverb_hbox), synth_reverb_value_hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_reverb_value_hbox), synth_reverb_value_option[0], FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_reverb_value_hbox), synth_reverb_value_option[1], FALSE, FALSE, 0);
+ /* synth settings - chorus */
+ synth_chorus_frame = gtk_frame_new (_("chorus"));
+ gtk_frame_set_label_align (GTK_FRAME (synth_chorus_frame), 0.5, 0.5);
+ gtk_box_pack_start (GTK_BOX (synth_leftcol_vbox), synth_chorus_frame, TRUE, TRUE, 0);
+ synth_chorus_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ gtk_container_set_border_width (GTK_CONTAINER (synth_chorus_hbox), 2);
+ gtk_container_add (GTK_CONTAINER (synth_chorus_frame), synth_chorus_hbox);
+ synth_chorus_defcheckbt = gtk_check_button_new_with_label (_("use default"));
+ gtk_box_pack_start (GTK_BOX (synth_chorus_hbox), synth_chorus_defcheckbt, FALSE, FALSE, 0);
+ synth_chorus_value_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+ synth_chorus_value_option[0] = gtk_radio_button_new_with_label (NULL, _("yes"));
+ synth_chorus_value_option[1] = gtk_radio_button_new_with_label_from_widget (
+ GTK_RADIO_BUTTON (synth_chorus_value_option[0]), _("no"));
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_chorus_value_option[0]), TRUE);
+ g_signal_connect (G_OBJECT (synth_chorus_defcheckbt), "toggled",
+ G_CALLBACK (i_configure_ev_toggle_default), synth_chorus_value_hbox);
+
+ if (fsyncfg->fsyn_synth_chorus < 0)
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_chorus_defcheckbt), TRUE);
+ }
+ else
+ {
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_chorus_defcheckbt), FALSE);
+
+ if (fsyncfg->fsyn_synth_chorus == 0)
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_chorus_value_option[1]), TRUE);
+ else
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_chorus_value_option[0]), TRUE);
+ }
+
+ gtk_box_pack_start (GTK_BOX (synth_chorus_hbox), synth_chorus_value_hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_chorus_value_hbox), synth_chorus_value_option[0], FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_chorus_value_hbox), synth_chorus_value_option[1], FALSE, FALSE, 0);
+ /* synth settings - samplerate */
+ synth_samplerate_frame = gtk_frame_new (_("sample rate"));
+ gtk_frame_set_label_align (GTK_FRAME (synth_samplerate_frame), 0.5, 0.5);
+ synth_samplerate_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ gtk_container_set_border_width (GTK_CONTAINER (synth_samplerate_vbox), 6);
+ gtk_container_add (GTK_CONTAINER (synth_samplerate_frame), synth_samplerate_vbox);
+ gtk_box_pack_start (GTK_BOX (synth_rightcol_vbox), synth_samplerate_frame, FALSE, FALSE, 0);
+ synth_samplerate_option[0] = gtk_radio_button_new_with_label (NULL, _("22050 Hz "));
+ g_object_set_data (G_OBJECT (synth_samplerate_option[0]), "val", GINT_TO_POINTER (22050));
+ synth_samplerate_option[1] = gtk_radio_button_new_with_label_from_widget (
+ GTK_RADIO_BUTTON (synth_samplerate_option[0]), _("44100 Hz "));
+ g_object_set_data (G_OBJECT (synth_samplerate_option[1]), "val", GINT_TO_POINTER (44100));
+ synth_samplerate_option[2] = gtk_radio_button_new_with_label_from_widget (
+ GTK_RADIO_BUTTON (synth_samplerate_option[0]), _("96000 Hz "));
+ g_object_set_data (G_OBJECT (synth_samplerate_option[2]), "val", GINT_TO_POINTER (96000));
+ synth_samplerate_option[3] = gtk_radio_button_new_with_label_from_widget (
+ GTK_RADIO_BUTTON (synth_samplerate_option[0]), _("custom "));
+ synth_samplerate_optionhbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+ synth_samplerate_optionentry = gtk_entry_new();
+ gtk_widget_set_sensitive (GTK_WIDGET (synth_samplerate_optionentry), FALSE);
+ gtk_entry_set_width_chars (GTK_ENTRY (synth_samplerate_optionentry), 8);
+ gtk_entry_set_max_length (GTK_ENTRY (synth_samplerate_optionentry), 5);
+ g_object_set_data (G_OBJECT (synth_samplerate_option[3]), "customentry", synth_samplerate_optionentry);
+ g_signal_connect (G_OBJECT (synth_samplerate_option[3]), "toggled",
+ G_CALLBACK (i_configure_ev_sysamplerate_togglecustom), synth_samplerate_optionentry);
+ synth_samplerate_optionlabel = gtk_label_new (_("Hz "));
+ gtk_box_pack_start (GTK_BOX (synth_samplerate_optionhbox), synth_samplerate_optionentry, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_samplerate_optionhbox), synth_samplerate_optionlabel, FALSE, FALSE, 0);
+
+ switch (fsyncfg->fsyn_synth_samplerate)
+ {
+ case 22050:
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_samplerate_option[0]), TRUE);
+ break;
+
+ case 44100:
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_samplerate_option[1]), TRUE);
+ break;
+
+ case 96000:
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_samplerate_option[2]), TRUE);
+ break;
+
+ default:
+ if ((fsyncfg->fsyn_synth_samplerate > 22050) && (fsyncfg->fsyn_synth_samplerate < 96000))
+ {
+ char * samplerate_value = g_strdup_printf ("%i", fsyncfg->fsyn_synth_samplerate);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_samplerate_option[3]), TRUE);
+ gtk_entry_set_text (GTK_ENTRY (synth_samplerate_optionentry), samplerate_value);
+ g_free (samplerate_value);
+ }
+ else
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (synth_samplerate_option[1]), TRUE);
+ }
+
+ gtk_box_pack_start (GTK_BOX (synth_samplerate_vbox), synth_samplerate_option[0], FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_samplerate_vbox), synth_samplerate_option[1], FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_samplerate_vbox), synth_samplerate_option[2], FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_samplerate_vbox), synth_samplerate_option[3], FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (synth_samplerate_vbox), synth_samplerate_optionhbox, FALSE, FALSE, 0);
+
+ gtk_box_pack_start (GTK_BOX (content_vbox), synth_frame, TRUE, TRUE, 0);
+
+ /* commit events */
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_sflist_commit), soundfont_file_lv);
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_sfload_commit), soundfont_load_option[0]);
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_sygain_commit), synth_gain_value_spin);
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_sypoly_commit), synth_poly_value_spin);
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_syreverb_commit), synth_reverb_value_option[0]);
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_sychorus_commit), synth_chorus_value_option[0]);
+ g_signal_connect_swapped (G_OBJECT (commit_button), "ap-commit",
+ G_CALLBACK (i_configure_ev_sysamplerate_commit), synth_samplerate_option[3]);
+ }
+
+ gtk_container_add ((GtkContainer *) fsyn_page_alignment, content_vbox);
 }
 
 
-void i_configure_cfg_fsyn_alloc( void )
+void i_configure_gui_tablabel_fsyn (GtkWidget * fsyn_page_alignment,
+ void * backend_list_p,
+ void * commit_button)
 {
- amidiplug_cfg_fsyn_t * fsyncfg = g_malloc(sizeof(amidiplug_cfg_fsyn_t));
- amidiplug_cfg_backend->fsyn = fsyncfg;
+ GtkWidget * pagelabel_vbox, *pagelabel_image, *pagelabel_label;
+ GdkPixbuf * pagelabel_image_pix;
+ pagelabel_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
+ pagelabel_image_pix = gdk_pixbuf_new_from_xpm_data ((const char **) backend_fluidsynth_icon_xpm);
+ pagelabel_image = gtk_image_new_from_pixbuf (pagelabel_image_pix);
+ g_object_unref (pagelabel_image_pix);
+ pagelabel_label = gtk_label_new ("");
+ gtk_label_set_markup (GTK_LABEL (pagelabel_label), _("FluidSynth\nbackend"));
+ gtk_label_set_justify (GTK_LABEL (pagelabel_label), GTK_JUSTIFY_CENTER);
+ gtk_box_pack_start (GTK_BOX (pagelabel_vbox), pagelabel_image, FALSE, FALSE, 1);
+ gtk_box_pack_start (GTK_BOX (pagelabel_vbox), pagelabel_label, FALSE, FALSE, 1);
+ gtk_container_add (GTK_CONTAINER (fsyn_page_alignment), pagelabel_vbox);
+ gtk_widget_show_all (fsyn_page_alignment);
+ return;
 }
 
 
-void i_configure_cfg_fsyn_free( void )
+void i_configure_cfg_fsyn_free (void)
 {
- amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
- g_free( fsyncfg->fsyn_soundfont_file );
+ amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
+ free (fsyncfg->fsyn_soundfont_file);
 }
 
 
-void i_configure_cfg_fsyn_read( pcfg_t * cfgfile )
+void i_configure_cfg_fsyn_read (void)
 {
- amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
-
- if (!cfgfile)
- {
- /* fluidsynth backend defaults */
- fsyncfg->fsyn_soundfont_file = g_strdup( "" );
- fsyncfg->fsyn_soundfont_load = 1;
- fsyncfg->fsyn_synth_samplerate = 44100;
- fsyncfg->fsyn_synth_gain = -1;
- fsyncfg->fsyn_synth_polyphony = -1;
- fsyncfg->fsyn_synth_reverb = -1;
- fsyncfg->fsyn_synth_chorus = -1;
- }
- else
- {
- i_pcfg_read_string( cfgfile , "fsyn" , "fsyn_soundfont_file" , &fsyncfg->fsyn_soundfont_file , "" );
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_soundfont_load" , &fsyncfg->fsyn_soundfont_load , 1 );
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_samplerate" , &fsyncfg->fsyn_synth_samplerate , 44100 );
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_gain" , &fsyncfg->fsyn_synth_gain , -1 );
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_polyphony" , &fsyncfg->fsyn_synth_polyphony , -1 );
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_reverb" , &fsyncfg->fsyn_synth_reverb , -1 );
- i_pcfg_read_integer( cfgfile , "fsyn" , "fsyn_synth_chorus" , &fsyncfg->fsyn_synth_chorus , -1 );
- }
+ static const char * const defaults[] =
+ {
+ "fsyn_soundfont_load", "1",
+ "fsyn_synth_samplerate", "44100",
+ "fsyn_synth_gain", "-1",
+ "fsyn_synth_polyphony", "-1",
+ "fsyn_synth_reverb", "-1",
+ "fsyn_synth_chorus", "-1",
+ NULL
+ };
+
+ aud_config_set_defaults ("amidiplug", defaults);
+
+ amidiplug_cfg_fsyn_t * fsyncfg = malloc (sizeof (amidiplug_cfg_fsyn_t));
+ amidiplug_cfg_backend->fsyn = fsyncfg;
+
+ fsyncfg->fsyn_soundfont_file = aud_get_string ("amidiplug", "fsyn_soundfont_file");
+ fsyncfg->fsyn_soundfont_load = aud_get_int ("amidiplug", "fsyn_soundfont_load");
+ fsyncfg->fsyn_synth_samplerate = aud_get_int ("amidiplug", "fsyn_synth_samplerate");
+ fsyncfg->fsyn_synth_gain = aud_get_int ("amidiplug", "fsyn_synth_gain");
+ fsyncfg->fsyn_synth_polyphony = aud_get_int ("amidiplug", "fsyn_synth_polyphony");
+ fsyncfg->fsyn_synth_reverb = aud_get_int ("amidiplug", "fsyn_synth_reverb");
+ fsyncfg->fsyn_synth_chorus = aud_get_int ("amidiplug", "fsyn_synth_chorus");
 }
 
 
-void i_configure_cfg_fsyn_save( pcfg_t * cfgfile )
+void i_configure_cfg_fsyn_save (void)
 {
- amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
-
- i_pcfg_write_string( cfgfile , "fsyn" , "fsyn_soundfont_file" , fsyncfg->fsyn_soundfont_file );
- i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_soundfont_load" , fsyncfg->fsyn_soundfont_load );
- i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_synth_samplerate" , fsyncfg->fsyn_synth_samplerate );
- i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_synth_gain" , fsyncfg->fsyn_synth_gain );
- i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_synth_polyphony" , fsyncfg->fsyn_synth_polyphony );
- i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_synth_reverb" , fsyncfg->fsyn_synth_reverb );
- i_pcfg_write_integer( cfgfile , "fsyn" , "fsyn_synth_chorus" , fsyncfg->fsyn_synth_chorus );
+ amidiplug_cfg_fsyn_t * fsyncfg = amidiplug_cfg_backend->fsyn;
+
+ aud_set_string ("amidiplug", "fsyn_soundfont_file", fsyncfg->fsyn_soundfont_file);
+ aud_set_int ("amidiplug", "fsyn_soundfont_load", fsyncfg->fsyn_soundfont_load);
+ aud_set_int ("amidiplug", "fsyn_synth_samplerate", fsyncfg->fsyn_synth_samplerate);
+ aud_set_int ("amidiplug", "fsyn_synth_gain", fsyncfg->fsyn_synth_gain);
+ aud_set_int ("amidiplug", "fsyn_synth_polyphony", fsyncfg->fsyn_synth_polyphony);
+ aud_set_int ("amidiplug", "fsyn_synth_reverb", fsyncfg->fsyn_synth_reverb);
+ aud_set_int ("amidiplug", "fsyn_synth_chorus", fsyncfg->fsyn_synth_chorus);
 }
 
 #endif /* AMIDIPLUG_FLUIDSYNTH */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_configure-fluidsynth.h -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_configure-fluidsynth.h Changed

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_configure.c -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_configure.c Changed

@@ -18,21 +18,20 @@
 *
 */
 
-#include <gtk/gtk.h>
+#include "i_configure.h"
+
+#include <stdlib.h>
+#include <string.h>
 
 #include <audacious/drct.h>
+#include <audacious/i18n.h>
 #include <audacious/misc.h>
-#include <audacious/plugin.h>
 
-#include "config.h"
-#include "i_configure.h"
-#include "i_configure_private.h"
-#include "i_configure_file.h"
+#include "i_common.h"
 #include "i_backend.h"
 #include "i_configure-ap.h"
 #include "i_configure-alsa.h"
 #include "i_configure-fluidsynth.h"
-#include "i_utils.h"
 
 #ifdef AMIDIPLUG_ALSA
 #define DEFAULT_BACKEND "alsa"
@@ -42,42 +41,13 @@
 #define DEFAULT_BACKEND ""
 #endif
 
-amidiplug_cfg_backend_t * amidiplug_cfg_backend;
-
-static void i_configure_cancel (GtkWidget * configwin);
-static void i_configure_commit (GtkWidget * configwin);
-
-void i_configure_cfg_backend_alloc( void );
-void i_configure_cfg_backend_free( void );
-void i_configure_cfg_backend_save( void );
-void i_configure_cfg_backend_read( void );
-void i_configure_cfg_ap_save( void );
-void i_configure_cfg_ap_read( void );
+/* from amidi-plug.c */
+extern amidiplug_sequencer_backend_t * backend;
 
+amidiplug_cfg_ap_t * amidiplug_cfg_ap;
+amidiplug_cfg_backend_t * amidiplug_cfg_backend;
 
-void i_configure_ev_browse_for_entry( GtkWidget * target_entry )
-{
- GtkWidget *parent_window = gtk_widget_get_toplevel( target_entry );
- GtkFileChooserAction act = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(target_entry),"fc-act"));
- if (gtk_widget_is_toplevel (parent_window))
- {
- GtkWidget *browse_dialog = gtk_file_chooser_dialog_new( _("AMIDI-Plug - select file") ,
- GTK_WINDOW(parent_window) , act ,
- GTK_STOCK_CANCEL , GTK_RESPONSE_CANCEL ,
- GTK_STOCK_OPEN , GTK_RESPONSE_ACCEPT , NULL );
- if ( strcmp( gtk_entry_get_text(GTK_ENTRY(target_entry)) , "" ) )
- gtk_file_chooser_set_filename( GTK_FILE_CHOOSER(browse_dialog) ,
- gtk_entry_get_text(GTK_ENTRY(target_entry)) );
- if ( gtk_dialog_run(GTK_DIALOG(browse_dialog)) == GTK_RESPONSE_ACCEPT )
- {
- gchar *filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(browse_dialog) );
- gtk_entry_set_text( GTK_ENTRY(target_entry) , filename );
- DEBUGMSG( "selected file: %s\n" , filename );
- g_free( filename );
- }
- gtk_widget_destroy( browse_dialog );
- }
-}
+static void i_configure_commit (void);
 
 static void response_cb (GtkWidget * window, int response)
 {
@@ -87,257 +57,185 @@
 aud_drct_stop ();
 
 g_signal_emit_by_name (window, "ap-commit");
- i_configure_commit (window);
+ i_configure_commit ();
 }
- else
- i_configure_cancel (window);
+
+ gtk_widget_destroy (window);
 }
 
-void i_configure_gui( void )
+void i_configure_gui (void)
 {
- static GtkWidget *configwin = NULL;
-
- if ( configwin != NULL )
- {
- DEBUGMSG( "config window is already open!\n" );
- return;
- }
+ static GtkWidget * configwin = NULL;
 
- /* get configuration information for backends */
- i_configure_cfg_backend_alloc();
- i_configure_cfg_backend_read();
+ if (configwin != NULL)
+ {
+ DEBUGMSG ("config window is already open!\n");
+ return;
+ }
 
- configwin = gtk_dialog_new_with_buttons (_("AMIDI-Plug Settings"), NULL, 0,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ configwin = gtk_dialog_new_with_buttons (_("AMIDI-Plug Settings"), NULL, 0,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
 
- if (! g_signal_lookup ("ap-commit", G_OBJECT_TYPE (configwin)))
- g_signal_new ("ap-commit", G_OBJECT_TYPE (configwin), G_SIGNAL_ACTION, 0,
- NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+ if (! g_signal_lookup ("ap-commit", G_OBJECT_TYPE (configwin)))
+ g_signal_new ("ap-commit", G_OBJECT_TYPE (configwin), G_SIGNAL_ACTION, 0,
+ NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 
- g_signal_connect (configwin, "response", (GCallback) response_cb, NULL);
- g_signal_connect (configwin, "destroy", (GCallback) gtk_widget_destroyed, & configwin);
+ g_signal_connect (configwin, "response", (GCallback) response_cb, NULL);
+ g_signal_connect (configwin, "destroy", (GCallback) gtk_widget_destroyed, & configwin);
 
- GtkWidget * configwin_vbox = gtk_dialog_get_content_area ((GtkDialog *) configwin);
+ GtkWidget * configwin_vbox = gtk_dialog_get_content_area ((GtkDialog *) configwin);
 
- GtkWidget * configwin_notebook = gtk_notebook_new ();
- gtk_notebook_set_tab_pos( GTK_NOTEBOOK(configwin_notebook) , GTK_POS_LEFT );
- gtk_box_pack_start( GTK_BOX(configwin_vbox) , configwin_notebook , TRUE , TRUE , 2 );
+ GtkWidget * configwin_notebook = gtk_notebook_new ();
+ gtk_notebook_set_tab_pos (GTK_NOTEBOOK (configwin_notebook), GTK_POS_LEFT);
+ gtk_box_pack_start (GTK_BOX (configwin_vbox), configwin_notebook, TRUE, TRUE, 2);
 
- /* GET A LIST OF BACKENDS */
- GSList * backend_list = i_backend_list_lookup ();
- GSList * backend_list_h = backend_list;
+ /* GET A LIST OF BACKENDS */
+ GSList * backend_list = i_backend_list_lookup ();
+ GSList * backend_list_h = backend_list;
 
- /* AMIDI-PLUG PREFERENCES TAB */
- GtkWidget * ap_pagelabel_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
- GtkWidget * ap_page_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_alignment_set_padding( GTK_ALIGNMENT(ap_page_alignment) , 3 , 3 , 8 , 3 );
- i_configure_gui_tab_ap (ap_page_alignment, backend_list, configwin);
- i_configure_gui_tablabel_ap (ap_pagelabel_alignment, backend_list, configwin);
- gtk_notebook_append_page( GTK_NOTEBOOK(configwin_notebook) ,
- ap_page_alignment , ap_pagelabel_alignment );
+ /* AMIDI-PLUG PREFERENCES TAB */
+ GtkWidget * ap_pagelabel_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
+ GtkWidget * ap_page_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (ap_page_alignment), 3, 3, 8, 3);
+ i_configure_gui_tab_ap (ap_page_alignment, backend_list, configwin);
+ i_configure_gui_tablabel_ap (ap_pagelabel_alignment, backend_list, configwin);
+ gtk_notebook_append_page (GTK_NOTEBOOK (configwin_notebook),
+ ap_page_alignment, ap_pagelabel_alignment);
 
 #ifdef AMIDIPLUG_ALSA
- /* ALSA BACKEND CONFIGURATION TAB */
- GtkWidget * alsa_pagelabel_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
- GtkWidget * alsa_page_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_alignment_set_padding( GTK_ALIGNMENT(alsa_page_alignment) , 3 , 3 , 8 , 3 );
- i_configure_gui_tab_alsa (alsa_page_alignment, backend_list, configwin);
- i_configure_gui_tablabel_alsa (alsa_pagelabel_alignment, backend_list, configwin);
- gtk_notebook_append_page( GTK_NOTEBOOK(configwin_notebook) ,
- alsa_page_alignment , alsa_pagelabel_alignment );
+ /* ALSA BACKEND CONFIGURATION TAB */
+ GtkWidget * alsa_pagelabel_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
+ GtkWidget * alsa_page_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (alsa_page_alignment), 3, 3, 8, 3);
+ i_configure_gui_tab_alsa (alsa_page_alignment, backend_list, configwin);
+ i_configure_gui_tablabel_alsa (alsa_pagelabel_alignment, backend_list, configwin);
+ gtk_notebook_append_page (GTK_NOTEBOOK (configwin_notebook),
+ alsa_page_alignment, alsa_pagelabel_alignment);
 #endif /* AMIDIPLUG_ALSA */
 
 #if AMIDIPLUG_FLUIDSYNTH
- /* FLUIDSYNTH BACKEND CONFIGURATION TAB */
- GtkWidget * fsyn_pagelabel_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
- GtkWidget * fsyn_page_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
- gtk_alignment_set_padding( GTK_ALIGNMENT(fsyn_page_alignment) , 3 , 3 , 8 , 3 );
- i_configure_gui_tab_fsyn (fsyn_page_alignment, backend_list, configwin);
- i_configure_gui_tablabel_fsyn (fsyn_pagelabel_alignment, backend_list, configwin);
- gtk_notebook_append_page( GTK_NOTEBOOK(configwin_notebook) ,
- fsyn_page_alignment , fsyn_pagelabel_alignment );
+ /* FLUIDSYNTH BACKEND CONFIGURATION TAB */
+ GtkWidget * fsyn_pagelabel_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
+ GtkWidget * fsyn_page_alignment = gtk_alignment_new (0.5, 0.5, 1, 1);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (fsyn_page_alignment), 3, 3, 8, 3);
+ i_configure_gui_tab_fsyn (fsyn_page_alignment, backend_list, configwin);
+ i_configure_gui_tablabel_fsyn (fsyn_pagelabel_alignment, backend_list, configwin);
+ gtk_notebook_append_page (GTK_NOTEBOOK (configwin_notebook),
+ fsyn_page_alignment, fsyn_pagelabel_alignment);
 #endif
 
- i_backend_list_free( backend_list_h ); /* done, free the list of available backends */
+ i_backend_list_free (backend_list_h); /* done, free the list of available backends */
 
- gtk_widget_show_all( configwin );
+ gtk_widget_show_all (configwin);
 }
 
-static void i_configure_cancel (GtkWidget * configwin)
+static void i_configure_commit (void)
 {
- i_configure_cfg_backend_free(); /* free backend settings */
- gtk_widget_destroy(GTK_WIDGET(configwin));
-}
-
-static void i_configure_commit (GtkWidget * configwin)
-{
- DEBUGMSG( "saving configuration...\n" );
- i_configure_cfg_ap_save(); /* save amidiplug settings */
- i_configure_cfg_backend_save(); /* save backend settings */
- DEBUGMSG( "configuration saved\n" );
-
- /* check if a different backend has been selected */
- if (( backend.name == NULL ) || ( strcmp( amidiplug_cfg_ap.ap_seq_backend , backend.name ) ))
- {
- DEBUGMSG( "a new backend has been selected, unloading previous and loading the new one\n" );
- i_backend_unload(); /* unload previous backend */
- i_backend_load( amidiplug_cfg_ap.ap_seq_backend ); /* load new backend */
- }
- else /* same backend, just reload updated configuration */
- {
- if ( backend.gmodule != NULL )
- {
- DEBUGMSG( "the selected backend is already loaded, so just perform backend cleanup and reinit\n" );
- backend.cleanup();
- backend.init( i_configure_cfg_get_file );
- }
- }
-
- i_configure_cfg_backend_free ();
- gtk_widget_destroy (configwin);
+ DEBUGMSG ("saving configuration...\n");
+ i_configure_cfg_ap_save(); /* save amidiplug settings */
+ i_configure_cfg_backend_save(); /* save backend settings */
+ DEBUGMSG ("configuration saved\n");
+
+ /* stop playback before reloading backend
+ * not pretty, but it's better than crashing */
+ if (aud_drct_get_playing ())
+ aud_drct_stop ();
+
+ i_backend_unload (backend);
+ backend = i_backend_load (amidiplug_cfg_ap->ap_seq_backend);
+
+ /* quit if new backend fails to load
+ * again, it's better than crashing */
+ if (! backend)
+ aud_drct_quit ();
 }
 
 
-void i_configure_cfg_backend_alloc( void )
+void i_configure_cfg_backend_free (void)
 {
- amidiplug_cfg_backend = g_malloc(sizeof(amidiplug_cfg_backend));
-
 #ifdef AMIDIPLUG_ALSA
- i_configure_cfg_alsa_alloc(); /* alloc alsa backend configuration */
+ i_configure_cfg_alsa_free(); /* free alsa backend configuration */
 #endif
 #ifdef AMIDIPLUG_FLUIDSYNTH
- i_configure_cfg_fsyn_alloc(); /* alloc fluidsynth backend configuration */
+ i_configure_cfg_fsyn_free(); /* free fluidsynth backend configuration */
 #endif
+
+ free (amidiplug_cfg_backend);
 }
 
 
-void i_configure_cfg_backend_free( void )
+void i_configure_cfg_backend_read (void)
 {
+ amidiplug_cfg_backend = malloc (sizeof (amidiplug_cfg_backend_t));
+ memset (amidiplug_cfg_backend, 0, sizeof (amidiplug_cfg_backend_t));
+
 #ifdef AMIDIPLUG_ALSA
- i_configure_cfg_alsa_free(); /* free alsa backend configuration */
+ i_configure_cfg_alsa_read ();
 #endif
 #ifdef AMIDIPLUG_FLUIDSYNTH
- i_configure_cfg_fsyn_free(); /* free fluidsynth backend configuration */
+ i_configure_cfg_fsyn_read ();
 #endif
-
- g_free( amidiplug_cfg_backend );
 }
 
 
-void i_configure_cfg_backend_read( void )
+void i_configure_cfg_backend_save (void)
 {
- pcfg_t *cfgfile;
- gchar *config_pathfilename = i_configure_cfg_get_file();
-
- cfgfile = i_pcfg_new_from_file( config_pathfilename );
-
 #ifdef AMIDIPLUG_ALSA
- i_configure_cfg_alsa_read( cfgfile ); /* get alsa backend configuration */
+ i_configure_cfg_alsa_save (); /* save alsa backend configuration */
 #endif
 #ifdef AMIDIPLUG_FLUIDSYNTH
- i_configure_cfg_fsyn_read( cfgfile ); /* get fluidsynth backend configuration */
+ i_configure_cfg_fsyn_save (); /* save fluidsynth backend configuration */
 #endif
-
- if ( cfgfile != NULL )
- i_pcfg_free(cfgfile);
-
- g_free( config_pathfilename );
 }
 
 
-void i_configure_cfg_backend_save( void )
+/* read only the amidi-plug part of configuration */
+void i_configure_cfg_ap_read (void)
 {
- pcfg_t *cfgfile;
- gchar *config_pathfilename = i_configure_cfg_get_file();
-
- cfgfile = i_pcfg_new_from_file( config_pathfilename );
-
- if (!cfgfile)
- cfgfile = i_pcfg_new();
-
-#ifdef AMIDIPLUG_ALSA
- i_configure_cfg_alsa_save( cfgfile ); /* save alsa backend configuration */
-#endif
-#ifdef AMIDIPLUG_FLUIDSYNTH
- i_configure_cfg_fsyn_save( cfgfile ); /* save fluidsynth backend configuration */
-#endif
-
- i_pcfg_write_to_file( cfgfile , config_pathfilename );
- i_pcfg_free( cfgfile );
- g_free( config_pathfilename );
+ static const char * const defaults[] =
+ {
+ "ap_seq_backend", DEFAULT_BACKEND,
+ "ap_opts_transpose_value", "0",
+ "ap_opts_drumshift_value", "0",
+ "ap_opts_length_precalc", "0",
+ "ap_opts_lyrics_extract", "0",
+ "ap_opts_comments_extract", "0",
+ NULL
+ };
+
+ aud_config_set_defaults ("amidiplug", defaults);
+
+ amidiplug_cfg_ap = malloc (sizeof (amidiplug_cfg_ap_t));
+ amidiplug_cfg_ap->ap_seq_backend = aud_get_string ("amidiplug", "ap_seq_backend");
+ amidiplug_cfg_ap->ap_opts_transpose_value = aud_get_int ("amidiplug", "ap_opts_transpose_value");
+ amidiplug_cfg_ap->ap_opts_drumshift_value = aud_get_int ("amidiplug", "ap_opts_drumshift_value");
+ amidiplug_cfg_ap->ap_opts_length_precalc = aud_get_int ("amidiplug", "ap_opts_length_precalc");
+ amidiplug_cfg_ap->ap_opts_lyrics_extract = aud_get_int ("amidiplug", "ap_opts_lyrics_extract");
+ amidiplug_cfg_ap->ap_opts_comments_extract = aud_get_int ("amidiplug", "ap_opts_comments_extract");
 }
 
 
-/* read only the amidi-plug part of configuration */
-void i_configure_cfg_ap_read( void )
+void i_configure_cfg_ap_save (void)
 {
- pcfg_t *cfgfile;
- gchar *config_pathfilename = i_configure_cfg_get_file();
-
- cfgfile = i_pcfg_new_from_file( config_pathfilename );
-
- if (!cfgfile)
- {
- /* amidi-plug defaults */
-
- amidiplug_cfg_ap.ap_seq_backend = g_strdup (DEFAULT_BACKEND);
- amidiplug_cfg_ap.ap_opts_transpose_value = 0;
- amidiplug_cfg_ap.ap_opts_drumshift_value = 0;
- amidiplug_cfg_ap.ap_opts_length_precalc = 0;
- amidiplug_cfg_ap.ap_opts_lyrics_extract = 0;
- amidiplug_cfg_ap.ap_opts_comments_extract = 0;
- }
- else
- {
- i_pcfg_read_string ( cfgfile , "general" , "ap_seq_backend" ,
- &amidiplug_cfg_ap.ap_seq_backend, DEFAULT_BACKEND );
- i_pcfg_read_integer( cfgfile , "general" , "ap_opts_transpose_value" ,
- &amidiplug_cfg_ap.ap_opts_transpose_value , 0 );
- i_pcfg_read_integer( cfgfile , "general" , "ap_opts_drumshift_value" ,
- &amidiplug_cfg_ap.ap_opts_drumshift_value , 0 );
- i_pcfg_read_integer( cfgfile , "general" , "ap_opts_length_precalc" ,
- &amidiplug_cfg_ap.ap_opts_length_precalc , 0 );
- i_pcfg_read_integer( cfgfile , "general" , "ap_opts_lyrics_extract" ,
- &amidiplug_cfg_ap.ap_opts_lyrics_extract , 0 );
- i_pcfg_read_integer( cfgfile , "general" , "ap_opts_comments_extract" ,
- &amidiplug_cfg_ap.ap_opts_comments_extract , 0 );
- i_pcfg_free( cfgfile );
- }
-
- g_free( config_pathfilename );
+ aud_set_string ("amidiplug", "ap_seq_backend", amidiplug_cfg_ap->ap_seq_backend);
+ aud_set_int ("amidiplug", "ap_opts_transpose_value", amidiplug_cfg_ap->ap_opts_transpose_value);
+ aud_set_int ("amidiplug", "ap_opts_drumshift_value", amidiplug_cfg_ap->ap_opts_drumshift_value);
+ aud_set_int ("amidiplug", "ap_opts_length_precalc", amidiplug_cfg_ap->ap_opts_length_precalc);
+ aud_set_int ("amidiplug", "ap_opts_lyrics_extract", amidiplug_cfg_ap->ap_opts_lyrics_extract);
+ aud_set_int ("amidiplug", "ap_opts_comments_extract", amidiplug_cfg_ap->ap_opts_comments_extract);
 }
 
 
-void i_configure_cfg_ap_save( void )
+void i_configure_cfg_ap_free (void)
 {
- pcfg_t *cfgfile;
- gchar *config_pathfilename = i_configure_cfg_get_file();
- cfgfile = i_pcfg_new_from_file( config_pathfilename );
-
- if (!cfgfile)
- cfgfile = i_pcfg_new();
-
- /* save amidi-plug config information */
- i_pcfg_write_string( cfgfile , "general" , "ap_seq_backend" ,
- amidiplug_cfg_ap.ap_seq_backend );
- i_pcfg_write_integer( cfgfile , "general" , "ap_opts_transpose_value" ,
- amidiplug_cfg_ap.ap_opts_transpose_value );
- i_pcfg_write_integer( cfgfile , "general" , "ap_opts_drumshift_value" ,
- amidiplug_cfg_ap.ap_opts_drumshift_value );
- i_pcfg_write_integer( cfgfile , "general" , "ap_opts_length_precalc" ,
- amidiplug_cfg_ap.ap_opts_length_precalc );
- i_pcfg_write_integer( cfgfile , "general" , "ap_opts_lyrics_extract" ,
- amidiplug_cfg_ap.ap_opts_lyrics_extract );
- i_pcfg_write_integer( cfgfile , "general" , "ap_opts_comments_extract" ,
- amidiplug_cfg_ap.ap_opts_comments_extract );
-
- i_pcfg_write_to_file( cfgfile , config_pathfilename );
- i_pcfg_free( cfgfile );
- g_free( config_pathfilename );
+ free (amidiplug_cfg_ap->ap_seq_backend);
+ amidiplug_cfg_ap->ap_seq_backend = NULL;
+ free (amidiplug_cfg_ap);
+ amidiplug_cfg_ap = NULL;
 }
 
 
-gchar * i_configure_cfg_get_file( void )
+char * i_configure_cfg_get_file (void)
 {
- return g_build_filename (aud_get_path (AUD_PATH_USER_DIR), "amidi-plug.conf", NULL);
+ return g_build_filename (aud_get_path (AUD_PATH_USER_DIR), "amidi-plug.conf", NULL);
 }

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_configure.h -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_configure.h Changed

@@ -21,27 +21,56 @@
 #ifndef _I_CONFIGURE_H
 #define _I_CONFIGURE_H 1
 
-#include "i_common.h"
-
-
 typedef struct
 {
-  gchar *	ap_seq_backend;
-  gint		ap_opts_transpose_value;
-  gint		ap_opts_drumshift_value;
-  gint		ap_opts_length_precalc;
-  gint		ap_opts_comments_extract;
-  gint		ap_opts_lyrics_extract;
+    char * ap_seq_backend;
+    int ap_opts_transpose_value;
+    int ap_opts_drumshift_value;
+    int ap_opts_length_precalc;
+    int ap_opts_comments_extract;
+    int ap_opts_lyrics_extract;
 }
 amidiplug_cfg_ap_t;
 
+typedef struct
+{
+    char * alsa_seq_wports;
+    int alsa_mixer_card_id;
+    char * alsa_mixer_ctl_name;
+    int alsa_mixer_ctl_id;
+}
+amidiplug_cfg_alsa_t;
+
+typedef struct
+{
+    char * fsyn_soundfont_file;
+    int fsyn_soundfont_load;
+    int fsyn_synth_samplerate;
+    int fsyn_synth_gain;
+    int fsyn_synth_polyphony;
+    int fsyn_synth_reverb;
+    int fsyn_synth_chorus;
+}
+amidiplug_cfg_fsyn_t;
 
-extern amidiplug_cfg_ap_t amidiplug_cfg_ap;
+struct amidiplug_cfg_backend_s
+{
+    amidiplug_cfg_alsa_t * alsa;
+    amidiplug_cfg_fsyn_t * fsyn;
+};
 
+typedef struct amidiplug_cfg_backend_s amidiplug_cfg_backend_t;
 
-void i_configure_gui( void );
-void i_configure_cfg_ap_read( void );
-void i_configure_cfg_ap_save( void );
+extern amidiplug_cfg_ap_t * amidiplug_cfg_ap;
+extern amidiplug_cfg_backend_t * amidiplug_cfg_backend;
 
+void i_configure_gui (void);
+void i_configure_cfg_ap_read (void);
+void i_configure_cfg_ap_save (void);
+void i_configure_cfg_ap_free (void);
+void i_configure_cfg_backend_alloc (void);
+void i_configure_cfg_backend_read (void);
+void i_configure_cfg_backend_save (void);
+void i_configure_cfg_backend_free (void);
 
 #endif /* !_I_CONFIGURE_H */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_fileinfo.c -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_fileinfo.c Changed

@@ -18,9 +18,13 @@
 *
 */
 
+#include "i_fileinfo.h"
 
+#include <stdlib.h>
+#include <string.h>
 #include <gtk/gtk.h>
-#include "i_fileinfo.h"
+#include <audacious/i18n.h>
+
 #include "i_configure.h"
 /* this is needed to retrieve information */
 #include "i_midi.h"
@@ -28,337 +32,351 @@
 #include "amidi-plug.midiicon.xpm"
 
 
-void i_fileinfo_ev_destroy( GtkWidget * win , gpointer mf )
+void i_fileinfo_ev_destroy (GtkWidget * win, void * mf)
 {
- i_midi_free( (midifile_t *)mf );
- g_free( mf );
+ i_midi_free ((midifile_t *) mf);
+ free (mf);
 }
 
 
-void i_fileinfo_ev_close( GtkWidget * button , gpointer fileinfowin )
+void i_fileinfo_ev_close (GtkWidget * button, void * fileinfowin)
 {
- gtk_widget_destroy( GTK_WIDGET(fileinfowin) );
+ gtk_widget_destroy (GTK_WIDGET (fileinfowin));
 }
 
 
-void i_fileinfo_grid_add_entry( gchar * field_text , gchar * value_text ,
- GtkWidget * grid , guint line , PangoAttrList * attrlist )
+void i_fileinfo_grid_add_entry (char * field_text, char * value_text,
+ GtkWidget * grid, unsigned line, PangoAttrList * attrlist)
 {
- GtkWidget *field, *value;
- field = gtk_label_new( field_text );
- gtk_label_set_attributes( GTK_LABEL(field) , attrlist );
- gtk_misc_set_alignment( GTK_MISC(field) , 0 , 0 );
- gtk_label_set_justify( GTK_LABEL(field) , GTK_JUSTIFY_LEFT );
- gtk_grid_attach( GTK_GRID(grid) , field , 0 , line , 1 , 1 );
- value = gtk_label_new( value_text );
- gtk_misc_set_alignment( GTK_MISC(value) , 0 , 0 );
- gtk_label_set_justify( GTK_LABEL(value) , GTK_JUSTIFY_LEFT );
- gtk_grid_attach( GTK_GRID(grid) , value , 1 , line , 1 , 1 );
- return;
+ GtkWidget * field, *value;
+ field = gtk_label_new (field_text);
+ gtk_label_set_attributes (GTK_LABEL (field), attrlist);
+ gtk_misc_set_alignment (GTK_MISC (field), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (field), GTK_JUSTIFY_LEFT);
+ gtk_grid_attach (GTK_GRID (grid), field, 0, line, 1, 1);
+ value = gtk_label_new (value_text);
+ gtk_misc_set_alignment (GTK_MISC (value), 0, 0);
+ gtk_label_set_justify (GTK_LABEL (value), GTK_JUSTIFY_LEFT);
+ gtk_grid_attach (GTK_GRID (grid), value, 1, line, 1, 1);
+ return;
 }
 
 
 /* COMMENT: this will also reset current position in each track! */
-void i_fileinfo_text_fill( midifile_t * mf , GtkTextBuffer * text_tb, GtkTextBuffer * lyrics_tb )
+void i_fileinfo_text_fill (midifile_t * mf, GtkTextBuffer * text_tb, GtkTextBuffer * lyrics_tb)
 {
- gint l = 0;
- /* initialize current position in each track */
- for (l = 0; l < mf->num_tracks; ++l)
- mf->tracks[l].current_event = mf->tracks[l].first_event;
-
- for (;;)
- {
- midievent_t * event = NULL;
- midifile_track_t * event_track = NULL;
- gint i, min_tick = mf->max_tick + 1;
-
- /* search next event */
- for ( i = 0 ; i < mf->num_tracks ; ++i )
+ int l = 0;
+
+ /* initialize current position in each track */
+ for (l = 0; l < mf->num_tracks; ++l)
+ mf->tracks[l].current_event = mf->tracks[l].first_event;
+
+ for (;;)
 {
- midifile_track_t * track = &mf->tracks[i];
- midievent_t * e2 = track->current_event;
- if (( e2 ) && ( e2->tick < min_tick ))
- {
- min_tick = e2->tick;
- event = e2;
- event_track = track;
- }
+ midievent_t * event = NULL;
+ midifile_track_t * event_track = NULL;
+ int i, min_tick = mf->max_tick + 1;
+
+ /* search next event */
+ for (i = 0 ; i < mf->num_tracks ; ++i)
+ {
+ midifile_track_t * track = &mf->tracks[i];
+ midievent_t * e2 = track->current_event;
+
+ if ((e2) && (e2->tick < min_tick))
+ {
+ min_tick = e2->tick;
+ event = e2;
+ event_track = track;
+ }
+ }
+
+ if (!event)
+ break; /* end of song reached */
+
+ /* advance pointer to next event */
+ event_track->current_event = event->next;
+
+ switch (event->type)
+ {
+ case SND_SEQ_EVENT_META_TEXT:
+ gtk_text_buffer_insert_at_cursor (text_tb, event->data.metat, strlen (event->data.metat));
+ break;
+
+ case SND_SEQ_EVENT_META_LYRIC:
+ gtk_text_buffer_insert_at_cursor (lyrics_tb, event->data.metat, strlen (event->data.metat));
+ break;
+ }
 }
+}
 
- if (!event)
- break; /* end of song reached */
 
- /* advance pointer to next event */
- event_track->current_event = event->next;
+void i_fileinfo_gui (const char * filename_uri)
+{
+ static GtkWidget * fileinfowin = NULL;
+ GtkWidget * fileinfowin_vbox, *fileinfowin_columns_hbox;
+ GtkWidget * midiinfoboxes_vbox, *miditextboxes_vbox, *miditextboxes_paned;
+ GtkWidget * title_hbox, *title_icon_image, *title_name_f_label, *title_name_v_entry;
+ GtkWidget * info_frame, *info_frame_tl, *info_grid;
+ GtkWidget * text_frame, *text_frame_tl, *text_tv, *text_tv_sw;
+ GtkWidget * lyrics_frame, *lyrics_tv, *lyrics_tv_sw;
+ GtkTextBuffer * text_tb, *lyrics_tb;
+ GtkWidget * footer_hbbox, *footer_bclose;
+ GdkPixbuf * title_icon_pixbuf;
+ PangoAttrList * pangoattrlist;
+ PangoAttribute * pangoattr;
+ GString * value_gstring;
+ char * title, *filename, *filename_utf8;
+ int bpm = 0, wavg_bpm = 0;
+ midifile_t * mf;
+
+ if (fileinfowin)
+ return;
+
+ mf = malloc (sizeof (midifile_t));
+
+ /****************** midifile parser ******************/
+ if (!i_midi_parse_from_filename (filename_uri, mf))
+ return;
+
+ /* midifile is filled with information at this point,
+ bpm information is needed too */
+ i_midi_get_bpm (mf, &bpm, &wavg_bpm);
+ /*****************************************************/
+
+ fileinfowin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_type_hint (GTK_WINDOW (fileinfowin), GDK_WINDOW_TYPE_HINT_DIALOG);
+ gtk_window_set_position (GTK_WINDOW (fileinfowin), GTK_WIN_POS_CENTER);
+ g_signal_connect (G_OBJECT (fileinfowin), "destroy", G_CALLBACK (i_fileinfo_ev_destroy), mf);
+ g_signal_connect (G_OBJECT (fileinfowin), "destroy", G_CALLBACK (gtk_widget_destroyed), &fileinfowin);
+ gtk_container_set_border_width (GTK_CONTAINER (fileinfowin), 10);
+
+ fileinfowin_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
+ gtk_container_add (GTK_CONTAINER (fileinfowin), fileinfowin_vbox);
+
+ /* pango attributes */
+ pangoattrlist = pango_attr_list_new();
+ pangoattr = pango_attr_weight_new (PANGO_WEIGHT_BOLD);
+ pangoattr->start_index = 0;
+ pangoattr->end_index = G_MAXINT;
+ pango_attr_list_insert (pangoattrlist, pangoattr);
+
+ /******************
+ *** TITLE LINE ***/
+ title_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+ gtk_box_pack_start (GTK_BOX (fileinfowin_vbox), title_hbox, FALSE, FALSE, 0);
+
+ title_icon_pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) amidiplug_xpm_midiicon);
+ title_icon_image = gtk_image_new_from_pixbuf (title_icon_pixbuf);
+ g_object_unref (title_icon_pixbuf);
+ gtk_misc_set_alignment (GTK_MISC (title_icon_image), 0, 0);
+ gtk_box_pack_start (GTK_BOX (title_hbox), title_icon_image, FALSE, FALSE, 0);
+
+ title_name_f_label = gtk_label_new (_("Name:"));
+ gtk_label_set_attributes (GTK_LABEL (title_name_f_label), pangoattrlist);
+ gtk_box_pack_start (GTK_BOX (title_hbox), title_name_f_label, FALSE, FALSE, 0);
+
+ title_name_v_entry = gtk_entry_new();
+ gtk_editable_set_editable (GTK_EDITABLE (title_name_v_entry), FALSE);
+ gtk_widget_set_size_request (GTK_WIDGET (title_name_v_entry), 200, -1);
+ gtk_box_pack_start (GTK_BOX (title_hbox), title_name_v_entry, TRUE, TRUE, 0);
+
+ fileinfowin_columns_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ gtk_box_pack_start (GTK_BOX (fileinfowin_vbox), fileinfowin_columns_hbox, TRUE, TRUE, 0);
+
+ /*********************
+ *** MIDI INFO BOX ***/
+ midiinfoboxes_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+
+ /* pick the entire space if both comments and lyrics boxes are not displayed,
+ pick only required space if at least one of them is displayed */
+ if ((amidiplug_cfg_ap->ap_opts_comments_extract == 0) &&
+ (amidiplug_cfg_ap->ap_opts_lyrics_extract == 0))
+ gtk_box_pack_start (GTK_BOX (fileinfowin_columns_hbox), midiinfoboxes_vbox, TRUE, TRUE, 0);
+ else
+ gtk_box_pack_start (GTK_BOX (fileinfowin_columns_hbox), midiinfoboxes_vbox, FALSE, FALSE, 0);
+
+ info_frame_tl = gtk_label_new ("");
+ gtk_label_set_markup (GTK_LABEL (info_frame_tl), _(" MIDI Info "));
+ gtk_box_pack_start (GTK_BOX (midiinfoboxes_vbox), info_frame_tl, FALSE, FALSE, 0);
+
+ info_frame = gtk_frame_new (NULL);
+ gtk_box_pack_start (GTK_BOX (midiinfoboxes_vbox), info_frame, TRUE, TRUE, 0);
+ info_grid = gtk_grid_new();
+ gtk_grid_set_row_spacing (GTK_GRID (info_grid), 4);
+ gtk_grid_set_column_spacing (GTK_GRID (info_grid), 10);
+ gtk_container_set_border_width (GTK_CONTAINER (info_grid), 3);
+ gtk_container_add (GTK_CONTAINER (info_frame), info_grid);
+ value_gstring = g_string_new ("");
+
+ /* midi format */
+ g_string_printf (value_gstring, "type %i", mf->format);
+ i_fileinfo_grid_add_entry (_("Format:"), value_gstring->str, info_grid, 0, pangoattrlist);
+ /* midi length */
+ g_string_printf (value_gstring, "%i", (int) (mf->length / 1000));
+ i_fileinfo_grid_add_entry (_("Length (msec):"), value_gstring->str, info_grid, 1, pangoattrlist);
+ /* midi num of tracks */
+ g_string_printf (value_gstring, "%i", mf->num_tracks);
+ i_fileinfo_grid_add_entry (_("No. of Tracks:"), value_gstring->str, info_grid, 2, pangoattrlist);
+
+ /* midi bpm */
+ if (bpm > 0)
+ g_string_printf (value_gstring, "%i", bpm); /* fixed bpm */
+ else
+ g_string_printf (value_gstring, _("variable")); /* variable bpm */
+
+ i_fileinfo_grid_add_entry (_("BPM:"), value_gstring->str, info_grid, 3, pangoattrlist);
+
+ /* midi weighted average bpm */
+ if (bpm > 0)
+ g_string_printf (value_gstring, "/"); /* fixed bpm, don't care about wavg_bpm */
+ else
+ g_string_printf (value_gstring, "%i", wavg_bpm); /* variable bpm, display wavg_bpm */
+
+ i_fileinfo_grid_add_entry (_("BPM (wavg):"), value_gstring->str, info_grid, 4, pangoattrlist);
+ /* midi time division */
+ g_string_printf (value_gstring, "%i", mf->time_division);
+ i_fileinfo_grid_add_entry (_("Time Div:"), value_gstring->str, info_grid, 5, pangoattrlist);
+
+ g_string_free (value_gstring, TRUE);
+
+ /**********************************
+ *** MIDI COMMENTS/LYRICS BOXES ***/
+ miditextboxes_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+ gtk_box_pack_start (GTK_BOX (fileinfowin_columns_hbox), miditextboxes_vbox, TRUE, TRUE, 0);
+
+ text_frame_tl = gtk_label_new ("");
+ gtk_label_set_markup (GTK_LABEL (text_frame_tl),
+ _(" MIDI Comments and Lyrics "));
+ gtk_box_pack_start (GTK_BOX (miditextboxes_vbox), text_frame_tl, FALSE, FALSE, 0);
+
+ miditextboxes_paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
+ gtk_box_pack_start (GTK_BOX (miditextboxes_vbox), miditextboxes_paned, TRUE, TRUE, 0);
+
+ text_frame = gtk_frame_new (NULL);
+ gtk_paned_pack1 (GTK_PANED (miditextboxes_paned), text_frame, TRUE, TRUE);
+ text_tv = gtk_text_view_new();
+ gtk_text_view_set_editable (GTK_TEXT_VIEW (text_tv), FALSE);
+ gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (text_tv), FALSE);
+ gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (text_tv), GTK_WRAP_WORD);
+ gtk_text_view_set_right_margin (GTK_TEXT_VIEW (text_tv), 4);
+ gtk_text_view_set_left_margin (GTK_TEXT_VIEW (text_tv), 4);
+ gtk_widget_set_size_request (text_tv, 300, 113);
+ text_tv_sw = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (text_tv_sw),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+ gtk_container_add (GTK_CONTAINER (text_frame), text_tv_sw);
+ gtk_container_add (GTK_CONTAINER (text_tv_sw), text_tv);
+
+ lyrics_frame = gtk_frame_new (NULL);
+ gtk_paned_pack2 (GTK_PANED (miditextboxes_paned), lyrics_frame, TRUE, TRUE);
+ lyrics_tv = gtk_text_view_new();
+ gtk_text_view_set_editable (GTK_TEXT_VIEW (lyrics_tv), FALSE);
+ gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (lyrics_tv), FALSE);
+ gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (lyrics_tv), GTK_WRAP_WORD);
+ gtk_text_view_set_right_margin (GTK_TEXT_VIEW (lyrics_tv), 4);
+ gtk_text_view_set_left_margin (GTK_TEXT_VIEW (lyrics_tv), 4);
+ gtk_widget_set_size_request (lyrics_tv, 300, 113);
+ lyrics_tv_sw = gtk_scrolled_window_new (NULL, NULL);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (lyrics_tv_sw),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
+ gtk_container_add (GTK_CONTAINER (lyrics_frame), lyrics_tv_sw);
+ gtk_container_add (GTK_CONTAINER (lyrics_tv_sw), lyrics_tv);
+
+ text_tb = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_tv));
+ lyrics_tb = gtk_text_view_get_buffer (GTK_TEXT_VIEW (lyrics_tv));
+
+ /* call the buffer fill routine if at least one between comments and lyrics is enabled */
+ if ((amidiplug_cfg_ap->ap_opts_comments_extract > 0) ||
+ (amidiplug_cfg_ap->ap_opts_lyrics_extract > 0))
+ i_fileinfo_text_fill (mf, text_tb, lyrics_tb);
+
+ if ((amidiplug_cfg_ap->ap_opts_comments_extract > 0) &&
+ (gtk_text_buffer_get_char_count (text_tb) == 0))
+ {
+ GtkTextIter start, end;
+ GtkTextTag * tag = gtk_text_buffer_create_tag (text_tb, "italicstyle",
+ "style", PANGO_STYLE_ITALIC, NULL);
+ /*gtk_text_view_set_justification( GTK_TEXT_VIEW(text_tv), GTK_JUSTIFY_CENTER );*/
+ gtk_text_buffer_set_text (text_tb, _("* no comments available in this MIDI file *"), -1);
+ gtk_text_buffer_get_iter_at_offset (text_tb, &start, 0);
+ gtk_text_buffer_get_iter_at_offset (text_tb, &end, -1);
+ gtk_text_buffer_apply_tag (text_tb, tag, &start, &end);
+ }
 
- switch ( event->type )
+ if ((amidiplug_cfg_ap->ap_opts_lyrics_extract > 0) &&
+ (gtk_text_buffer_get_char_count (lyrics_tb) == 0))
 {
- case SND_SEQ_EVENT_META_TEXT:
- gtk_text_buffer_insert_at_cursor( text_tb , event->data.metat , strlen(event->data.metat) );
- break;
- case SND_SEQ_EVENT_META_LYRIC:
- gtk_text_buffer_insert_at_cursor( lyrics_tb , event->data.metat , strlen(event->data.metat) );
- break;
+ GtkTextIter start, end;
+ GtkTextTag * tag = gtk_text_buffer_create_tag (lyrics_tb, "italicstyle",
+ "style", PANGO_STYLE_ITALIC, NULL);
+ /*gtk_text_view_set_justification( GTK_TEXT_VIEW(lyrics_tv), GTK_JUSTIFY_CENTER );*/
+ gtk_text_buffer_set_text (lyrics_tb, _("* no lyrics available in this MIDI file *"), -1);
+ gtk_text_buffer_get_iter_at_offset (lyrics_tb, &start, 0);
+ gtk_text_buffer_get_iter_at_offset (lyrics_tb, &end, -1);
+ gtk_text_buffer_apply_tag (lyrics_tb, tag, &start, &end);
+ }
+
+ /* hide boxes for disabled options (comments and/or lyrics) */
+ if ((amidiplug_cfg_ap->ap_opts_comments_extract == 0) &&
+ (amidiplug_cfg_ap->ap_opts_lyrics_extract == 0))
+ {
+ gtk_widget_set_no_show_all (miditextboxes_vbox, TRUE);
+ gtk_widget_hide (miditextboxes_vbox);
+ }
+ else if (amidiplug_cfg_ap->ap_opts_comments_extract == 0)
+ {
+ gtk_widget_set_no_show_all (text_frame, TRUE);
+ gtk_widget_hide (text_frame);
+ }
+ else if (amidiplug_cfg_ap->ap_opts_lyrics_extract == 0)
+ {
+ gtk_widget_set_no_show_all (lyrics_frame, TRUE);
+ gtk_widget_hide (lyrics_frame);
 }
- }
-}
 
+ /**************
+ *** FOOTER ***/
+ footer_hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (footer_hbbox), GTK_BUTTONBOX_END);
+ footer_bclose = gtk_button_new_from_stock (GTK_STOCK_CLOSE);
+ g_signal_connect (G_OBJECT (footer_bclose), "clicked", G_CALLBACK (i_fileinfo_ev_close), fileinfowin);
+ gtk_container_add (GTK_CONTAINER (footer_hbbox), footer_bclose);
+ gtk_box_pack_start (GTK_BOX (fileinfowin_vbox), footer_hbbox, FALSE, FALSE, 0);
 
-void i_fileinfo_gui( const gchar * filename_uri )
-{
- static GtkWidget *fileinfowin = NULL;
- GtkWidget *fileinfowin_vbox, *fileinfowin_columns_hbox;
- GtkWidget *midiinfoboxes_vbox, *miditextboxes_vbox, *miditextboxes_paned;
- GtkWidget *title_hbox, *title_icon_image, *title_name_f_label, *title_name_v_entry;
- GtkWidget *info_frame, *info_frame_tl, *info_grid;
- GtkWidget *text_frame, *text_frame_tl, *text_tv, *text_tv_sw;
- GtkWidget *lyrics_frame, *lyrics_tv, *lyrics_tv_sw;
- GtkTextBuffer *text_tb, *lyrics_tb;
- GtkWidget *footer_hbbox, *footer_bclose;
- GdkPixbuf *title_icon_pixbuf;
- PangoAttrList *pangoattrlist;
- PangoAttribute *pangoattr;
- GString *value_gstring;
- gchar *title , *filename, *filename_utf8;
- gint bpm = 0, wavg_bpm = 0;
- midifile_t *mf;
-
- if ( fileinfowin )
- return;
 
- mf = g_malloc(sizeof(midifile_t));
+ /* utf8-ize filename and set window title */
+ filename = g_filename_from_uri (filename_uri, NULL, NULL);
 
- /****************** midifile parser ******************/
- if ( !i_midi_parse_from_filename( filename_uri , mf ) )
- return;
- /* midifile is filled with information at this point,
- bpm information is needed too */
- i_midi_get_bpm( mf , &bpm , &wavg_bpm );
- /*****************************************************/
-
- fileinfowin = gtk_window_new( GTK_WINDOW_TOPLEVEL );
- gtk_window_set_type_hint( GTK_WINDOW(fileinfowin), GDK_WINDOW_TYPE_HINT_DIALOG );
- gtk_window_set_position( GTK_WINDOW(fileinfowin) , GTK_WIN_POS_CENTER );
- g_signal_connect( G_OBJECT(fileinfowin) , "destroy" , G_CALLBACK(i_fileinfo_ev_destroy) , mf );
- g_signal_connect( G_OBJECT(fileinfowin) , "destroy" , G_CALLBACK(gtk_widget_destroyed) , &fileinfowin );
- gtk_container_set_border_width( GTK_CONTAINER(fileinfowin), 10 );
-
- fileinfowin_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10 );
- gtk_container_add( GTK_CONTAINER(fileinfowin) , fileinfowin_vbox );
-
- /* pango attributes */
- pangoattrlist = pango_attr_list_new();
- pangoattr = pango_attr_weight_new( PANGO_WEIGHT_BOLD );
- pangoattr->start_index = 0;
- pangoattr->end_index = G_MAXINT;
- pango_attr_list_insert( pangoattrlist , pangoattr );
-
- /******************
- *** TITLE LINE ***/
- title_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5 );
- gtk_box_pack_start( GTK_BOX(fileinfowin_vbox) , title_hbox , FALSE , FALSE , 0 );
-
- title_icon_pixbuf = gdk_pixbuf_new_from_xpm_data( (const gchar **)amidiplug_xpm_midiicon );
- title_icon_image = gtk_image_new_from_pixbuf( title_icon_pixbuf );
- g_object_unref( title_icon_pixbuf );
- gtk_misc_set_alignment( GTK_MISC(title_icon_image) , 0 , 0 );
- gtk_box_pack_start( GTK_BOX(title_hbox) , title_icon_image , FALSE , FALSE , 0 );
-
- title_name_f_label = gtk_label_new( _("Name:") );
- gtk_label_set_attributes( GTK_LABEL(title_name_f_label) , pangoattrlist );
- gtk_box_pack_start( GTK_BOX(title_hbox) , title_name_f_label , FALSE , FALSE , 0 );
-
- title_name_v_entry = gtk_entry_new();
- gtk_editable_set_editable( GTK_EDITABLE(title_name_v_entry) , FALSE );
- gtk_widget_set_size_request( GTK_WIDGET(title_name_v_entry) , 200 , -1 );
- gtk_box_pack_start(GTK_BOX(title_hbox) , title_name_v_entry , TRUE , TRUE , 0 );
-
- fileinfowin_columns_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2 );
- gtk_box_pack_start( GTK_BOX(fileinfowin_vbox) , fileinfowin_columns_hbox , TRUE , TRUE , 0 );
-
- /*********************
- *** MIDI INFO BOX ***/
- midiinfoboxes_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2 );
- /* pick the entire space if both comments and lyrics boxes are not displayed,
- pick only required space if at least one of them is displayed */
- if (( amidiplug_cfg_ap.ap_opts_comments_extract == 0 ) &&
- ( amidiplug_cfg_ap.ap_opts_lyrics_extract == 0 ))
- gtk_box_pack_start( GTK_BOX(fileinfowin_columns_hbox) , midiinfoboxes_vbox , TRUE , TRUE , 0 );
- else
- gtk_box_pack_start( GTK_BOX(fileinfowin_columns_hbox) , midiinfoboxes_vbox , FALSE , FALSE , 0 );
-
- info_frame_tl = gtk_label_new( "" );
- gtk_label_set_markup( GTK_LABEL(info_frame_tl) , _(" MIDI Info ") );
- gtk_box_pack_start( GTK_BOX(midiinfoboxes_vbox) , info_frame_tl , FALSE , FALSE , 0 );
-
- info_frame = gtk_frame_new( NULL );
- gtk_box_pack_start( GTK_BOX(midiinfoboxes_vbox) , info_frame , TRUE , TRUE , 0 );
- info_grid = gtk_grid_new();
- gtk_grid_set_row_spacing( GTK_GRID(info_grid) , 4 );
- gtk_grid_set_column_spacing( GTK_GRID(info_grid) , 10 );
- gtk_container_set_border_width( GTK_CONTAINER(info_grid) , 3 );
- gtk_container_add( GTK_CONTAINER(info_frame) , info_grid );
- value_gstring = g_string_new( "" );
-
- /* midi format */
- G_STRING_PRINTF( value_gstring , "type %i" , mf->format );
- i_fileinfo_grid_add_entry( _("Format:") , value_gstring->str , info_grid , 0 , pangoattrlist );
- /* midi length */
- G_STRING_PRINTF( value_gstring , "%i" , (gint)(mf->length / 1000) );
- i_fileinfo_grid_add_entry( _("Length (msec):") , value_gstring->str , info_grid , 1 , pangoattrlist );
- /* midi num of tracks */
- G_STRING_PRINTF( value_gstring , "%i" , mf->num_tracks );
- i_fileinfo_grid_add_entry( _("No. of Tracks:") , value_gstring->str , info_grid , 2 , pangoattrlist );
- /* midi bpm */
- if ( bpm > 0 )
- G_STRING_PRINTF( value_gstring , "%i" , bpm ); /* fixed bpm */
- else
- G_STRING_PRINTF( value_gstring , _("variable") ); /* variable bpm */
- i_fileinfo_grid_add_entry( _("BPM:") , value_gstring->str , info_grid , 3 , pangoattrlist );
- /* midi weighted average bpm */
- if ( bpm > 0 )
- G_STRING_PRINTF( value_gstring , "/" ); /* fixed bpm, don't care about wavg_bpm */
- else
- G_STRING_PRINTF( value_gstring , "%i" , wavg_bpm ); /* variable bpm, display wavg_bpm */
- i_fileinfo_grid_add_entry( _("BPM (wavg):") , value_gstring->str , info_grid , 4 , pangoattrlist );
- /* midi time division */
- G_STRING_PRINTF( value_gstring , "%i" , mf->time_division );
- i_fileinfo_grid_add_entry( _("Time Div:") , value_gstring->str , info_grid , 5 , pangoattrlist );
-
- g_string_free( value_gstring , TRUE );
-
- /**********************************
- *** MIDI COMMENTS/LYRICS BOXES ***/
- miditextboxes_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2 );
- gtk_box_pack_start( GTK_BOX(fileinfowin_columns_hbox) , miditextboxes_vbox , TRUE , TRUE , 0 );
-
- text_frame_tl = gtk_label_new( "" );
- gtk_label_set_markup( GTK_LABEL(text_frame_tl) ,
- _(" MIDI Comments and Lyrics ") );
- gtk_box_pack_start( GTK_BOX(miditextboxes_vbox) , text_frame_tl , FALSE , FALSE , 0 );
-
- miditextboxes_paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
- gtk_box_pack_start( GTK_BOX(miditextboxes_vbox) , miditextboxes_paned , TRUE , TRUE , 0 );
-
- text_frame = gtk_frame_new( NULL );
- gtk_paned_pack1( GTK_PANED(miditextboxes_paned) , text_frame , TRUE , TRUE );
- text_tv = gtk_text_view_new();
- gtk_text_view_set_editable( GTK_TEXT_VIEW(text_tv) , FALSE );
- gtk_text_view_set_cursor_visible( GTK_TEXT_VIEW(text_tv) , FALSE );
- gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW(text_tv) , GTK_WRAP_WORD );
- gtk_text_view_set_right_margin( GTK_TEXT_VIEW(text_tv) , 4 );
- gtk_text_view_set_left_margin( GTK_TEXT_VIEW(text_tv) , 4 );
- gtk_widget_set_size_request( text_tv , 300 , 113 );
- text_tv_sw = gtk_scrolled_window_new( NULL , NULL );
- gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(text_tv_sw) ,
- GTK_POLICY_AUTOMATIC , GTK_POLICY_ALWAYS );
- gtk_container_add( GTK_CONTAINER(text_frame) , text_tv_sw );
- gtk_container_add( GTK_CONTAINER(text_tv_sw) , text_tv );
-
- lyrics_frame = gtk_frame_new( NULL );
- gtk_paned_pack2( GTK_PANED(miditextboxes_paned) , lyrics_frame , TRUE , TRUE );
- lyrics_tv = gtk_text_view_new();
- gtk_text_view_set_editable( GTK_TEXT_VIEW(lyrics_tv) , FALSE );
- gtk_text_view_set_cursor_visible( GTK_TEXT_VIEW(lyrics_tv) , FALSE );
- gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW(lyrics_tv) , GTK_WRAP_WORD );
- gtk_text_view_set_right_margin( GTK_TEXT_VIEW(lyrics_tv) , 4 );
- gtk_text_view_set_left_margin( GTK_TEXT_VIEW(lyrics_tv) , 4 );
- gtk_widget_set_size_request( lyrics_tv , 300 , 113 );
- lyrics_tv_sw = gtk_scrolled_window_new( NULL , NULL );
- gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(lyrics_tv_sw) ,
- GTK_POLICY_AUTOMATIC , GTK_POLICY_ALWAYS );
- gtk_container_add( GTK_CONTAINER(lyrics_frame) , lyrics_tv_sw );
- gtk_container_add( GTK_CONTAINER(lyrics_tv_sw) , lyrics_tv );
-
- text_tb = gtk_text_view_get_buffer( GTK_TEXT_VIEW(text_tv) );
- lyrics_tb = gtk_text_view_get_buffer( GTK_TEXT_VIEW(lyrics_tv) );
-
- /* call the buffer fill routine if at least one between comments and lyrics is enabled */
- if (( amidiplug_cfg_ap.ap_opts_comments_extract > 0 ) ||
- ( amidiplug_cfg_ap.ap_opts_lyrics_extract > 0 ))
- i_fileinfo_text_fill( mf , text_tb , lyrics_tb );
-
- if (( amidiplug_cfg_ap.ap_opts_comments_extract > 0 ) &&
- ( gtk_text_buffer_get_char_count( text_tb ) == 0 ))
- {
- GtkTextIter start, end;
- GtkTextTag *tag = gtk_text_buffer_create_tag( text_tb , "italicstyle" ,
- "style" , PANGO_STYLE_ITALIC , NULL );
- /*gtk_text_view_set_justification( GTK_TEXT_VIEW(text_tv) , GTK_JUSTIFY_CENTER );*/
- gtk_text_buffer_set_text( text_tb , _("* no comments available in this MIDI file *") , -1 );
- gtk_text_buffer_get_iter_at_offset( text_tb , &start , 0 );
- gtk_text_buffer_get_iter_at_offset( text_tb , &end , -1 );
- gtk_text_buffer_apply_tag( text_tb , tag , &start , &end );
- }
-
- if (( amidiplug_cfg_ap.ap_opts_lyrics_extract > 0 ) &&
- ( gtk_text_buffer_get_char_count( lyrics_tb ) == 0 ))
- {
- GtkTextIter start, end;
- GtkTextTag *tag = gtk_text_buffer_create_tag( lyrics_tb , "italicstyle" ,
- "style" , PANGO_STYLE_ITALIC , NULL );
- /*gtk_text_view_set_justification( GTK_TEXT_VIEW(lyrics_tv) , GTK_JUSTIFY_CENTER );*/
- gtk_text_buffer_set_text( lyrics_tb , _("* no lyrics available in this MIDI file *") , -1 );
- gtk_text_buffer_get_iter_at_offset( lyrics_tb , &start , 0 );
- gtk_text_buffer_get_iter_at_offset( lyrics_tb , &end , -1 );
- gtk_text_buffer_apply_tag( lyrics_tb , tag , &start , &end );
- }
-
- /* hide boxes for disabled options (comments and/or lyrics) */
- if (( amidiplug_cfg_ap.ap_opts_comments_extract == 0 ) &&
- ( amidiplug_cfg_ap.ap_opts_lyrics_extract == 0 ))
- {
- gtk_widget_set_no_show_all( miditextboxes_vbox , TRUE );
- gtk_widget_hide( miditextboxes_vbox );
- }
- else if ( amidiplug_cfg_ap.ap_opts_comments_extract == 0 )
- {
- gtk_widget_set_no_show_all( text_frame , TRUE );
- gtk_widget_hide( text_frame );
- }
- else if ( amidiplug_cfg_ap.ap_opts_lyrics_extract == 0 )
- {
- gtk_widget_set_no_show_all( lyrics_frame , TRUE );
- gtk_widget_hide( lyrics_frame );
- }
-
- /**************
- *** FOOTER ***/
- footer_hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_button_box_set_layout( GTK_BUTTON_BOX(footer_hbbox) , GTK_BUTTONBOX_END );
- footer_bclose = gtk_button_new_from_stock( GTK_STOCK_CLOSE );
- g_signal_connect( G_OBJECT(footer_bclose) , "clicked" , G_CALLBACK(i_fileinfo_ev_close) , fileinfowin );
- gtk_container_add( GTK_CONTAINER(footer_hbbox) , footer_bclose );
- gtk_box_pack_start( GTK_BOX(fileinfowin_vbox) , footer_hbbox , FALSE , FALSE , 0 );
-
-
- /* utf8-ize filename and set window title */
- filename = g_filename_from_uri( filename_uri , NULL , NULL );
- if ( !filename )
- filename = g_strdup( filename_uri );
- filename_utf8 = g_strdup(g_filename_to_utf8( filename , -1 , NULL , NULL , NULL ));
- if ( !filename_utf8 )
- {
- /* utf8 fallback */
- gchar *chr , *convert_str = g_strdup( filename );
- for ( chr = convert_str ; *chr ; chr++ )
+ if (!filename)
+ filename = g_strdup (filename_uri);
+
+ filename_utf8 = g_strdup (g_filename_to_utf8 (filename, -1, NULL, NULL, NULL));
+
+ if (!filename_utf8)
 {
- if ( *chr & 0x80 )
- *chr = '?';
+ /* utf8 fallback */
+ char * chr, *convert_str = g_strdup (filename);
+
+ for (chr = convert_str ; *chr ; chr++)
+ {
+ if (*chr & 0x80)
+ *chr = '?';
+ }
+
+ filename_utf8 = g_strconcat (convert_str, _(" (invalid UTF-8)"), NULL);
+ g_free (convert_str);
 }
- filename_utf8 = g_strconcat( convert_str , _(" (invalid UTF-8)") , NULL );
- g_free(convert_str);
- }
-
- title = g_path_get_basename (filename_utf8);
- gtk_window_set_title( GTK_WINDOW(fileinfowin) , title);
- g_free(title);
- /* set the text for the filename header too */
- gtk_entry_set_text( GTK_ENTRY(title_name_v_entry) , filename_utf8 );
- gtk_editable_set_position( GTK_EDITABLE(title_name_v_entry) , -1 );
- g_free(filename_utf8);
- g_free(filename);
-
- gtk_widget_grab_focus( GTK_WIDGET(footer_bclose) );
- gtk_widget_show_all( fileinfowin );
+
+ title = g_path_get_basename (filename_utf8);
+ gtk_window_set_title (GTK_WINDOW (fileinfowin), title);
+ g_free (title);
+ /* set the text for the filename header too */
+ gtk_entry_set_text (GTK_ENTRY (title_name_v_entry), filename_utf8);
+ gtk_editable_set_position (GTK_EDITABLE (title_name_v_entry), -1);
+ g_free (filename_utf8);
+ g_free (filename);
+
+ gtk_widget_grab_focus (GTK_WIDGET (footer_bclose));
+ gtk_widget_show_all (fileinfowin);
 }

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_fileinfo.h -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_fileinfo.h Changed

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_midi.c -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_midi.c Changed

@@ -21,789 +21,870 @@
 *
 */
 
-
 #include "i_midi.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "i_common.h"
 #include "i_configure.h"
 
-#define ERRMSG_MIDITRACK() { g_warning( "%s: invalid MIDI data (offset %#x)" , mf->file_name , mf->file_offset ); return 0; }
+#define ERRMSG_MIDITRACK() { fprintf(stderr, "%s: invalid MIDI data (offset %#x)", mf->file_name, mf->file_offset ); return 0; }
 
 
 /* skip a certain number of bytes */
-void i_midi_file_skip_bytes( midifile_t * mf , gint bytes )
+void i_midi_file_skip_bytes (midifile_t * mf, int bytes)
 {
- while (bytes > 0)
- {
- i_midi_file_read_byte(mf);
- --bytes;
- }
+ while (bytes > 0)
+ {
+ i_midi_file_read_byte (mf);
+ --bytes;
+ }
 }
 
 
 /* reads a single byte */
-gint i_midi_file_read_byte( midifile_t * mf )
+int i_midi_file_read_byte (midifile_t * mf)
 {
- ++mf->file_offset;
- return VFS_GETC(mf->file_pointer);
+ ++mf->file_offset;
+ return vfs_getc (mf->file_pointer);
 }
 
 
 /* reads a little-endian 32-bit integer */
-gint i_midi_file_read_32_le( midifile_t * mf )
+int i_midi_file_read_32_le (midifile_t * mf)
 {
- gint value;
- value = i_midi_file_read_byte(mf);
- value |= i_midi_file_read_byte(mf) << 8;
- value |= i_midi_file_read_byte(mf) << 16;
- value |= i_midi_file_read_byte(mf) << 24;
- return !VFS_FEOF(mf->file_pointer) ? value : -1;
+ int value;
+ value = i_midi_file_read_byte (mf);
+ value |= i_midi_file_read_byte (mf) << 8;
+ value |= i_midi_file_read_byte (mf) << 16;
+ value |= i_midi_file_read_byte (mf) << 24;
+ return !vfs_feof (mf->file_pointer) ? value : -1;
 }
 
 
 /* reads a 4-character identifier */
-gint i_midi_file_read_id( midifile_t * mf )
+int i_midi_file_read_id (midifile_t * mf)
 {
- return i_midi_file_read_32_le(mf);
+ return i_midi_file_read_32_le (mf);
 }
 
 
 /* reads a fixed-size big-endian number */
-gint i_midi_file_read_int( midifile_t * mf , gint bytes )
+int i_midi_file_read_int (midifile_t * mf, int bytes)
 {
- gint c, value = 0;
+ int c, value = 0;
+
+ do
+ {
+ c = i_midi_file_read_byte (mf);
 
- do {
- c = i_midi_file_read_byte(mf);
- if (c == EOF) return -1;
- value = (value << 8) | c;
- } while (--bytes);
+ if (c == EOF) return -1;
 
- return value;
+ value = (value << 8) | c;
+ }
+ while (--bytes);
+
+ return value;
 }
 
 
 /* reads a variable-length number */
-gint i_midi_file_read_var( midifile_t * mf )
+int i_midi_file_read_var (midifile_t * mf)
 {
- gint value, c;
-
- c = i_midi_file_read_byte(mf);
- value = c & 0x7f;
- if (c & 0x80) {
- c = i_midi_file_read_byte(mf);
- value = (value << 7) | (c & 0x7f);
- if (c & 0x80) {
- c = i_midi_file_read_byte(mf);
- value = (value << 7) | (c & 0x7f);
- if (c & 0x80) {
- c = i_midi_file_read_byte(mf);
- value = (value << 7) | c;
+ int value, c;
+
+ c = i_midi_file_read_byte (mf);
+ value = c & 0x7f;
+
+ if (c & 0x80)
+ {
+ c = i_midi_file_read_byte (mf);
+ value = (value << 7) | (c & 0x7f);
+
 if (c & 0x80)
- return -1;
- }
+ {
+ c = i_midi_file_read_byte (mf);
+ value = (value << 7) | (c & 0x7f);
+
+ if (c & 0x80)
+ {
+ c = i_midi_file_read_byte (mf);
+ value = (value << 7) | c;
+
+ if (c & 0x80)
+ return -1;
+ }
+ }
 }
- }
- return value;
+
+ return value;
 }
 
 
 /* allocates a new event */
-midievent_t * i_midi_file_new_event(midifile_track_t * track, gint sysex_length)
+midievent_t * i_midi_file_new_event (midifile_track_t * track, int sysex_length)
 {
- midievent_t * event;
+ midievent_t * event;
+
+ event = malloc (sizeof (midievent_t));
+ event->sysex = sysex_length ? malloc (sysex_length) : NULL;
+ event->next = NULL;
 
- event = g_malloc (sizeof (midievent_t));
- event->sysex = sysex_length ? g_malloc (sysex_length) : NULL;
- event->next = NULL;
+ /* append at the end of the track's linked list */
+ if (track->current_event)
+ track->current_event->next = event;
+ else
+ track->first_event = event;
 
- /* append at the end of the track's linked list */
- if (track->current_event)
- track->current_event->next = event;
- else
- track->first_event = event;
- track->current_event = event;
+ track->current_event = event;
 
- return event;
+ return event;
 }
 
 
 /* reads one complete track from the file */
-gint i_midi_file_read_track( midifile_t * mf , midifile_track_t * track ,
- gint track_end , gint port_count )
+int i_midi_file_read_track (midifile_t * mf, midifile_track_t * track,
+ int track_end, int port_count)
 {
- gint tick = 0;
- guchar last_cmd = 0;
- guchar port = 0;
-
- /* the current file position is after the track ID and length */
- while ( mf->file_offset < track_end )
- {
- guchar cmd;
- midievent_t *event;
- gint delta_ticks, len, c;
-
- delta_ticks = i_midi_file_read_var(mf);
- if ( delta_ticks < 0 )
- break;
- tick += delta_ticks;
-
- c = i_midi_file_read_byte(mf);
- if (c < 0)
- break;
-
- if (c & 0x80) {
- /* have command */
- cmd = c;
- if (cmd < 0xf0)
- last_cmd = cmd;
- } else {
- /* running status */
- if (VFS_UNGETC (c, mf->file_pointer) < 0)
- break;
- mf->file_offset--;
- cmd = last_cmd;
- if (!cmd)
- ERRMSG_MIDITRACK();
- }
+ int tick = 0;
+ unsigned char last_cmd = 0;
+ unsigned char port = 0;
 
- switch (cmd >> 4)
+ /* the current file position is after the track ID and length */
+ while (mf->file_offset < track_end)
 {
- /* maps SMF events to ALSA sequencer events */
- static guchar cmd_type[] = {
- [0x8] = SND_SEQ_EVENT_NOTEOFF,
- [0x9] = SND_SEQ_EVENT_NOTEON,
- [0xa] = SND_SEQ_EVENT_KEYPRESS,
- [0xb] = SND_SEQ_EVENT_CONTROLLER,
- [0xc] = SND_SEQ_EVENT_PGMCHANGE,
- [0xd] = SND_SEQ_EVENT_CHANPRESS,
- [0xe] = SND_SEQ_EVENT_PITCHBEND
- };
-
- case 0x8: /* channel msg with 2 parameter bytes */
- case 0x9:
- case 0xa:
- {
- event = i_midi_file_new_event(track, 0);
- event->type = cmd_type[cmd >> 4];
- event->port = port;
- event->tick = tick;
- event->data.d[0] = cmd & 0x0f;
- /* if this note is not in standard drum channel (10), apply transpose */
- if ( event->data.d[0] != 9 )
+ unsigned char cmd;
+ midievent_t * event;
+ int delta_ticks, len, c;
+
+ delta_ticks = i_midi_file_read_var (mf);
+
+ if (delta_ticks < 0)
+ break;
+
+ tick += delta_ticks;
+
+ c = i_midi_file_read_byte (mf);
+
+ if (c < 0)
+ break;
+
+ if (c & 0x80)
 {
- gint data_tr = (i_midi_file_read_byte(mf) & 0x7f) +
- amidiplug_cfg_ap.ap_opts_transpose_value;
- if ( data_tr > 127 ) data_tr = 127;
- else if ( data_tr < 0 ) data_tr = 0;
- event->data.d[1] = (guchar)data_tr;
+ /* have command */
+ cmd = c;
+
+ if (cmd < 0xf0)
+ last_cmd = cmd;
 }
- else /* this note is in standard drum channel (10), apply drum shift */
+ else
 {
- gint data_ds = (i_midi_file_read_byte(mf) & 0x7f) +
- amidiplug_cfg_ap.ap_opts_drumshift_value; /* always > 0 */
- if ( data_ds > 127 ) data_ds -= 127;
- event->data.d[1] = (guchar)data_ds;
+ /* running status */
+ if (vfs_ungetc (c, mf->file_pointer) < 0)
+ break;
+
+ mf->file_offset--;
+ cmd = last_cmd;
+
+ if (!cmd)
+ ERRMSG_MIDITRACK();
 }
- event->data.d[2] = i_midi_file_read_byte(mf) & 0x7f;
- }
- break;
-
- case 0xb: /* channel msg with 2 parameter bytes */
- case 0xe:
- {
- event = i_midi_file_new_event(track, 0);
- event->type = cmd_type[cmd >> 4];
- event->port = port;
- event->tick = tick;
- event->data.d[0] = cmd & 0x0f;
- event->data.d[1] = i_midi_file_read_byte(mf) & 0x7f;
- event->data.d[2] = i_midi_file_read_byte(mf) & 0x7f;
- }
- break;
-
- case 0xc: /* channel msg with 1 parameter byte */
- case 0xd:
- {
- event = i_midi_file_new_event(track, 0);
- event->type = cmd_type[cmd >> 4];
- event->port = port;
- event->tick = tick;
- event->data.d[0] = cmd & 0x0f;
- event->data.d[1] = i_midi_file_read_byte(mf) & 0x7f;
- }
- break;
-
- case 0xf:
- {
- switch (cmd)
+
+ switch (cmd >> 4)
 {
- case 0xf0: /* sysex */
- case 0xf7: /* continued sysex, or escaped commands */
- {
- len = i_midi_file_read_var(mf);
- if (len < 0)
- ERRMSG_MIDITRACK();
- if (cmd == 0xf0)
- ++len;
- event = i_midi_file_new_event(track, len);
- event->type = SND_SEQ_EVENT_SYSEX;
+ /* maps SMF events to ALSA sequencer events */
+ static unsigned char cmd_type[] =
+ {
+ [0x8] = SND_SEQ_EVENT_NOTEOFF,
+ [0x9] = SND_SEQ_EVENT_NOTEON,
+ [0xa] = SND_SEQ_EVENT_KEYPRESS,
+ [0xb] = SND_SEQ_EVENT_CONTROLLER,
+ [0xc] = SND_SEQ_EVENT_PGMCHANGE,
+ [0xd] = SND_SEQ_EVENT_CHANPRESS,
+ [0xe] = SND_SEQ_EVENT_PITCHBEND
+ };
+
+ case 0x8: /* channel msg with 2 parameter bytes */
+ case 0x9:
+ case 0xa:
+ {
+ event = i_midi_file_new_event (track, 0);
+ event->type = cmd_type[cmd >> 4];
 event->port = port;
 event->tick = tick;
- event->data.length = len;
- if (cmd == 0xf0) {
- event->sysex[0] = 0xf0;
- c = 1;
- } else {
- c = 0;
+ event->data.d[0] = cmd & 0x0f;
+
+ /* if this note is not in standard drum channel (10), apply transpose */
+ if (event->data.d[0] != 9)
+ {
+ int data_tr = (i_midi_file_read_byte (mf) & 0x7f) +
+ amidiplug_cfg_ap->ap_opts_transpose_value;
+
+ if (data_tr > 127) data_tr = 127;
+ else if (data_tr < 0) data_tr = 0;
+
+ event->data.d[1] = (unsigned char) data_tr;
 }
- for (; c < len; ++c)
- event->sysex[c] = i_midi_file_read_byte(mf);
- }
- break;
-
- case 0xff: /* meta event */
- {
- c = i_midi_file_read_byte(mf);
- len = i_midi_file_read_var(mf);
- if (len < 0)
- ERRMSG_MIDITRACK();
-
- switch (c)
+ else /* this note is in standard drum channel (10), apply drum shift */
 {
- case 0x21: /* port number */
- {
- if (len < 1)
- ERRMSG_MIDITRACK();
- port = i_midi_file_read_byte(mf) % port_count;
- i_midi_file_skip_bytes(mf,(len - 1));
- }
- break;
-
- case 0x2f: /* end of track */
- {
- track->end_tick = tick;
- i_midi_file_skip_bytes(mf,(track_end - mf->file_offset));
- return 1;
- }
-
- case 0x51: /* tempo */
- {
- if (len < 3)
- ERRMSG_MIDITRACK();
- if (mf->smpte_timing) {
- /* SMPTE timing doesn't change */
- i_midi_file_skip_bytes(mf,len);
- } else {
- event = i_midi_file_new_event(track, 0);
- event->type = SND_SEQ_EVENT_TEMPO;
- event->port = port;
- event->tick = tick;
- event->data.tempo = i_midi_file_read_byte(mf) << 16;
- event->data.tempo |= i_midi_file_read_byte(mf) << 8;
- event->data.tempo |= i_midi_file_read_byte(mf);
- i_midi_file_skip_bytes(mf,(len - 3));
- }
- }
- break;
+ int data_ds = (i_midi_file_read_byte (mf) & 0x7f) +
+ amidiplug_cfg_ap->ap_opts_drumshift_value; /* always > 0 */
 
- case 0x01: /* text comments */
- {
- if ( amidiplug_cfg_ap.ap_opts_comments_extract > 0 )
- {
- gint ic = 0;
- if (len < 1)
+ if (data_ds > 127) data_ds -= 127;
+
+ event->data.d[1] = (unsigned char) data_ds;
+ }
+
+ event->data.d[2] = i_midi_file_read_byte (mf) & 0x7f;
+ }
+ break;
+
+ case 0xb: /* channel msg with 2 parameter bytes */
+ case 0xe:
+ {
+ event = i_midi_file_new_event (track, 0);
+ event->type = cmd_type[cmd >> 4];
+ event->port = port;
+ event->tick = tick;
+ event->data.d[0] = cmd & 0x0f;
+ event->data.d[1] = i_midi_file_read_byte (mf) & 0x7f;
+ event->data.d[2] = i_midi_file_read_byte (mf) & 0x7f;
+ }
+ break;
+
+ case 0xc: /* channel msg with 1 parameter byte */
+ case 0xd:
+ {
+ event = i_midi_file_new_event (track, 0);
+ event->type = cmd_type[cmd >> 4];
+ event->port = port;
+ event->tick = tick;
+ event->data.d[0] = cmd & 0x0f;
+ event->data.d[1] = i_midi_file_read_byte (mf) & 0x7f;
+ }
+ break;
+
+ case 0xf:
+ {
+ switch (cmd)
+ {
+ case 0xf0: /* sysex */
+ case 0xf7: /* continued sysex, or escaped commands */
+ {
+ len = i_midi_file_read_var (mf);
+
+ if (len < 0)
 ERRMSG_MIDITRACK();
- event = i_midi_file_new_event(track, 0);
- event->type = SND_SEQ_EVENT_META_TEXT;
- event->tick = tick;
- event->data.metat = g_new0( gchar , len + 1 );
- for ( ic = 0 ; ic < len ; ic++ )
- event->data.metat[ic] = i_midi_file_read_byte(mf);
- event->data.metat[len] = '\0';
+
+ if (cmd == 0xf0)
+ ++len;
+
+ event = i_midi_file_new_event (track, len);
+ event->type = SND_SEQ_EVENT_SYSEX;
+ event->port = port;
+ event->tick = tick;
+ event->data.length = len;
+
+ if (cmd == 0xf0)
+ {
+ event->sysex[0] = 0xf0;
+ c = 1;
 }
 else
- i_midi_file_skip_bytes(mf,len);
- }
- break;
-
- case 0x05: /* lyrics */
- {
- if ( amidiplug_cfg_ap.ap_opts_lyrics_extract > 0 )
 {
- gint ic = 0;
- if (len < 1)
+ c = 0;
+ }
+
+ for (; c < len; ++c)
+ event->sysex[c] = i_midi_file_read_byte (mf);
+ }
+ break;
+
+ case 0xff: /* meta event */
+ {
+ c = i_midi_file_read_byte (mf);
+ len = i_midi_file_read_var (mf);
+
+ if (len < 0)
 ERRMSG_MIDITRACK();
- event = i_midi_file_new_event(track, 0);
- event->type = SND_SEQ_EVENT_META_LYRIC;
- event->tick = tick;
- event->data.metat = g_new0( gchar , len + 1 );
- for ( ic = 0 ; ic < len ; ic++ )
- event->data.metat[ic] = i_midi_file_read_byte(mf);
- event->data.metat[len] = '\0';
+
+ switch (c)
+ {
+ case 0x21: /* port number */
+ {
+ if (len < 1)
+ ERRMSG_MIDITRACK();
+
+ port = i_midi_file_read_byte (mf) % port_count;
+ i_midi_file_skip_bytes (mf, (len - 1));
+ }
+ break;
+
+ case 0x2f: /* end of track */
+ {
+ track->end_tick = tick;
+ i_midi_file_skip_bytes (mf, (track_end - mf->file_offset));
+ return 1;
+ }
+
+ case 0x51: /* tempo */
+ {
+ if (len < 3)
+ ERRMSG_MIDITRACK();
+
+ if (mf->smpte_timing)
+ {
+ /* SMPTE timing doesn't change */
+ i_midi_file_skip_bytes (mf,len);
+ }
+ else
+ {
+ event = i_midi_file_new_event (track, 0);
+ event->type = SND_SEQ_EVENT_TEMPO;
+ event->port = port;
+ event->tick = tick;
+ event->data.tempo = i_midi_file_read_byte (mf) << 16;
+ event->data.tempo |= i_midi_file_read_byte (mf) << 8;
+ event->data.tempo |= i_midi_file_read_byte (mf);
+ i_midi_file_skip_bytes (mf, (len - 3));
+ }
+ }
+ break;
+
+ case 0x01: /* text comments */
+ {
+ if (amidiplug_cfg_ap->ap_opts_comments_extract > 0)
+ {
+ int ic = 0;
+
+ if (len < 1)
+ ERRMSG_MIDITRACK();
+
+ event = i_midi_file_new_event (track, 0);
+ event->type = SND_SEQ_EVENT_META_TEXT;
+ event->tick = tick;
+ event->data.metat = malloc (len + 1);
+
+ for (ic = 0 ; ic < len ; ic++)
+ event->data.metat[ic] = i_midi_file_read_byte (mf);
+
+ event->data.metat[len] = '\0';
+ }
+ else
+ i_midi_file_skip_bytes (mf,len);
+ }
+ break;
+
+ case 0x05: /* lyrics */
+ {
+ if (amidiplug_cfg_ap->ap_opts_lyrics_extract > 0)
+ {
+ int ic = 0;
+
+ if (len < 1)
+ ERRMSG_MIDITRACK();
+
+ event = i_midi_file_new_event (track, 0);
+ event->type = SND_SEQ_EVENT_META_LYRIC;
+ event->tick = tick;
+ event->data.metat = malloc (len + 1);
+
+ for (ic = 0 ; ic < len ; ic++)
+ event->data.metat[ic] = i_midi_file_read_byte (mf);
+
+ event->data.metat[len] = '\0';
+ }
+ else
+ i_midi_file_skip_bytes (mf,len);
+ }
+ break;
+
+ default: /* ignore all other meta events */
+ {
+ i_midi_file_skip_bytes (mf,len);
+ }
+ break;
 }
- else
- i_midi_file_skip_bytes(mf,len);
- }
- break;
-
- default: /* ignore all other meta events */
- {
- i_midi_file_skip_bytes(mf,len);
- }
- break;
 }
- }
- break;
+ break;
 
- default: /* invalid Fx command */
- ERRMSG_MIDITRACK();
+ default: /* invalid Fx command */
+ ERRMSG_MIDITRACK();
+ }
 }
- }
- break;
+ break;
 
- default: /* cannot happen */
- ERRMSG_MIDITRACK();
+ default: /* cannot happen */
+ ERRMSG_MIDITRACK();
+ }
 }
- }
- ERRMSG_MIDITRACK();
+
+ ERRMSG_MIDITRACK();
 }
 
 
 /* read a MIDI file in Standard MIDI Format */
-/* return values: 0 = error , 1 = ok */
-gint i_midi_file_parse_smf( midifile_t * mf , gint port_count )
+/* return values: 0 = error, 1 = ok */
+int i_midi_file_parse_smf (midifile_t * mf, int port_count)
 {
- gint header_len, i;
+ int header_len, i;
 
- /* the curren position is immediately after the "MThd" id */
- header_len = i_midi_file_read_int(mf,4);
- if ( header_len < 6 )
- {
- g_warning( "%s: invalid file format\n" , mf->file_name );
- return 0;
- }
+ /* the curren position is immediately after the "MThd" id */
+ header_len = i_midi_file_read_int (mf,4);
 
- mf->format = i_midi_file_read_int(mf,2);
- if (( mf->format != 0 ) && ( mf->format != 1 ))
- {
- g_warning( "%s: type %d format is not supported\n" , mf->file_name , mf->format);
- return 0;
- }
+ if (header_len < 6)
+ {
+ fprintf (stderr, "%s: invalid file format\n", mf->file_name);
+ return 0;
+ }
 
- mf->num_tracks = i_midi_file_read_int(mf,2);
- if (( mf->num_tracks < 1 ) || ( mf->num_tracks > 1000 ))
- {
- g_warning( "%s: invalid number of tracks (%d)\n" , mf->file_name , mf->num_tracks );
- mf->num_tracks = 0;
- return 0;
- }
+ mf->format = i_midi_file_read_int (mf,2);
 
- mf->tracks = g_new0( midifile_track_t, mf->num_tracks );
- if ( !mf->tracks )
- {
- g_warning( "out of memory\n" );
- mf->num_tracks = 0;
- return 0;
- }
+ if ((mf->format != 0) && (mf->format != 1))
+ {
+ fprintf (stderr, "%s: type %d format is not supported\n", mf->file_name, mf->format);
+ return 0;
+ }
 
- mf->time_division = i_midi_file_read_int(mf,2);
- if ( mf->time_division < 0 )
- {
- g_warning( "%s: invalid file format\n" , mf->file_name );
- return 0;
- }
+ mf->num_tracks = i_midi_file_read_int (mf,2);
 
- mf->smpte_timing = !!(mf->time_division & 0x8000);
+ if ((mf->num_tracks < 1) || (mf->num_tracks > 1000))
+ {
+ fprintf (stderr, "%s: invalid number of tracks (%d)\n", mf->file_name, mf->num_tracks);
+ mf->num_tracks = 0;
+ return 0;
+ }
 
- /* read tracks */
- for ( i = 0 ; i < mf->num_tracks ; ++i )
- {
- gint len;
+ mf->tracks = malloc (mf->num_tracks * sizeof (midifile_track_t));
+ memset (mf->tracks, 0, mf->num_tracks * sizeof (midifile_track_t));
 
- /* search for MTrk chunk */
- for (;;)
+ mf->time_division = i_midi_file_read_int (mf,2);
+
+ if (mf->time_division < 0)
 {
- gint id = i_midi_file_read_id(mf);
- len = i_midi_file_read_int(mf,4);
- if ( VFS_FEOF(mf->file_pointer) )
- {
- g_warning( "%s: unexpected end of file\n" , mf->file_name );
- return 0;
- }
- if (( len < 0 ) || ( len >= 0x10000000))
- {
- g_warning( "%s: invalid chunk length %d\n" , mf->file_name , len );
+ fprintf (stderr, "%s: invalid file format\n", mf->file_name);
 return 0;
- }
- if ( id == MAKE_ID('M', 'T', 'r', 'k') )
- break;
- i_midi_file_skip_bytes(mf,len);
 }
 
- if ( !i_midi_file_read_track( mf , &mf->tracks[i] , mf->file_offset + len , port_count ) )
- return 0;
- }
+ mf->smpte_timing = !! (mf->time_division & 0x8000);
+
+ /* read tracks */
+ for (i = 0 ; i < mf->num_tracks ; ++i)
+ {
+ int len;
+
+ /* search for MTrk chunk */
+ for (;;)
+ {
+ int id = i_midi_file_read_id (mf);
+ len = i_midi_file_read_int (mf,4);
+
+ if (vfs_feof (mf->file_pointer))
+ {
+ fprintf (stderr, "%s: unexpected end of file\n", mf->file_name);
+ return 0;
+ }
+
+ if ((len < 0) || (len >= 0x10000000))
+ {
+ fprintf (stderr, "%s: invalid chunk length %d\n", mf->file_name, len);
+ return 0;
+ }
+
+ if (id == MAKE_ID ('M', 'T', 'r', 'k'))
+ break;
+
+ i_midi_file_skip_bytes (mf,len);
+ }
+
+ if (!i_midi_file_read_track (mf, &mf->tracks[i], mf->file_offset + len, port_count))
+ return 0;
+ }
+
+ /* calculate the max_tick for the entire file */
+ mf->max_tick = 0;
 
- /* calculate the max_tick for the entire file */
- mf->max_tick = 0;
- for ( i = 0 ; i < mf->num_tracks ; ++i )
- {
- if ( mf->tracks[i].end_tick > mf->max_tick )
- mf->max_tick = mf->tracks[i].end_tick;
- }
+ for (i = 0 ; i < mf->num_tracks ; ++i)
+ {
+ if (mf->tracks[i].end_tick > mf->max_tick)
+ mf->max_tick = mf->tracks[i].end_tick;
+ }
 
- /* ok, success */
- return 1;
+ /* ok, success */
+ return 1;
 }
 
 
 /* read a MIDI file enclosed in RIFF format */
-/* return values: 0 = error , 1 = ok */
-gint i_midi_file_parse_riff( midifile_t * mf )
+/* return values: 0 = error, 1 = ok */
+int i_midi_file_parse_riff (midifile_t * mf)
 {
- /* skip file length (4 bytes) */
- i_midi_file_skip_bytes(mf,4);
+ /* skip file length (4 bytes) */
+ i_midi_file_skip_bytes (mf,4);
 
- /* check file type ("RMID" = RIFF MIDI) */
- if ( i_midi_file_read_id(mf) != MAKE_ID('R', 'M', 'I', 'D') )
- return 0;
+ /* check file type ("RMID" = RIFF MIDI) */
+ if (i_midi_file_read_id (mf) != MAKE_ID ('R', 'M', 'I', 'D'))
+ return 0;
 
- /* search for "data" chunk */
- for (;;)
- {
- gint id = i_midi_file_read_id(mf);
- gint len = i_midi_file_read_32_le(mf);
+ /* search for "data" chunk */
+ for (;;)
+ {
+ int id = i_midi_file_read_id (mf);
+ int len = i_midi_file_read_32_le (mf);
 
- if ( VFS_FEOF(mf->file_pointer) )
- return 0;
+ if (vfs_feof (mf->file_pointer))
+ return 0;
 
- if ( id == MAKE_ID('d', 'a', 't', 'a') )
- break;
+ if (id == MAKE_ID ('d', 'a', 't', 'a'))
+ break;
 
- if (len < 0)
- return 0;
+ if (len < 0)
+ return 0;
 
- i_midi_file_skip_bytes(mf,((len + 1) & ~1));
- }
+ i_midi_file_skip_bytes (mf, ((len + 1) & ~1));
+ }
 
- /* the "data" chunk must contain data in SMF format */
- if ( i_midi_file_read_id(mf) != MAKE_ID('M', 'T', 'h', 'd') )
- return 0;
+ /* the "data" chunk must contain data in SMF format */
+ if (i_midi_file_read_id (mf) != MAKE_ID ('M', 'T', 'h', 'd'))
+ return 0;
 
- /* ok, success */
- return 1;
+ /* ok, success */
+ return 1;
 }
 
 
 /* midifile init */
-void i_midi_init( midifile_t * mf )
+void i_midi_init (midifile_t * mf)
 {
- mf->file_pointer = NULL;
- mf->file_name = NULL;
- mf->file_offset = 0;
- mf->num_tracks = 0;
- mf->tracks = NULL;
- mf->max_tick = 0;
- mf->smpte_timing = 0;
- mf->format = 0;
- mf->time_division = 0;
- mf->ppq = 0;
- mf->current_tempo = 0;
- mf->playing_tick = 0;
- mf->avg_microsec_per_tick = 0;
- mf->length = 0;
- mf->skip_offset = 0;
- return;
+ mf->file_pointer = NULL;
+ mf->file_name = NULL;
+ mf->file_offset = 0;
+ mf->num_tracks = 0;
+ mf->tracks = NULL;
+ mf->max_tick = 0;
+ mf->smpte_timing = 0;
+ mf->format = 0;
+ mf->time_division = 0;
+ mf->ppq = 0;
+ mf->current_tempo = 0;
+ mf->playing_tick = 0;
+ mf->avg_microsec_per_tick = 0;
+ mf->length = 0;
+ mf->skip_offset = 0;
+ return;
 }
 
 
-void i_midi_free( midifile_t * mf )
+void i_midi_free (midifile_t * mf)
 {
- g_free(mf->file_name);
- mf->file_name = NULL;
-
- if ( mf->tracks )
- {
- gint i;
- /* free event list for each track */
- for ( i = 0 ; i < mf->num_tracks ; ++i )
+ free (mf->file_name);
+ mf->file_name = NULL;
+
+ if (mf->tracks)
 {
- midievent_t * event = mf->tracks[i].first_event;
- midievent_t * event_tmp = NULL;
- while( event )
- {
- event_tmp = event;
- event = event->next;
- if (( event_tmp->type == SND_SEQ_EVENT_META_TEXT ) ||
- ( event_tmp->type == SND_SEQ_EVENT_META_LYRIC ))
- g_free( event_tmp->data.metat );
-
- g_free (event_tmp->sysex);
- g_free (event_tmp);
- }
+ int i;
+
+ /* free event list for each track */
+ for (i = 0 ; i < mf->num_tracks ; ++i)
+ {
+ midievent_t * event = mf->tracks[i].first_event;
+ midievent_t * event_tmp = NULL;
+
+ while (event)
+ {
+ event_tmp = event;
+ event = event->next;
+
+ if ((event_tmp->type == SND_SEQ_EVENT_META_TEXT) ||
+ (event_tmp->type == SND_SEQ_EVENT_META_LYRIC))
+ free (event_tmp->data.metat);
+
+ free (event_tmp->sysex);
+ free (event_tmp);
+ }
+ }
+
+ /* free track array */
+ free (mf->tracks);
+ mf->tracks = NULL;
 }
- /* free track array */
- g_free( mf->tracks );
- mf->tracks = NULL;
- }
 }
 
 
 /* queue set tempo */
-gint i_midi_setget_tempo( midifile_t * mf )
+int i_midi_setget_tempo (midifile_t * mf)
 {
- gint smpte_timing , i = 0;
- gint time_division = mf->time_division;
-
- /* interpret and set tempo */
- smpte_timing = !!(time_division & 0x8000);
- if (!smpte_timing)
- {
- /* time_division is ticks per quarter */
- mf->current_tempo = 500000;
- mf->ppq = time_division;
- }
- else
- {
- /* upper byte is negative frames per second */
- i = 0x80 - ((time_division >> 8) & 0x7f);
- /* lower byte is ticks per frame */
- time_division &= 0xff;
- /* now pretend that we have quarter-note based timing */
- switch (i)
+ int smpte_timing, i = 0;
+ int time_division = mf->time_division;
+
+ /* interpret and set tempo */
+ smpte_timing = !! (time_division & 0x8000);
+
+ if (!smpte_timing)
 {
- case 24:
+ /* time_division is ticks per quarter */
 mf->current_tempo = 500000;
- mf->ppq = 12 * time_division;
- break;
- case 25:
- mf->current_tempo = 400000;
- mf->ppq = 10 * time_division;
- break;
- case 29: /* 30 drop-frame */
- mf->current_tempo = 100000000;
- mf->ppq = 2997 * time_division;
- break;
- case 30:
- mf->current_tempo = 500000;
- mf->ppq = 15 * time_division;
- break;
- default:
- g_warning("Invalid number of SMPTE frames per second (%d)\n", i);
- return 0;
+ mf->ppq = time_division;
+ }
+ else
+ {
+ /* upper byte is negative frames per second */
+ i = 0x80 - ((time_division >> 8) & 0x7f);
+ /* lower byte is ticks per frame */
+ time_division &= 0xff;
+
+ /* now pretend that we have quarter-note based timing */
+ switch (i)
+ {
+ case 24:
+ mf->current_tempo = 500000;
+ mf->ppq = 12 * time_division;
+ break;
+
+ case 25:
+ mf->current_tempo = 400000;
+ mf->ppq = 10 * time_division;
+ break;
+
+ case 29: /* 30 drop-frame */
+ mf->current_tempo = 100000000;
+ mf->ppq = 2997 * time_division;
+ break;
+
+ case 30:
+ mf->current_tempo = 500000;
+ mf->ppq = 15 * time_division;
+ break;
+
+ default:
+ fprintf (stderr, "Invalid number of SMPTE frames per second (%d)\n", i);
+ return 0;
+ }
 }
- }
- DEBUGMSG( "MIDI tempo set -> time division: %i\n" , midifile.time_division );
- DEBUGMSG( "MIDI tempo set -> tempo: %i\n" , midifile.current_tempo );
- DEBUGMSG( "MIDI tempo set -> ppq: %i\n" , midifile.ppq );
- return 1;
+
+ DEBUGMSG ("MIDI tempo set -> time division: %i\n", midifile.time_division);
+ DEBUGMSG ("MIDI tempo set -> tempo: %i\n", midifile.current_tempo);
+ DEBUGMSG ("MIDI tempo set -> ppq: %i\n", midifile.ppq);
+ return 1;
 }
 
 
 /* this will set the midi length in microseconds
 COMMENT: this will also reset current position in each track! */
-void i_midi_setget_length( midifile_t * mf )
+void i_midi_setget_length (midifile_t * mf)
 {
- gint64 length_microsec = 0;
- gint last_tick = 0, i = 0;
- /* get the first microsec_per_tick ratio */
- gint microsec_per_tick = (gint)(mf->current_tempo / mf->ppq);
-
- /* initialize current position in each track */
- for (i = 0; i < mf->num_tracks; ++i)
- mf->tracks[i].current_event = mf->tracks[i].first_event;
-
- /* search for tempo events in each track; in fact, since the program
- currently supports type 0 and type 1 MIDI files, we should find
- tempo events only in one track */
- DEBUGMSG( "LENGTH calc: starting calc loop\n" );
- for (;;)
- {
- midievent_t * event = NULL;
- midifile_track_t * event_track = NULL;
- gint i, min_tick = mf->max_tick + 1;
-
- /* search next event */
- for ( i = 0 ; i < mf->num_tracks ; ++i )
- {
- midifile_track_t * track = &mf->tracks[i];
- midievent_t * e2 = track->current_event;
- if (e2 && e2->tick < min_tick)
- {
- min_tick = e2->tick;
- event = e2;
- event_track = track;
- }
- }
+ int64_t length_microsec = 0;
+ int last_tick = 0, i = 0;
+ /* get the first microsec_per_tick ratio */
+ int microsec_per_tick = (int) (mf->current_tempo / mf->ppq);
 
- if (!event)
- {
- /* calculate the remaining length */
- length_microsec += ( microsec_per_tick * ( mf->max_tick - last_tick ) );
- break; /* end of song reached */
- }
+ /* initialize current position in each track */
+ for (i = 0; i < mf->num_tracks; ++i)
+ mf->tracks[i].current_event = mf->tracks[i].first_event;
 
- /* advance pointer to next event */
- event_track->current_event = event->next;
+ /* search for tempo events in each track; in fact, since the program
+ currently supports type 0 and type 1 MIDI files, we should find
+ tempo events only in one track */
+ DEBUGMSG ("LENGTH calc: starting calc loop\n");
 
- /* check if this is a tempo event */
- if ( event->type == SND_SEQ_EVENT_TEMPO )
+ for (;;)
 {
- DEBUGMSG( "LENGTH calc: tempo event (%i) encountered during calc on tick %i\n" ,
- event->data.tempo , event->tick );
- /* increment length_microsec with the amount of microsec before tempo change */
- length_microsec += ( microsec_per_tick * ( event->tick - last_tick ) );
- /* now update last_tick and the microsec_per_tick ratio */
- last_tick = event->tick;
- microsec_per_tick = (gint)(event->data.tempo / mf->ppq);
+ midievent_t * event = NULL;
+ midifile_track_t * event_track = NULL;
+ int i, min_tick = mf->max_tick + 1;
+
+ /* search next event */
+ for (i = 0 ; i < mf->num_tracks ; ++i)
+ {
+ midifile_track_t * track = &mf->tracks[i];
+ midievent_t * e2 = track->current_event;
+
+ if (e2 && e2->tick < min_tick)
+ {
+ min_tick = e2->tick;
+ event = e2;
+ event_track = track;
+ }
+ }
+
+ if (!event)
+ {
+ /* calculate the remaining length */
+ length_microsec += (microsec_per_tick * (mf->max_tick - last_tick));
+ break; /* end of song reached */
+ }
+
+ /* advance pointer to next event */
+ event_track->current_event = event->next;
+
+ /* check if this is a tempo event */
+ if (event->type == SND_SEQ_EVENT_TEMPO)
+ {
+ DEBUGMSG ("LENGTH calc: tempo event (%i) encountered during calc on tick %i\n",
+ event->data.tempo, event->tick);
+ /* increment length_microsec with the amount of microsec before tempo change */
+ length_microsec += (microsec_per_tick * (event->tick - last_tick));
+ /* now update last_tick and the microsec_per_tick ratio */
+ last_tick = event->tick;
+ microsec_per_tick = (int) (event->data.tempo / mf->ppq);
+ }
 }
- }
-
- /* IMPORTANT
- this couple of important values is set by i_midi_set_length */
- mf->length = length_microsec;
- if (mf->max_tick)
- mf->avg_microsec_per_tick = (gint)(length_microsec / mf->max_tick);
- else
- mf->avg_microsec_per_tick = 1; /* dummy - protect against div-by-zero */
- return;
+
+ /* IMPORTANT
+ this couple of important values is set by i_midi_set_length */
+ mf->length = length_microsec;
+
+ if (mf->max_tick)
+ mf->avg_microsec_per_tick = (int) (length_microsec / mf->max_tick);
+ else
+ mf->avg_microsec_per_tick = 1; /* dummy - protect against div-by-zero */
+
+ return;
 }
 
 
 /* this will get the weighted average bpm of the midi file;
 if the file has a variable bpm, 'bpm' is set to -1;
 COMMENT: this will also reset current position in each track! */
-void i_midi_get_bpm( midifile_t * mf , gint * bpm , gint * wavg_bpm )
+void i_midi_get_bpm (midifile_t * mf, int * bpm, int * wavg_bpm)
 {
- gint i = 0 , last_tick = 0;
- guint weighted_avg_tempo = 0;
- gboolean is_monotempo = TRUE;
- gint last_tempo = mf->current_tempo;
-
- /* initialize current position in each track */
- for ( i = 0 ; i < mf->num_tracks ; ++i )
- mf->tracks[i].current_event = mf->tracks[i].first_event;
-
- /* search for tempo events in each track; in fact, since the program
- currently supports type 0 and type 1 MIDI files, we should find
- tempo events only in one track */
- DEBUGMSG( "BPM calc: starting calc loop\n" );
- for (;;)
- {
- midievent_t * event = NULL;
- midifile_track_t * event_track = NULL;
- gint i, min_tick = mf->max_tick + 1;
-
- /* search next event */
- for ( i = 0 ; i < mf->num_tracks ; ++i )
- {
- midifile_track_t * track = &mf->tracks[i];
- midievent_t * e2 = track->current_event;
- if (e2 && e2->tick < min_tick)
- {
- min_tick = e2->tick;
- event = e2;
- event_track = track;
- }
- }
+ int i = 0, last_tick = 0;
+ unsigned weighted_avg_tempo = 0;
+ bool_t is_monotempo = TRUE;
+ int last_tempo = mf->current_tempo;
 
- if (!event)
- {
- /* calculate the remaining length */
- weighted_avg_tempo += (guint)( last_tempo * ((gfloat)( mf->max_tick - last_tick ) / (gfloat)mf->max_tick ) );
- break; /* end of song reached */
- }
+ /* initialize current position in each track */
+ for (i = 0 ; i < mf->num_tracks ; ++i)
+ mf->tracks[i].current_event = mf->tracks[i].first_event;
 
- /* advance pointer to next event */
- event_track->current_event = event->next;
+ /* search for tempo events in each track; in fact, since the program
+ currently supports type 0 and type 1 MIDI files, we should find
+ tempo events only in one track */
+ DEBUGMSG ("BPM calc: starting calc loop\n");
 
- /* check if this is a tempo event */
- if ( event->type == SND_SEQ_EVENT_TEMPO )
+ for (;;)
 {
- /* check if this is a tempo change (real change, tempo should be
- different) in the midi file (and it shouldn't be at tick 0); */
- if (( is_monotempo ) && ( event->tick > 0 ) && ( event->data.tempo != last_tempo ))
- is_monotempo = FALSE;
-
- DEBUGMSG( "BPM calc: tempo event (%i) encountered during calc on tick %i\n" ,
- event->data.tempo , event->tick );
- /* add the previous tempo change multiplied for its weight (the tick interval for the tempo ) */
- weighted_avg_tempo += (guint)( last_tempo * ((gfloat)( event->tick - last_tick ) / (gfloat)mf->max_tick ) );
- /* now update last_tick and the microsec_per_tick ratio */
- last_tick = event->tick;
- last_tempo = event->data.tempo;
+ midievent_t * event = NULL;
+ midifile_track_t * event_track = NULL;
+ int i, min_tick = mf->max_tick + 1;
+
+ /* search next event */
+ for (i = 0 ; i < mf->num_tracks ; ++i)
+ {
+ midifile_track_t * track = &mf->tracks[i];
+ midievent_t * e2 = track->current_event;
+
+ if (e2 && e2->tick < min_tick)
+ {
+ min_tick = e2->tick;
+ event = e2;
+ event_track = track;
+ }
+ }
+
+ if (!event)
+ {
+ /* calculate the remaining length */
+ weighted_avg_tempo += (unsigned) (last_tempo * ((float) (mf->max_tick - last_tick) / (float) mf->max_tick));
+ break; /* end of song reached */
+ }
+
+ /* advance pointer to next event */
+ event_track->current_event = event->next;
+
+ /* check if this is a tempo event */
+ if (event->type == SND_SEQ_EVENT_TEMPO)
+ {
+ /* check if this is a tempo change (real change, tempo should be
+ different) in the midi file (and it shouldn't be at tick 0); */
+ if ((is_monotempo) && (event->tick > 0) && (event->data.tempo != last_tempo))
+ is_monotempo = FALSE;
+
+ DEBUGMSG ("BPM calc: tempo event (%i) encountered during calc on tick %i\n",
+ event->data.tempo, event->tick);
+ /* add the previous tempo change multiplied for its weight (the tick interval for the tempo ) */
+ weighted_avg_tempo += (unsigned) (last_tempo * ((float) (event->tick - last_tick) / (float) mf->max_tick));
+ /* now update last_tick and the microsec_per_tick ratio */
+ last_tick = event->tick;
+ last_tempo = event->data.tempo;
+ }
 }
- }
 
- DEBUGMSG( "BPM calc: weighted average tempo: %i\n" , weighted_avg_tempo );
+ DEBUGMSG ("BPM calc: weighted average tempo: %i\n", weighted_avg_tempo);
 
- *wavg_bpm = (gint)( 60000000 / weighted_avg_tempo );
+ *wavg_bpm = (int) (60000000 / weighted_avg_tempo);
 
- DEBUGMSG( "BPM calc: weighted average bpm: %i\n" , *wavg_bpm );
+ DEBUGMSG ("BPM calc: weighted average bpm: %i\n", *wavg_bpm);
 
- if ( is_monotempo )
- *bpm = *wavg_bpm; /* the song has fixed bpm */
- else
- *bpm = -1; /* the song has variable bpm */
+ if (is_monotempo)
+ *bpm = *wavg_bpm; /* the song has fixed bpm */
+ else
+ *bpm = -1; /* the song has variable bpm */
 
- return;
+ return;
 }
 
 
 /* helper function that parses a midi file; returns 1 on success, 0 otherwise */
-gint i_midi_parse_from_filename( const gchar * filename , midifile_t * mf )
+int i_midi_parse_from_filename (const char * filename, midifile_t * mf)
 {
- i_midi_init( mf );
- DEBUGMSG( "PARSE_FROM_FILENAME requested, opening file: %s\n" , filename );
- mf->file_pointer = VFS_FOPEN( filename , "rb" );
- if (!mf->file_pointer)
- {
- g_warning( "Cannot open %s\n" , filename );
- return 0;
- }
- mf->file_name = g_strdup(filename);
+ i_midi_init (mf);
+ DEBUGMSG ("PARSE_FROM_FILENAME requested, opening file: %s\n", filename);
+ mf->file_pointer = vfs_fopen (filename, "rb");
+
+ if (!mf->file_pointer)
+ {
+ fprintf (stderr, "Cannot open %s\n", filename);
+ return 0;
+ }
 
- switch( i_midi_file_read_id( mf ) )
- {
- case MAKE_ID('R', 'I', 'F', 'F'):
+ mf->file_name = strdup (filename);
+
+ switch (i_midi_file_read_id (mf))
+ {
+ case MAKE_ID ('R', 'I', 'F', 'F') :
 {
- DEBUGMSG( "PARSE_FROM_FILENAME requested, RIFF chunk found, processing...\n" );
- /* read riff chunk */
- if ( !i_midi_file_parse_riff( mf ) )
- WARNANDBREAK( "%s: invalid file format (riff parser)\n" , filename );
+ DEBUGMSG ("PARSE_FROM_FILENAME requested, RIFF chunk found, processing...\n");
 
- /* if that was read correctly, go ahead and read smf data */
+ /* read riff chunk */
+ if (!i_midi_file_parse_riff (mf))
+ WARNANDBREAK ("%s: invalid file format (riff parser)\n", filename);
+
+ /* if that was read correctly, go ahead and read smf data */
 }
 
- case MAKE_ID('M', 'T', 'h', 'd'):
+ case MAKE_ID ('M', 'T', 'h', 'd') :
 {
- DEBUGMSG( "PARSE_FROM_FILENAME requested, MThd chunk found, processing...\n" );
- /* we don't care about port count here, pass 1 */
- if ( !i_midi_file_parse_smf( mf , 1 ) )
- WARNANDBREAK( "%s: invalid file format (smf parser)\n" , filename );
+ DEBUGMSG ("PARSE_FROM_FILENAME requested, MThd chunk found, processing...\n");
+
+ /* we don't care about port count here, pass 1 */
+ if (!i_midi_file_parse_smf (mf, 1))
+ WARNANDBREAK ("%s: invalid file format (smf parser)\n", filename);
 
- if ( mf->time_division < 1 )
- WARNANDBREAK( "%s: invalid time division (%i)\n" , filename , mf->time_division );
+ if (mf->time_division < 1)
+ WARNANDBREAK ("%s: invalid time division (%i)\n", filename, mf->time_division);
 
- /* fill mf->ppq and mf->tempo using time_division */
- if ( !i_midi_setget_tempo( mf ) )
- WARNANDBREAK( "%s: invalid values while setting ppq and tempo\n" , filename );
+ /* fill mf->ppq and mf->tempo using time_division */
+ if (!i_midi_setget_tempo (mf))
+ WARNANDBREAK ("%s: invalid values while setting ppq and tempo\n", filename);
 
- /* fill mf->length, keeping in count tempo-changes */
- i_midi_setget_length( mf );
+ /* fill mf->length, keeping in count tempo-changes */
+ i_midi_setget_length (mf);
 
- /* ok, mf has been filled with information; successfully return */
- VFS_FCLOSE( mf->file_pointer );
- return 1;
+ /* ok, mf has been filled with information; successfully return */
+ vfs_fclose (mf->file_pointer);
+ return 1;
 }
 
 default:
 {
- g_warning( "%s is not a Standard MIDI File\n" , filename );
- break;
+ fprintf (stderr, "%s is not a Standard MIDI File\n", filename);
+ break;
+ }
 }
- }
 
- /* something failed */
- VFS_FCLOSE( mf->file_pointer );
- return 0;
+ /* something failed */
+ vfs_fclose (mf->file_pointer);
+ return 0;
 }

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_midi.h -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_midi.h Changed

@@ -21,261 +21,261 @@
 #ifndef _I_MIDI_H
 #define _I_MIDI_H 1
 
-#include "i_common.h"
+#include <stdint.h>
+#include <libaudcore/vfs.h>
+
 #include "i_midievent.h"
-#include "i_vfslayer.h"
 
 #define MAKE_ID(c1, c2, c3, c4) ((c1) | ((c2) << 8) | ((c3) << 16) | ((c4) << 24))
 
 
 /* sequencer event type, got from ALSA header alsa/seq_event.h */
-enum snd_seq_event_type {
- /* system status; event data type = #snd_seq_result_t */
- SND_SEQ_EVENT_SYSTEM = 0,
- /* returned result status; event data type = #snd_seq_result_t */
- SND_SEQ_EVENT_RESULT,
+enum snd_seq_event_type
+{
+ /* system status; event data type = #snd_seq_result_t */
+ SND_SEQ_EVENT_SYSTEM = 0,
+ /* returned result status; event data type = #snd_seq_result_t */
+ SND_SEQ_EVENT_RESULT,
 
- /* note on and off with duration; event data type = #snd_seq_ev_note_t */
- SND_SEQ_EVENT_NOTE = 5,
- /* note on; event data type = #snd_seq_ev_note_t */
- SND_SEQ_EVENT_NOTEON,
- /* note off; event data type = #snd_seq_ev_note_t */
- SND_SEQ_EVENT_NOTEOFF,
- /* key pressure change (aftertouch); event data type = #snd_seq_ev_note_t */
- SND_SEQ_EVENT_KEYPRESS,
+ /* note on and off with duration; event data type = #snd_seq_ev_note_t */
+ SND_SEQ_EVENT_NOTE = 5,
+ /* note on; event data type = #snd_seq_ev_note_t */
+ SND_SEQ_EVENT_NOTEON,
+ /* note off; event data type = #snd_seq_ev_note_t */
+ SND_SEQ_EVENT_NOTEOFF,
+ /* key pressure change (aftertouch); event data type = #snd_seq_ev_note_t */
+ SND_SEQ_EVENT_KEYPRESS,
 
- /* controller; event data type = #snd_seq_ev_ctrl_t */
- SND_SEQ_EVENT_CONTROLLER = 10,
- /* program change; event data type = #snd_seq_ev_ctrl_t */
- SND_SEQ_EVENT_PGMCHANGE,
- /* channel pressure; event data type = #snd_seq_ev_ctrl_t */
- SND_SEQ_EVENT_CHANPRESS,
- /* pitchwheel; event data type = #snd_seq_ev_ctrl_t; data is from -8192 to 8191) */
- SND_SEQ_EVENT_PITCHBEND,
- /* 14 bit controller value; event data type = #snd_seq_ev_ctrl_t */
- SND_SEQ_EVENT_CONTROL14,
- /* 14 bit NRPN; event data type = #snd_seq_ev_ctrl_t */
- SND_SEQ_EVENT_NONREGPARAM,
- /* 14 bit RPN; event data type = #snd_seq_ev_ctrl_t */
- SND_SEQ_EVENT_REGPARAM,
+ /* controller; event data type = #snd_seq_ev_ctrl_t */
+ SND_SEQ_EVENT_CONTROLLER = 10,
+ /* program change; event data type = #snd_seq_ev_ctrl_t */
+ SND_SEQ_EVENT_PGMCHANGE,
+ /* channel pressure; event data type = #snd_seq_ev_ctrl_t */
+ SND_SEQ_EVENT_CHANPRESS,
+ /* pitchwheel; event data type = #snd_seq_ev_ctrl_t; data is from -8192 to 8191) */
+ SND_SEQ_EVENT_PITCHBEND,
+ /* 14 bit controller value; event data type = #snd_seq_ev_ctrl_t */
+ SND_SEQ_EVENT_CONTROL14,
+ /* 14 bit NRPN; event data type = #snd_seq_ev_ctrl_t */
+ SND_SEQ_EVENT_NONREGPARAM,
+ /* 14 bit RPN; event data type = #snd_seq_ev_ctrl_t */
+ SND_SEQ_EVENT_REGPARAM,
 
- /* SPP with LSB and MSB values; event data type = #snd_seq_ev_ctrl_t */
- SND_SEQ_EVENT_SONGPOS = 20,
- /* Song Select with song ID number; event data type = #snd_seq_ev_ctrl_t */
- SND_SEQ_EVENT_SONGSEL,
- /* midi time code quarter frame; event data type = #snd_seq_ev_ctrl_t */
- SND_SEQ_EVENT_QFRAME,
- /* SMF Time Signature event; event data type = #snd_seq_ev_ctrl_t */
- SND_SEQ_EVENT_TIMESIGN,
- /* SMF Key Signature event; event data type = #snd_seq_ev_ctrl_t */
- SND_SEQ_EVENT_KEYSIGN,
+ /* SPP with LSB and MSB values; event data type = #snd_seq_ev_ctrl_t */
+ SND_SEQ_EVENT_SONGPOS = 20,
+ /* Song Select with song ID number; event data type = #snd_seq_ev_ctrl_t */
+ SND_SEQ_EVENT_SONGSEL,
+ /* midi time code quarter frame; event data type = #snd_seq_ev_ctrl_t */
+ SND_SEQ_EVENT_QFRAME,
+ /* SMF Time Signature event; event data type = #snd_seq_ev_ctrl_t */
+ SND_SEQ_EVENT_TIMESIGN,
+ /* SMF Key Signature event; event data type = #snd_seq_ev_ctrl_t */
+ SND_SEQ_EVENT_KEYSIGN,
 
- /* MIDI Real Time Start message; event data type = #snd_seq_ev_queue_control_t */
- SND_SEQ_EVENT_START = 30,
- /* MIDI Real Time Continue message; event data type = #snd_seq_ev_queue_control_t */
- SND_SEQ_EVENT_CONTINUE,
- /* MIDI Real Time Stop message; event data type = #snd_seq_ev_queue_control_t */
- SND_SEQ_EVENT_STOP,
- /* Set tick queue position; event data type = #snd_seq_ev_queue_control_t */
- SND_SEQ_EVENT_SETPOS_TICK,
- /* Set real-time queue position; event data type = #snd_seq_ev_queue_control_t */
- SND_SEQ_EVENT_SETPOS_TIME,
- /* (SMF) Tempo event; event data type = #snd_seq_ev_queue_control_t */
- SND_SEQ_EVENT_TEMPO,
- /* MIDI Real Time Clock message; event data type = #snd_seq_ev_queue_control_t */
- SND_SEQ_EVENT_CLOCK,
- /* MIDI Real Time Tick message; event data type = #snd_seq_ev_queue_control_t */
- SND_SEQ_EVENT_TICK,
- /* Queue timer skew; event data type = #snd_seq_ev_queue_control_t */
- SND_SEQ_EVENT_QUEUE_SKEW,
- /* Sync position changed; event data type = #snd_seq_ev_queue_control_t */
- SND_SEQ_EVENT_SYNC_POS,
+ /* MIDI Real Time Start message; event data type = #snd_seq_ev_queue_control_t */
+ SND_SEQ_EVENT_START = 30,
+ /* MIDI Real Time Continue message; event data type = #snd_seq_ev_queue_control_t */
+ SND_SEQ_EVENT_CONTINUE,
+ /* MIDI Real Time Stop message; event data type = #snd_seq_ev_queue_control_t */
+ SND_SEQ_EVENT_STOP,
+ /* Set tick queue position; event data type = #snd_seq_ev_queue_control_t */
+ SND_SEQ_EVENT_SETPOS_TICK,
+ /* Set real-time queue position; event data type = #snd_seq_ev_queue_control_t */
+ SND_SEQ_EVENT_SETPOS_TIME,
+ /* (SMF) Tempo event; event data type = #snd_seq_ev_queue_control_t */
+ SND_SEQ_EVENT_TEMPO,
+ /* MIDI Real Time Clock message; event data type = #snd_seq_ev_queue_control_t */
+ SND_SEQ_EVENT_CLOCK,
+ /* MIDI Real Time Tick message; event data type = #snd_seq_ev_queue_control_t */
+ SND_SEQ_EVENT_TICK,
+ /* Queue timer skew; event data type = #snd_seq_ev_queue_control_t */
+ SND_SEQ_EVENT_QUEUE_SKEW,
+ /* Sync position changed; event data type = #snd_seq_ev_queue_control_t */
+ SND_SEQ_EVENT_SYNC_POS,
 
- /* Tune request; event data type = none */
- SND_SEQ_EVENT_TUNE_REQUEST = 40,
- /* Reset to power-on state; event data type = none */
- SND_SEQ_EVENT_RESET,
- /* Active sensing event; event data type = none */
- SND_SEQ_EVENT_SENSING,
+ /* Tune request; event data type = none */
+ SND_SEQ_EVENT_TUNE_REQUEST = 40,
+ /* Reset to power-on state; event data type = none */
+ SND_SEQ_EVENT_RESET,
+ /* Active sensing event; event data type = none */
+ SND_SEQ_EVENT_SENSING,
 
- /* Echo-back event; event data type = any type */
- SND_SEQ_EVENT_ECHO = 50,
- /* OSS emulation raw event; event data type = any type */
- SND_SEQ_EVENT_OSS,
+ /* Echo-back event; event data type = any type */
+ SND_SEQ_EVENT_ECHO = 50,
+ /* OSS emulation raw event; event data type = any type */
+ SND_SEQ_EVENT_OSS,
 
- /* New client has connected; event data type = #snd_seq_addr_t */
- SND_SEQ_EVENT_CLIENT_START = 60,
- /* Client has left the system; event data type = #snd_seq_addr_t */
- SND_SEQ_EVENT_CLIENT_EXIT,
- /* Client status/info has changed; event data type = #snd_seq_addr_t */
- SND_SEQ_EVENT_CLIENT_CHANGE,
- /* New port was created; event data type = #snd_seq_addr_t */
- SND_SEQ_EVENT_PORT_START,
- /* Port was deleted from system; event data type = #snd_seq_addr_t */
- SND_SEQ_EVENT_PORT_EXIT,
- /* Port status/info has changed; event data type = #snd_seq_addr_t */
- SND_SEQ_EVENT_PORT_CHANGE,
+ /* New client has connected; event data type = #snd_seq_addr_t */
+ SND_SEQ_EVENT_CLIENT_START = 60,
+ /* Client has left the system; event data type = #snd_seq_addr_t */
+ SND_SEQ_EVENT_CLIENT_EXIT,
+ /* Client status/info has changed; event data type = #snd_seq_addr_t */
+ SND_SEQ_EVENT_CLIENT_CHANGE,
+ /* New port was created; event data type = #snd_seq_addr_t */
+ SND_SEQ_EVENT_PORT_START,
+ /* Port was deleted from system; event data type = #snd_seq_addr_t */
+ SND_SEQ_EVENT_PORT_EXIT,
+ /* Port status/info has changed; event data type = #snd_seq_addr_t */
+ SND_SEQ_EVENT_PORT_CHANGE,
 
- /* Ports connected; event data type = #snd_seq_connect_t */
- SND_SEQ_EVENT_PORT_SUBSCRIBED,
- /* Ports disconnected; event data type = #snd_seq_connect_t */
- SND_SEQ_EVENT_PORT_UNSUBSCRIBED,
+ /* Ports connected; event data type = #snd_seq_connect_t */
+ SND_SEQ_EVENT_PORT_SUBSCRIBED,
+ /* Ports disconnected; event data type = #snd_seq_connect_t */
+ SND_SEQ_EVENT_PORT_UNSUBSCRIBED,
 
- /* Sample select; event data type = #snd_seq_ev_sample_control_t */
- SND_SEQ_EVENT_SAMPLE = 70,
- /* Sample cluster select; event data type = #snd_seq_ev_sample_control_t */
- SND_SEQ_EVENT_SAMPLE_CLUSTER,
- /* voice start */
- SND_SEQ_EVENT_SAMPLE_START,
- /* voice stop */
- SND_SEQ_EVENT_SAMPLE_STOP,
- /* playback frequency */
- SND_SEQ_EVENT_SAMPLE_FREQ,
- /* volume and balance */
- SND_SEQ_EVENT_SAMPLE_VOLUME,
- /* sample loop */
- SND_SEQ_EVENT_SAMPLE_LOOP,
- /* sample position */
- SND_SEQ_EVENT_SAMPLE_POSITION,
- /* private (hardware dependent) event */
- SND_SEQ_EVENT_SAMPLE_PRIVATE1,
+ /* Sample select; event data type = #snd_seq_ev_sample_control_t */
+ SND_SEQ_EVENT_SAMPLE = 70,
+ /* Sample cluster select; event data type = #snd_seq_ev_sample_control_t */
+ SND_SEQ_EVENT_SAMPLE_CLUSTER,
+ /* voice start */
+ SND_SEQ_EVENT_SAMPLE_START,
+ /* voice stop */
+ SND_SEQ_EVENT_SAMPLE_STOP,
+ /* playback frequency */
+ SND_SEQ_EVENT_SAMPLE_FREQ,
+ /* volume and balance */
+ SND_SEQ_EVENT_SAMPLE_VOLUME,
+ /* sample loop */
+ SND_SEQ_EVENT_SAMPLE_LOOP,
+ /* sample position */
+ SND_SEQ_EVENT_SAMPLE_POSITION,
+ /* private (hardware dependent) event */
+ SND_SEQ_EVENT_SAMPLE_PRIVATE1,
 
- /* user-defined event; event data type = any (fixed size) */
- SND_SEQ_EVENT_USR0 = 90,
- /* user-defined event; event data type = any (fixed size) */
- SND_SEQ_EVENT_USR1,
- /* user-defined event; event data type = any (fixed size) */
- SND_SEQ_EVENT_USR2,
- /* user-defined event; event data type = any (fixed size) */
- SND_SEQ_EVENT_USR3,
- /* user-defined event; event data type = any (fixed size) */
- SND_SEQ_EVENT_USR4,
- /* user-defined event; event data type = any (fixed size) */
- SND_SEQ_EVENT_USR5,
- /* user-defined event; event data type = any (fixed size) */
- SND_SEQ_EVENT_USR6,
- /* user-defined event; event data type = any (fixed size) */
- SND_SEQ_EVENT_USR7,
- /* user-defined event; event data type = any (fixed size) */
- SND_SEQ_EVENT_USR8,
- /* user-defined event; event data type = any (fixed size) */
- SND_SEQ_EVENT_USR9,
+ /* user-defined event; event data type = any (fixed size) */
+ SND_SEQ_EVENT_USR0 = 90,
+ /* user-defined event; event data type = any (fixed size) */
+ SND_SEQ_EVENT_USR1,
+ /* user-defined event; event data type = any (fixed size) */
+ SND_SEQ_EVENT_USR2,
+ /* user-defined event; event data type = any (fixed size) */
+ SND_SEQ_EVENT_USR3,
+ /* user-defined event; event data type = any (fixed size) */
+ SND_SEQ_EVENT_USR4,
+ /* user-defined event; event data type = any (fixed size) */
+ SND_SEQ_EVENT_USR5,
+ /* user-defined event; event data type = any (fixed size) */
+ SND_SEQ_EVENT_USR6,
+ /* user-defined event; event data type = any (fixed size) */
+ SND_SEQ_EVENT_USR7,
+ /* user-defined event; event data type = any (fixed size) */
+ SND_SEQ_EVENT_USR8,
+ /* user-defined event; event data type = any (fixed size) */
+ SND_SEQ_EVENT_USR9,
 
- /* begin of instrument management */
- SND_SEQ_EVENT_INSTR_BEGIN = 100,
- /* end of instrument management */
- SND_SEQ_EVENT_INSTR_END,
- /* query instrument interface info */
- SND_SEQ_EVENT_INSTR_INFO,
- /* result of instrument interface info */
- SND_SEQ_EVENT_INSTR_INFO_RESULT,
- /* query instrument format info */
- SND_SEQ_EVENT_INSTR_FINFO,
- /* result of instrument format info */
- SND_SEQ_EVENT_INSTR_FINFO_RESULT,
- /* reset instrument instrument memory */
- SND_SEQ_EVENT_INSTR_RESET,
- /* get instrument interface status */
- SND_SEQ_EVENT_INSTR_STATUS,
- /* result of instrument interface status */
- SND_SEQ_EVENT_INSTR_STATUS_RESULT,
- /* put an instrument to port */
- SND_SEQ_EVENT_INSTR_PUT,
- /* get an instrument from port */
- SND_SEQ_EVENT_INSTR_GET,
- /* result of instrument query */
- SND_SEQ_EVENT_INSTR_GET_RESULT,
- /* free instrument(s) */
- SND_SEQ_EVENT_INSTR_FREE,
- /* get instrument list */
- SND_SEQ_EVENT_INSTR_LIST,
- /* result of instrument list */
- SND_SEQ_EVENT_INSTR_LIST_RESULT,
- /* set cluster parameters */
- SND_SEQ_EVENT_INSTR_CLUSTER,
- /* get cluster parameters */
- SND_SEQ_EVENT_INSTR_CLUSTER_GET,
- /* result of cluster parameters */
- SND_SEQ_EVENT_INSTR_CLUSTER_RESULT,
- /* instrument change */
- SND_SEQ_EVENT_INSTR_CHANGE,
+ /* begin of instrument management */
+ SND_SEQ_EVENT_INSTR_BEGIN = 100,
+ /* end of instrument management */
+ SND_SEQ_EVENT_INSTR_END,
+ /* query instrument interface info */
+ SND_SEQ_EVENT_INSTR_INFO,
+ /* result of instrument interface info */
+ SND_SEQ_EVENT_INSTR_INFO_RESULT,
+ /* query instrument format info */
+ SND_SEQ_EVENT_INSTR_FINFO,
+ /* result of instrument format info */
+ SND_SEQ_EVENT_INSTR_FINFO_RESULT,
+ /* reset instrument instrument memory */
+ SND_SEQ_EVENT_INSTR_RESET,
+ /* get instrument interface status */
+ SND_SEQ_EVENT_INSTR_STATUS,
+ /* result of instrument interface status */
+ SND_SEQ_EVENT_INSTR_STATUS_RESULT,
+ /* put an instrument to port */
+ SND_SEQ_EVENT_INSTR_PUT,
+ /* get an instrument from port */
+ SND_SEQ_EVENT_INSTR_GET,
+ /* result of instrument query */
+ SND_SEQ_EVENT_INSTR_GET_RESULT,
+ /* free instrument(s) */
+ SND_SEQ_EVENT_INSTR_FREE,
+ /* get instrument list */
+ SND_SEQ_EVENT_INSTR_LIST,
+ /* result of instrument list */
+ SND_SEQ_EVENT_INSTR_LIST_RESULT,
+ /* set cluster parameters */
+ SND_SEQ_EVENT_INSTR_CLUSTER,
+ /* get cluster parameters */
+ SND_SEQ_EVENT_INSTR_CLUSTER_GET,
+ /* result of cluster parameters */
+ SND_SEQ_EVENT_INSTR_CLUSTER_RESULT,
+ /* instrument change */
+ SND_SEQ_EVENT_INSTR_CHANGE,
 
- /* system exclusive data (variable length); event data type = #snd_seq_ev_ext_t */
- SND_SEQ_EVENT_SYSEX = 130,
- /* error event; event data type = #snd_seq_ev_ext_t */
- SND_SEQ_EVENT_BOUNCE,
- /* reserved for user apps; event data type = #snd_seq_ev_ext_t */
- SND_SEQ_EVENT_USR_VAR0 = 135,
- /* reserved for user apps; event data type = #snd_seq_ev_ext_t */
- SND_SEQ_EVENT_USR_VAR1,
- /* reserved for user apps; event data type = #snd_seq_ev_ext_t */
- SND_SEQ_EVENT_USR_VAR2,
- /* reserved for user apps; event data type = #snd_seq_ev_ext_t */
- SND_SEQ_EVENT_USR_VAR3,
- /* reserved for user apps; event data type = #snd_seq_ev_ext_t */
- SND_SEQ_EVENT_USR_VAR4,
+ /* system exclusive data (variable length); event data type = #snd_seq_ev_ext_t */
+ SND_SEQ_EVENT_SYSEX = 130,
+ /* error event; event data type = #snd_seq_ev_ext_t */
+ SND_SEQ_EVENT_BOUNCE,
+ /* reserved for user apps; event data type = #snd_seq_ev_ext_t */
+ SND_SEQ_EVENT_USR_VAR0 = 135,
+ /* reserved for user apps; event data type = #snd_seq_ev_ext_t */
+ SND_SEQ_EVENT_USR_VAR1,
+ /* reserved for user apps; event data type = #snd_seq_ev_ext_t */
+ SND_SEQ_EVENT_USR_VAR2,
+ /* reserved for user apps; event data type = #snd_seq_ev_ext_t */
+ SND_SEQ_EVENT_USR_VAR3,
+ /* reserved for user apps; event data type = #snd_seq_ev_ext_t */
+ SND_SEQ_EVENT_USR_VAR4,
 
- /* added to support meta-event - general purpose text */
- SND_SEQ_EVENT_META_TEXT = 150,
- /* added to support meta-event - lyrics */
- SND_SEQ_EVENT_META_LYRIC,
+ /* added to support meta-event - general purpose text */
+ SND_SEQ_EVENT_META_TEXT = 150,
+ /* added to support meta-event - lyrics */
+ SND_SEQ_EVENT_META_LYRIC,
 
- /* NOP; ignored in any case */
- SND_SEQ_EVENT_NONE = 255
+ /* NOP; ignored in any case */
+ SND_SEQ_EVENT_NONE = 255
 };
 
 
 typedef struct
 {
- midievent_t * first_event;	/* list of all events in this track */
- gint end_tick;			/* length of this track */
- midievent_t * current_event;	/* used while loading and playing */
+ midievent_t * first_event;	/* list of all events in this track */
+ int end_tick;			/* length of this track */
+ midievent_t * current_event;	/* used while loading and playing */
 }
 midifile_track_t;
 
 typedef struct
 {
- VFSFile * file_pointer;
- gchar * file_name;
- gint file_offset;
+ VFSFile * file_pointer;
+ char * file_name;
+ int file_offset;
 
- gint num_tracks;
- midifile_track_t *tracks;
+ int num_tracks;
+ midifile_track_t * tracks;
 
- gushort format;
- guint max_tick;
- gint smpte_timing;
+ unsigned short format;
+ unsigned max_tick;
+ int smpte_timing;
 
- gint time_division;
- gint ppq;
- gint current_tempo;
+ int time_division;
+ int ppq;
+ int current_tempo;
 
- gint playing_tick;
- gint avg_microsec_per_tick;
- gint64 length;
+ int playing_tick;
+ int avg_microsec_per_tick;
+ int64_t length;
 
- gint skip_offset;
+ int skip_offset;
 }
 midifile_t;
 
-extern midifile_t midifile;
-
-midievent_t * i_midi_file_new_event( midifile_track_t * , gint );
-void i_midi_file_skip_bytes( midifile_t * , gint );
-gint i_midi_file_read_byte( midifile_t * );
-gint i_midi_file_read_32_le( midifile_t * );
-gint i_midi_file_read_id( midifile_t * );
-gint i_midi_file_read_int( midifile_t * , gint );
-gint i_midi_file_read_var( midifile_t * );
-gint i_midi_file_read_track( midifile_t * , midifile_track_t * , gint , gint );
-gint i_midi_file_parse_riff( midifile_t * );
-gint i_midi_file_parse_smf( midifile_t * , gint );
-void i_midi_init( midifile_t * );
-void i_midi_free( midifile_t * );
-gint i_midi_setget_tempo( midifile_t * );
-void i_midi_setget_length( midifile_t * );
-void i_midi_get_bpm( midifile_t * , gint * , gint * );
+midievent_t * i_midi_file_new_event (midifile_track_t *, int);
+void i_midi_file_skip_bytes (midifile_t *, int);
+int i_midi_file_read_byte (midifile_t *);
+int i_midi_file_read_32_le (midifile_t *);
+int i_midi_file_read_id (midifile_t *);
+int i_midi_file_read_int (midifile_t *, int);
+int i_midi_file_read_var (midifile_t *);
+int i_midi_file_read_track (midifile_t *, midifile_track_t *, int, int);
+int i_midi_file_parse_riff (midifile_t *);
+int i_midi_file_parse_smf (midifile_t *, int);
+void i_midi_init (midifile_t *);
+void i_midi_free (midifile_t *);
+int i_midi_setget_tempo (midifile_t *);
+void i_midi_setget_length (midifile_t *);
+void i_midi_get_bpm (midifile_t *, int *, int *);
 /* helper function */
-gint i_midi_parse_from_filename( const gchar * , midifile_t * );
+int i_midi_parse_from_filename (const char *, midifile_t *);
 
 #endif /* !_I_MIDI_H */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_midievent.h -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_midievent.h Changed

@@ -21,21 +21,23 @@
 #ifndef _I_MIDIEVENT_H
 #define _I_MIDIEVENT_H 1
 
-struct midievent_stru {
-  struct midievent_stru * next;		/* linked list */
-  guchar type;				/* SND_SEQ_EVENT_xxx */
-  guchar port;				/* port index */
-  guint tick;
-  guint tick_real;			/* tick with custom offset */
-  union {
-    guchar d[3];			/* channel and data bytes */
-    gint tempo;
-    guint length;			/* length of sysex data */
-    gchar * metat;			/* meta-event text */
-  } data;
-  guchar * sysex;
+struct midievent_s
+{
+    struct midievent_s * next;		/* linked list */
+    unsigned char type;				/* SND_SEQ_EVENT_xxx */
+    unsigned char port;				/* port index */
+    unsigned tick;
+    unsigned tick_real;			/* tick with custom offset */
+    union
+    {
+        unsigned char d[3];			/* channel and data bytes */
+        int tempo;
+        unsigned length;			/* length of sysex data */
+        char * metat;			/* meta-event text */
+    } data;
+    unsigned char * sysex;
 };
 
-typedef struct midievent_stru midievent_t;
+typedef struct midievent_s midievent_t;
 
 #endif /* !_I_MIDIEVENT_H */

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_utils.c -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_utils.c Changed

@@ -18,85 +18,56 @@
 *
 */
 
-
 #include "i_utils.h"
-#include <gtk/gtk.h>
-#include "amidi-plug.logo.xpm"
-
-
-void i_about_gui( void )
-{
- static GtkWidget * aboutwin = NULL;
- GtkWidget *logo_image;
- GdkPixbuf *logo_pixbuf;
-
- if ( aboutwin != NULL )
- return;
-
- aboutwin = gtk_dialog_new_with_buttons (_("About AMIDI-Plug"), NULL, 0,
- GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
- gtk_window_set_resizable( GTK_WINDOW(aboutwin) , FALSE );
-
- g_signal_connect (aboutwin, "response", (GCallback) gtk_widget_destroy, NULL);
- g_signal_connect( G_OBJECT(aboutwin) , "destroy" , G_CALLBACK(gtk_widget_destroyed) , &aboutwin );
-
- GtkWidget * vbox = gtk_dialog_get_content_area ((GtkDialog *) aboutwin);
 
- logo_pixbuf = gdk_pixbuf_new_from_xpm_data( (const gchar **)amidiplug_xpm_logo );
- logo_image = gtk_image_new_from_pixbuf( logo_pixbuf );
- gtk_box_pack_start ((GtkBox *) vbox, logo_image, FALSE, FALSE, 0);
- g_object_unref( logo_pixbuf );
-
- gchar * text = g_strjoin (NULL, _("AMIDI-Plug "), AMIDIPLUG_VERSION,
- _("\nmodular MIDI music player\n"
- "http://www.develia.org/projects.php?p=amidiplug\n\n"
- "written by Giacomo Lozito\n"
- "<james@develia.org>\n\n"
- "special thanks to...\n\n"
- "Clemens Ladisch and Jaroslav Kysela\n"
- "for their cool programs aplaymidi and amixer; those\n"
- "were really useful, along with alsa-lib docs, in order\n"
- "to learn more about the ALSA API\n\n"
- "Alfredo Spadafina\n"
- "for the nice midi keyboard logo\n\n"
- "Tony Vroon\n"
- "for the good help with alpha testing"), NULL);
-
- GtkWidget * label = gtk_label_new (text);
- gtk_box_pack_start ((GtkBox *) vbox, label, FALSE, FALSE, 0);
- g_free (text);
+#include <stdlib.h>
+#include <gtk/gtk.h>
+#include <audacious/i18n.h>
 
- gtk_widget_show_all( aboutwin );
-}
+#include "amidi-plug.logo.xpm"
 
 
-gpointer i_message_gui( gchar * title , gchar * message ,
- gint type , gpointer parent_win , gboolean show_win )
+void i_about_gui (void)
 {
- GtkWidget *win;
- GtkMessageType mtype = GTK_MESSAGE_INFO;
-
- switch ( type )
- {
- case AMIDIPLUG_MESSAGE_INFO:
- mtype = GTK_MESSAGE_INFO; break;
- case AMIDIPLUG_MESSAGE_WARN:
- mtype = GTK_MESSAGE_WARNING; break;
- case AMIDIPLUG_MESSAGE_ERR:
- mtype = GTK_MESSAGE_ERROR; break;
- }
-
- if ( parent_win != NULL )
- win = gtk_message_dialog_new ((GtkWindow *) parent_win,
- GTK_DIALOG_DESTROY_WITH_PARENT, mtype, GTK_BUTTONS_OK, "%s", message);
- else
- win = gtk_message_dialog_new (NULL, 0, mtype, GTK_BUTTONS_OK, "%s", message);
-
- gtk_window_set_title( GTK_WINDOW(win) , title );
- g_signal_connect_swapped( G_OBJECT(win) , "response" , G_CALLBACK(gtk_widget_destroy) , win );
-
- if ( show_win == TRUE )
- gtk_widget_show_all( win );
-
- return win;
+ static GtkWidget * aboutwin = NULL;
+ GtkWidget * logo_image;
+ GdkPixbuf * logo_pixbuf;
+
+ if (aboutwin != NULL)
+ return;
+
+ aboutwin = gtk_dialog_new_with_buttons (_("About AMIDI-Plug"), NULL, 0,
+ GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE, NULL);
+ gtk_window_set_resizable (GTK_WINDOW (aboutwin), FALSE);
+
+ g_signal_connect (aboutwin, "response", (GCallback) gtk_widget_destroy, NULL);
+ g_signal_connect (G_OBJECT (aboutwin), "destroy", G_CALLBACK (gtk_widget_destroyed), &aboutwin);
+
+ GtkWidget * vbox = gtk_dialog_get_content_area ((GtkDialog *) aboutwin);
+
+ logo_pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) amidiplug_xpm_logo);
+ logo_image = gtk_image_new_from_pixbuf (logo_pixbuf);
+ gtk_box_pack_start ((GtkBox *) vbox, logo_image, FALSE, FALSE, 0);
+ g_object_unref (logo_pixbuf);
+
+ char * text = g_strjoin (NULL, _("AMIDI-Plug"),
+ _("\nmodular MIDI music player\n"
+ "http://www.develia.org/projects.php?p=amidiplug\n\n"
+ "written by Giacomo Lozito\n"
+ "<james@develia.org>\n\n"
+ "special thanks to...\n\n"
+ "Clemens Ladisch and Jaroslav Kysela\n"
+ "for their cool programs aplaymidi and amixer; those\n"
+ "were really useful, along with alsa-lib docs, in order\n"
+ "to learn more about the ALSA API\n\n"
+ "Alfredo Spadafina\n"
+ "for the nice midi keyboard logo\n\n"
+ "Tony Vroon\n"
+ "for the good help with alpha testing"), NULL);
+
+ GtkWidget * label = gtk_label_new (text);
+ gtk_box_pack_start ((GtkBox *) vbox, label, FALSE, FALSE, 0);
+ free (text);
+
+ gtk_widget_show_all (aboutwin);
 }

audacious-plugins-3.3.4.tar.bz2/src/amidi-plug/i_utils.h -> audacious-plugins-3.4.2.tar.bz2/src/amidi-plug/i_utils.h Changed

audacious-plugins-3.3.4.tar.bz2/src/aosd/aosd_common.h -> audacious-plugins-3.4.2.tar.bz2/src/aosd/aosd_common.h Changed

audacious-plugins-3.3.4.tar.bz2/src/aosd/ghosd-main.c -> audacious-plugins-3.4.2.tar.bz2/src/aosd/ghosd-main.c Changed

audacious-plugins-3.3.4.tar.bz2/src/aosd/ghosd.c -> audacious-plugins-3.4.2.tar.bz2/src/aosd/ghosd.c Changed

@@ -8,7 +8,6 @@
 * - added/changed some other stuff
 */
 
-#include "config.h"
 #include "aosd_common.h"
 
 #include <stdio.h>
@@ -57,11 +56,11 @@
 Atom comp_manager_atom;
 char comp_manager_hint[32];
 Window win;
- 
+
 snprintf(comp_manager_hint, 32, "_NET_WM_CM_S%d", scr);
 comp_manager_atom = XInternAtom(dpy, comp_manager_hint, False);
 win = XGetSelectionOwner(dpy, comp_manager_atom);
- 
+
 if (win != None)
 {
 return True;
@@ -84,7 +83,7 @@
 template.screen = scr;
 template.depth = 32;
 template.class = TrueColor;
- xvi = XGetVisualInfo (dpy, 
+ xvi = XGetVisualInfo (dpy,
 VisualScreenMask | VisualDepthMask | VisualClassMask,
 &template, &nvi);
 if (xvi == NULL)
@@ -101,7 +100,7 @@
 }
 }
 XFree (xvi);
- 
+
 return visual;
 }
 #endif
@@ -373,14 +372,14 @@
 fprintf(stderr, "Couldn't open display: (XXX FIXME)\n");
 return NULL;
 }
- 
+
 screen_num = DefaultScreen(dpy);
 root_win = RootWindow(dpy, screen_num);
 visual = NULL; /* unused */
 colormap = None; /* unused */
 
 win = make_window(dpy, root_win, visual, colormap, use_argbvisual);
- 
+
 ghosd = calloc(1, sizeof(Ghosd));
 ghosd->dpy = dpy;
 ghosd->visual = visual;
@@ -412,7 +411,7 @@
 fprintf(stderr, "Couldn't open display: (XXX FIXME)\n");
 return NULL;
 }
- 
+
 screen_num = DefaultScreen(dpy);
 root_win = RootWindow(dpy, screen_num);
 visual = composite_find_argb_visual(dpy, screen_num);
@@ -421,7 +420,7 @@
 colormap = XCreateColormap(dpy, root_win, visual, AllocNone);
 
 win = make_window(dpy, root_win, visual, colormap, use_argbvisual);
- 
+
 ghosd = calloc(1, sizeof(Ghosd));
 ghosd->dpy = dpy;
 ghosd->visual = visual;
@@ -443,13 +442,13 @@
 Display *dpy;
 int have_composite_x = 0;
 int composite_event_base = 0, composite_error_base = 0;
- 
+
 dpy = XOpenDisplay(NULL);
 if (dpy == NULL) {
 fprintf(stderr, "Couldn't open display: (XXX FIXME)\n");
 return 0;
 }
- 
+
 if (!XCompositeQueryExtension(dpy,
 &composite_event_base, &composite_error_base))
 have_composite_x = 0;
@@ -465,18 +464,18 @@
 {
 Display *dpy;
 int have_composite_m = 0;
- 
+
 dpy = XOpenDisplay(NULL);
 if (dpy == NULL) {
 fprintf(stderr, "Couldn't open display: (XXX FIXME)\n");
 return 0;
 }
- 
+
 if (!composite_find_manager(dpy, DefaultScreen(dpy)))
 have_composite_m = 0;
 else
 have_composite_m = 1;
- 
+
 XCloseDisplay(dpy);
 return have_composite_m;
 }

audacious-plugins-3.3.4.tar.bz2/src/asx/asx.c -> audacious-plugins-3.4.2.tar.bz2/src/asx/asx.c Changed

audacious-plugins-3.3.4.tar.bz2/src/audpl/audpl.c -> audacious-plugins-3.4.2.tar.bz2/src/audpl/audpl.c Changed

audacious-plugins-3.3.4.tar.bz2/src/blur_scope/blur_scope.c -> audacious-plugins-3.4.2.tar.bz2/src/blur_scope/blur_scope.c Changed

audacious-plugins-3.3.4.tar.bz2/src/bs2b/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/bs2b/plugin.c Changed

audacious-plugins-3.3.4.tar.bz2/src/cairo-spectrum/cairo-spectrum.c -> audacious-plugins-3.4.2.tar.bz2/src/cairo-spectrum/cairo-spectrum.c Changed

@@ -31,8 +31,6 @@
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
-#include "config.h"
-
 #define MAX_BANDS (256)
 #define VIS_DELAY 2 /* delay before falloff in frames */
 #define VIS_FALLOFF 2 /* falloff in pixels per frame */
@@ -43,24 +41,23 @@
 static gint bars[MAX_BANDS + 1];
 static gint delay[MAX_BANDS + 1];
 
-static void calculate_bands(gint bands_)
+static void calculate_xscale (void)
 {
- gint i;
-
- for (i = 0; i < bands_; i++)
- xscale[i] = powf(257., ((gfloat) i / (gfloat) bands_)) - 1;
+ for (gint i = 0; i <= bands; i ++)
+ xscale[i] = powf (256, (gfloat) i / bands) - 0.5f;
 }
 
 static void render_cb (gfloat * freq)
 {
 g_return_if_fail (spect_widget);
 
- calculate_bands(bands);
+ if (! bands)
+ return;
 
 for (gint i = 0; i < bands; i ++)
 {
- gint a = ceil (xscale[i]);
- gint b = floor (xscale[i + 1]);
+ gint a = ceilf (xscale[i]);
+ gint b = floorf (xscale[i + 1]);
 gfloat n = 0;
 
 if (b < a)
@@ -75,8 +72,12 @@
 n += freq[b] * (xscale[i + 1] - b);
 }
 
+ /* fudge factor to make the graph have the same overall height as a
+ 12-band one no matter how many bands there are */
+ n *= (gfloat) bands / 12;
+
 /* 40 dB range */
- gint x = 20 * log10 (n * 100);
+ gint x = 40 + 20 * log10f (n);
 x = CLAMP (x, 0, 40);
 
 bars[i] -= MAX (0, VIS_FALLOFF - delay[i]);
@@ -250,7 +251,7 @@
 
 bands = width / 10;
 bands = CLAMP(bands, 12, MAX_BANDS);
- calculate_bands(bands);
+ calculate_xscale ();
 
 return TRUE;
 }

audacious-plugins-3.3.4.tar.bz2/src/cd-menu-items/cd-menu-items.c -> audacious-plugins-3.4.2.tar.bz2/src/cd-menu-items/cd-menu-items.c Changed

audacious-plugins-3.3.4.tar.bz2/src/cdaudio-ng/cdaudio-ng.c -> audacious-plugins-3.4.2.tar.bz2/src/cdaudio-ng/cdaudio-ng.c Changed

audacious-plugins-3.3.4.tar.bz2/src/compressor/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/compressor/plugin.c Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Audacious_Driver.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Audacious_Driver.cxx Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Ay_Apu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Ay_Apu.cxx Changed

@@ -35,10 +35,10 @@
 	ENTRY(0.022097),ENTRY(0.031250),ENTRY(0.044194),ENTRY(0.062500),
 	ENTRY(0.088388),ENTRY(0.125000),ENTRY(0.176777),ENTRY(0.250000),
 	ENTRY(0.353553),ENTRY(0.500000),ENTRY(0.707107),ENTRY(1.000000),
-	
+
 	/*
 	// Measured from an AY-3-8910A chip with date code 8611.
-	
+
 	// Direct voltages without any load (very linear)
 	ENTRY(0.000000),ENTRY(0.046237),ENTRY(0.064516),ENTRY(0.089785),
 	ENTRY(0.124731),ENTRY(0.173118),ENTRY(0.225806),ENTRY(0.329032),
@@ -88,7 +88,7 @@
 			flags >>= 2;
 		}
 	}
-	
+
 	output( 0 );
 	volume( 1.0 );
 	reset();
@@ -99,7 +99,7 @@
 	last_time = 0;
 	noise.delay = 0;
 	noise.lfsr = 1;
-	
+
 	osc_t* osc = &oscs [osc_count];
 	do
 	{
@@ -110,7 +110,7 @@
 		osc->phase = 0;
 	}
 	while ( osc != oscs );
-	
+
 	for ( int i = sizeof regs; --i >= 0; )
 		regs [i] = 0;
 	regs [7] = 0xFF;
@@ -120,14 +120,14 @@
 void Ay_Apu::write_data_( int addr, int data )
 {
 	assert( (unsigned) addr < reg_count );
-	
+
 	if ( (unsigned) addr >= 14 )
 	{
 		#ifdef debug_printf
 			debug_printf( "Wrote to I/O port %02X\n", (int) addr );
 		#endif
 	}
-	
+
 	// envelope mode
 	if ( addr == 13 )
 	{
@@ -138,7 +138,7 @@
 		env.delay = 0; // will get set to envelope period in run_until()
 	}
 	regs [addr] = data;
-	
+
 	// handle period changes accurately
 	int i = addr >> 1;
 	if ( i < osc_count )
@@ -147,14 +147,14 @@
 				regs [i * 2] * period_factor;
 		if ( !period )
 			period = period_factor;
-		
+
 		// adjust time of next timer expiration based on change in period
 		osc_t& osc = oscs [i];
 		if ( (osc.delay += period - osc.period) < 0 )
 			osc.delay = 0;
 		osc.period = period;
 	}
-	
+
 	// TODO: same as above for envelope timer, and it also has a divide by two after it
 }
 
@@ -164,7 +164,7 @@
 void Ay_Apu::run_until( blip_time_t final_end_time )
 {
 	require( final_end_time >= last_time );
-	
+
 	// noise period and initial values
 	blip_time_t const noise_period_factor = period_factor * 2; // verified
 	blip_time_t noise_period = (regs [6] & 0x1F) * noise_period_factor;
@@ -172,7 +172,7 @@
 		noise_period = noise_period_factor;
 	blip_time_t const old_noise_delay = noise.delay;
 	blargg_ulong const old_noise_lfsr = noise.lfsr;
-	
+
 	// envelope period
 	blip_time_t const env_period_factor = period_factor * 2; // verified
 	blip_time_t env_period = (regs [12] * 0x100L + regs [11]) * env_period_factor;
@@ -180,19 +180,19 @@
 		env_period = env_period_factor; // same as period 1 on my AY chip
 	if ( !env.delay )
 		env.delay = env_period;
-	
+
 	// run each osc separately
 	for ( int index = 0; index < osc_count; index++ )
 	{
 		osc_t* const osc = &oscs [index];
 		int osc_mode = regs [7] >> index;
-		
+
 		// output
 		Blip_Buffer* const osc_output = osc->output;
 		if ( !osc_output )
 			continue;
 		osc_output->set_modified();
-		
+
 		// period
 		int half_vol = 0;
 		blip_time_t inaudible_period = (blargg_ulong) (osc_output->clock_rate() +
@@ -202,7 +202,7 @@
 			half_vol = 1; // Actually around 60%, but 50% is close enough
 			osc_mode |= tone_off;
 		}
-		
+
 		// envelope
 		blip_time_t start_time = last_time;
 		blip_time_t end_time = final_end_time;
@@ -218,7 +218,7 @@
 				end_time = start_time + env.delay;
 				if ( end_time >= final_end_time )
 					end_time = final_end_time;
-				
+
 				//if ( !(regs [12] | regs [11]) )
 				// debug_printf( "Used envelope period 0\n" );
 			}
@@ -231,7 +231,7 @@
 		{
 			osc_mode = noise_off | tone_off;
 		}
-		
+
 		// tone time
 		blip_time_t const period = osc->period;
 		blip_time_t time = start_time + osc->delay;
@@ -241,7 +241,7 @@
 			time += count * period;
 			osc->phase ^= count & 1;
 		}
-		
+
 		// noise time
 		blip_time_t ntime = final_end_time;
 		blargg_ulong noise_lfsr = 1;
@@ -252,7 +252,7 @@
 			//if ( (regs [6] & 0x1F) == 0 )
 			// debug_printf( "Used noise period 0\n" );
 		}
-		
+
 		// The following efficiently handles several cases (least demanding first):
 		// * Tone, noise, and envelope disabled, where channel acts as 4-bit DAC
 		// * Just tone or just noise, envelope disabled
@@ -260,7 +260,7 @@
 		// * Tone and noise disabled, envelope enabled with high frequency
 		// * Tone and noise together
 		// * Tone and noise together with envelope
-		
+
 		// This loop only runs one iteration if envelope is disabled. If envelope
 		// is being used as a waveform (tone and noise disabled), this loop will
 		// still be reasonably efficient since the bulk of it will be skipped.
@@ -278,7 +278,7 @@
 					synth_.offset( start_time, delta, osc_output );
 				}
 			}
-			
+
 			// Run wave and noise interleved with each catching up to the other.
 			// If one or both are disabled, their "current time" will be past end time,
 			// so there will be no significant performance hit.
@@ -316,7 +316,7 @@
 						if ( remain >= 0 )
 							ntime += noise_period + count * noise_period;
 					}
-					
+
 					// run tone
 					end = end_time;
 					if ( end_time > ntime ) end = ntime;
@@ -337,7 +337,7 @@
 					{
 						// loop usually runs less than once
 						//SUB_CASE_COUNTER( (time < end) * (end - time + period - 1) / period );
-						
+
 						while ( time < end )
 						{
 							time += period;
@@ -346,36 +346,36 @@
 					}
 				}
 				while ( time < end_time || ntime < end_time );
-				
+
 				osc->last_amp = (delta + volume) >> 1;
 				if ( !(osc_mode & tone_off) )
 					osc->phase = phase;
 			}
-			
+
 			if ( end_time >= final_end_time )
 				break; // breaks first time when envelope is disabled
-			
+
 			// next envelope step
 			if ( ++osc_env_pos >= 0 )
 				osc_env_pos -= 32;
 			volume = env.wave [osc_env_pos] >> half_vol;
-			
+
 			start_time = end_time;
 			end_time += env_period;
 			if ( end_time > final_end_time )
 				end_time = final_end_time;
 		}
 		osc->delay = time - final_end_time;
-		
+
 		if ( !(osc_mode & noise_off) )
 		{
 			noise.delay = ntime - final_end_time;
 			noise.lfsr = noise_lfsr;
 		}
 	}
-	
+
 	// TODO: optimized saw wave envelope?
-	
+
 	// maintain envelope phase
 	blip_time_t remain = final_end_time - last_time - env.delay;
 	if ( remain >= 0 )
@@ -390,6 +390,6 @@
 	env.delay = -remain;
 	assert( env.delay > 0 );
 	assert( env.pos < 0 );
-	
+
 	last_time = final_end_time;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Ay_Apu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Ay_Apu.h Changed

@@ -11,32 +11,32 @@
 public:
 	// Set buffer to generate all sound into, or disable sound if NULL
 	void output( Blip_Buffer* );
-	
+
 	// Reset sound chip
 	void reset();
-	
+
 	// Write to register at specified time
 	enum { reg_count = 16 };
 	void write( blip_time_t time, int addr, int data );
-	
+
 	// Run sound to specified time, end current time frame, then start a new
 	// time frame at time 0. Time frames have no effect on emulation and each
 	// can be whatever length is convenient.
 	void end_frame( blip_time_t length );
-	
+
 // Additional features
-	
+
 	// Set sound output of specific oscillator to buffer, where index is
 	// 0, 1, or 2. If buffer is NULL, the specified oscillator is muted.
 	enum { osc_count = 3 };
 	void osc_output( int index, Blip_Buffer* );
-	
+
 	// Set overall volume (default is 1.0)
 	void volume( double );
-	
+
 	// Set treble equalization (see documentation)
 	void treble_eq( blip_eq_t const& );
-	
+
 public:
 	Ay_Apu();
 	typedef unsigned char byte;
@@ -52,19 +52,19 @@
 	blip_time_t last_time;
 	byte latch;
 	byte regs [reg_count];
-	
+
 	struct {
 		blip_time_t delay;
 		blargg_ulong lfsr;
 	} noise;
-	
+
 	struct {
 		blip_time_t delay;
 		byte const* wave;
 		int pos;
 		byte modes [8] [48]; // values already passed through volume table
 	} env;
-	
+
 	void run_until( blip_time_t );
 	void write_data_( int addr, int data );
 public:
@@ -99,7 +99,7 @@
 {
 	if ( time > last_time )
 		run_until( time );
-	
+
 	assert( last_time >= time );
 	last_time -= time;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Ay_Cpu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Ay_Cpu.cxx Changed

@@ -75,13 +75,13 @@
 void Ay_Cpu::reset( void* m )
 {
 	mem = (uint8_t*) m;
-	
+
 	check( state == &state_ );
 	state = &state_;
 	state_.time = 0;
 	state_.base = 0;
 	end_time_ = 0;
-	
+
 	memset( &r, 0, sizeof r );
 }
 
@@ -97,9 +97,9 @@
 #define OUT( addr, data ) CPU_OUT( this, addr, data, TIME )
 
 #if BLARGG_BIG_ENDIAN
-	#define R8( n, offset ) ((r8_ - offset) [n]) 
+	#define R8( n, offset ) ((r8_ - offset) [n])
 #elif BLARGG_LITTLE_ENDIAN
-	#define R8( n, offset ) ((r8_ - offset) [(n) ^ 1]) 
+	#define R8( n, offset ) ((r8_ - offset) [(n) ^ 1])
 #else
 	#error "Byte order of CPU must be known"
 #endif
@@ -147,9 +147,7 @@
 	state_t s = this->state_;
 	this->state = &s;
 	bool warning = false;
-	
-	typedef BOOST::int8_t int8_t;
-	
+
 	union {
 		regs_t rg;
 		pairs_t rp;
@@ -157,7 +155,7 @@
 		uint16_t r16_ [4];
 	};
 	rg = this->r.b;
-	
+
 	cpu_time_t s_time = s.time;
 	uint8_t* const mem = this->mem; // cache
 	fuint16 pc = r.pc;
@@ -165,27 +163,27 @@
 	fuint16 ix = r.ix; // TODO: keep in memory for direct access?
 	fuint16 iy = r.iy;
 	int flags = r.b.flags;
-	
+
 	goto loop;
 jr_not_taken:
 	s_time -= 5;
 	goto loop;
 call_not_taken:
-	s_time -= 7; 
+	s_time -= 7;
 jp_not_taken:
 	pc += 2;
 loop:
-	
+
 	check( (unsigned long) pc < 0x10000 );
 	check( (unsigned long) sp < 0x10000 );
 	check( (unsigned) flags < 0x100 );
 	check( (unsigned) ix < 0x10000 );
 	check( (unsigned) iy < 0x10000 );
-	
+
 	fuint8 opcode;
 	opcode = READ_PROG( pc );
 	pc++;
-	
+
 	static byte const base_timing [0x100] = {
 	// 0 1 2 3 4 5 6 7 8 9 A B C D E F
 		 4,10, 7, 6, 4, 4, 7, 4, 4,11, 7, 6, 4, 4, 7, 4, // 0
@@ -205,22 +203,22 @@
 		11,10,10,19,17,11, 7,11,11, 4,10, 4,17, 8, 7,11, // E
 		11,10,10, 4,17,11, 7,11,11, 6,10, 4,17, 8, 7,11, // F
 	};
-	
+
 	fuint16 data;
 	data = base_timing [opcode];
 	if ( (s_time += data) >= 0 )
 		goto possibly_out_of_time;
 almost_out_of_time:
-	
+
 	data = READ_PROG( pc );
-	
+
 	#ifdef Z80_CPU_LOG_H
 		//log_opcode( opcode, READ_PROG( pc ) );
 		z80_log_regs( rg.a, rp.bc, rp.de, rp.hl, sp, ix, iy );
 		z80_cpu_log( "new", pc - 1, opcode, READ_PROG( pc ),
 				READ_PROG( pc + 1 ), READ_PROG( pc + 2 ) );
 	#endif
-	
+
 	switch ( opcode )
 	{
 possibly_out_of_time:
@@ -234,40 +232,40 @@
 	case 0x00: // NOP
 	CASE7( 40, 49, 52, 5B, 64, 6D, 7F ): // LD B,B etc.
 		goto loop;
-	
+
 	case 0x08:{// EX AF,AF'
 		int temp = r.alt.b.a;
 		r.alt.b.a = rg.a;
 		rg.a = temp;
-		
+
 		temp = r.alt.b.flags;
 		r.alt.b.flags = flags;
 		flags = temp;
 		goto loop;
 	}
-	
+
 	case 0xD3: // OUT (imm),A
 		pc++;
 		OUT( data + rg.a * 0x100, rg.a );
 		goto loop;
-		
+
 	case 0x2E: // LD L,imm
 		pc++;
 		rg.l = data;
 		goto loop;
-	
+
 	case 0x3E: // LD A,imm
 		pc++;
 		rg.a = data;
 		goto loop;
-	
+
 	case 0x3A:{// LD A,(addr)
 		fuint16 addr = GET_ADDR();
 		pc += 2;
 		rg.a = READ( addr );
 		goto loop;
 	}
-	
+
 // Conditional
 
 #define ZERO (flags & Z40)
@@ -277,14 +275,14 @@
 
 // JR
 #define JR( cond ) {\
-	int disp = (BOOST::int8_t) data;\
+	int disp = (int8_t) data;\
 	pc++;\
 	if ( !(cond) )\
 		goto jr_not_taken;\
 	pc += disp;\
 	goto loop;\
 }
-	
+
 	case 0x20: JR( !ZERO ) // JR NZ,disp
 	case 0x28: JR( ZERO ) // JR Z,disp
 	case 0x30: JR( !CARRY ) // JR NC,disp
@@ -296,10 +294,10 @@
 		rg.b = temp;
 		JR( temp )
 	}
-	
+
 // JP
 #define JP( cond ) if ( !(cond) ) goto jp_not_taken; pc = GET_ADDR(); goto loop;
-	
+
 	case 0xC2: JP( !ZERO ) // JP NZ,addr
 	case 0xCA: JP( ZERO ) // JP Z,addr
 	case 0xD2: JP( !CARRY ) // JP NC,addr
@@ -308,18 +306,18 @@
 	case 0xEA: JP( EVEN ) // JP PE,addr
 	case 0xF2: JP( !MINUS ) // JP P,addr
 	case 0xFA: JP( MINUS ) // JP M,addr
-	
+
 	case 0xC3: // JP addr
 		pc = GET_ADDR();
 		goto loop;
-	
+
 	case 0xE9: // JP HL
 		pc = rp.hl;
 		goto loop;
 
 // RET
 #define RET( cond ) if ( cond ) goto ret_taken; s_time -= 6; goto loop;
-	
+
 	case 0xC0: RET( !ZERO ) // RET NZ
 	case 0xC8: RET( ZERO ) // RET Z
 	case 0xD0: RET( !CARRY ) // RET NC
@@ -328,13 +326,13 @@
 	case 0xE8: RET( EVEN ) // RET PE
 	case 0xF0: RET( !MINUS ) // RET P
 	case 0xF8: RET( MINUS ) // RET M
-	
+
 	case 0xC9: // RET
 	ret_taken:
 		pc = READ_WORD( sp );
 		sp = uint16_t (sp + 2);
 		goto loop;
-	
+
 // CALL
 #define CALL( cond ) if ( cond ) goto call_taken; goto call_not_taken;
 
@@ -346,7 +344,7 @@
 	case 0xEC: CALL( EVEN ) // CALL PE,addr
 	case 0xF4: CALL( !MINUS ) // CALL P,addr
 	case 0xFC: CALL( MINUS ) // CALL M,addr
-	
+
 	case 0xCD:{// CALL addr
 	call_taken:
 		fuint16 addr = pc + 2;
@@ -355,7 +353,7 @@
 		WRITE_WORD( sp, addr );
 		goto loop;
 	}
-	
+
 	case 0xFF: // RST
 		if ( (pc - 1) > 0xFFFF )
 		{
@@ -372,7 +370,7 @@
 	case 0xF5: // PUSH AF
 		data = rg.a * 0x100u + flags;
 		goto push_data;
-	
+
 	case 0xC5: // PUSH BC
 	case 0xD5: // PUSH DE
 	case 0xE5: // PUSH HL
@@ -381,20 +379,20 @@
 		sp = uint16_t (sp - 2);
 		WRITE_WORD( sp, data );
 		goto loop;
-	
+
 	case 0xF1: // POP AF
 		flags = READ( sp );
 		rg.a = READ( sp + 1 );
 		sp = uint16_t (sp + 2);
 		goto loop;
-	
+
 	case 0xC1: // POP BC
 	case 0xD1: // POP DE
 	case 0xE1: // POP HL
 		R16( opcode, 4, 0xC1 ) = READ_WORD( sp );
 		sp = uint16_t (sp + 2);
 		goto loop;
-	
+
 // ADC/ADD/SBC/SUB
 	case 0x96: // SUB (HL)
 	case 0x86: // ADD (HL)
@@ -403,7 +401,7 @@
 	case 0x8E: // ADC (HL)
 		data = READ( rp.hl );
 		goto adc_data;
-	
+
 	case 0xD6: // SUB A,imm
 	case 0xC6: // ADD imm
 		flags &= ~C01;
@@ -411,7 +409,7 @@
 	case 0xCE: // ADC imm
 		pc++;
 		goto adc_data;
-	
+
 	CASE7( 90, 91, 92, 93, 94, 95, 97 ): // SUB r
 	CASE7( 80, 81, 82, 83, 84, 85, 87 ): // ADD r
 		flags &= ~C01;
@@ -437,11 +435,11 @@
 	case 0xBE: // CP (HL)
 		data = READ( rp.hl );
 		goto cp_data;
-	
+
 	case 0xFE: // CP imm
 		pc++;
 		goto cp_data;
-	
+
 	CASE7( B8, B9, BA, BB, BC, BD, BF ): // CP r
 		data = R8( opcode, 0xB8 );
 	cp_data: {
@@ -455,13 +453,13 @@
 		flags |= Z40;
 		goto loop;
 	}
-	
+
 // ADD HL,rp
-	
+
 	case 0x39: // ADD HL,SP
 		data = sp;
 		goto add_hl_data;
-	
+
 	case 0x09: // ADD HL,BC
 	case 0x19: // ADD HL,DE
 	case 0x29: // ADD HL,HL
@@ -476,21 +474,21 @@
 				((data ^ sum) >> 8 & H10);
 		goto loop;
 	}
-	
+
 	case 0x27:{// DAA
 		int a = rg.a;
 		if ( a > 0x99 )
 			flags |= C01;
-		
+
 		int adjust = 0x60 & -(flags & C01);
-		
+
 		if ( flags & H10 || (a & 0x0F) > 9 )
 			adjust |= 0x06;
-		
+
 		if ( flags & N02 )
 			adjust = -adjust;
 		a += adjust;
-		
+
 		flags = (flags & (C01 | N02)) |
 				((rg.a ^ a) & H10) |
 				SZ28P( (uint8_t) a );
@@ -502,26 +500,26 @@
 		// more optimized, but probably not worth the obscurity
 		int f = (rg.a + (0xFF - 0x99)) >> 8 | flags; // (a > 0x99 ? C01 : 0) | flags
 		int adjust = 0x60 & -(f & C01); // f & C01 ? 0x60 : 0
-		
+
 		if ( (((rg.a + (0x0F - 9)) ^ rg.a) | f) & H10 ) // flags & H10 || (rg.a & 0x0F) > 9
 			adjust |= 0x06;
-		
+
 		if ( f & N02 )
 			adjust = -adjust;
 		int a = rg.a + adjust;
-		
+
 		flags = (f & (N02 | C01)) | ((rg.a ^ a) & H10) | SZ28P( (uint8_t) a );
 		rg.a = a;
 		goto loop;
 	}
 	*/
-	
+
 // INC/DEC
 	case 0x34: // INC (HL)
 		data = READ( rp.hl ) + 1;
 		WRITE( rp.hl, data );
 		goto inc_set_flags;
-	
+
 	CASE7( 04, 0C, 14, 1C, 24, 2C, 3C ): // INC r
 		data = ++R8( opcode >> 3, 0 );
 	inc_set_flags:
@@ -532,12 +530,12 @@
 			goto loop;
 		flags |= V04;
 		goto loop;
-	
+
 	case 0x35: // DEC (HL)
 		data = READ( rp.hl ) - 1;
 		WRITE( rp.hl, data );
 		goto dec_set_flags;
-	
+
 	CASE7( 05, 0D, 15, 1D, 25, 2D, 3D ): // DEC r
 		data = --R8( opcode >> 3, 0 );
 	dec_set_flags:
@@ -554,46 +552,46 @@
 	case 0x23: // INC HL
 		R16( opcode, 4, 0x03 )++;
 		goto loop;
-	
+
 	case 0x33: // INC SP
 		sp = uint16_t (sp + 1);
 		goto loop;
-	
+
 	case 0x0B: // DEC BC
 	case 0x1B: // DEC DE
 	case 0x2B: // DEC HL
 		R16( opcode, 4, 0x0B )--;
 		goto loop;
-	
+
 	case 0x3B: // DEC SP
 		sp = uint16_t (sp - 1);
 		goto loop;
-	
+
 // AND
 	case 0xA6: // AND (HL)
 		data = READ( rp.hl );
 		goto and_data;
-	
+
 	case 0xE6: // AND imm
 		pc++;
 		goto and_data;
-	
+
 	CASE7( A0, A1, A2, A3, A4, A5, A7 ): // AND r
 		data = R8( opcode, 0xA0 );
 	and_data:
 		rg.a &= data;
 		flags = SZ28P( rg.a ) | H10;
 		goto loop;
-	
+
 // OR
 	case 0xB6: // OR (HL)
 		data = READ( rp.hl );
 		goto or_data;
-	
+
 	case 0xF6: // OR imm
 		pc++;
 		goto or_data;
-	
+
 	CASE7( B0, B1, B2, B3, B4, B5, B7 ): // OR r
 		data = R8( opcode, 0xB0 );
 	or_data:
@@ -605,11 +603,11 @@
 	case 0xAE: // XOR (HL)
 		data = READ( rp.hl );
 		goto xor_data;
-	
+
 	case 0xEE: // XOR imm
 		pc++;
 		goto xor_data;
-	
+
 	CASE7( A8, A9, AA, AB, AC, AD, AF ): // XOR r
 		data = R8( opcode, 0xA8 );
 	xor_data:
@@ -621,7 +619,7 @@
 	CASE7( 70, 71, 72, 73, 74, 75, 77 ): // LD (HL),r
 		WRITE( rp.hl, R8( opcode, 0x70 ) );
 		goto loop;
-	
+
 	CASE6( 41, 42, 43, 44, 45, 47 ): // LD B,r
 	CASE6( 48, 4A, 4B, 4C, 4D, 4F ): // LD C,r
 	CASE6( 50, 51, 53, 54, 55, 57 ): // LD D,r
@@ -631,70 +629,70 @@
 	CASE6( 78, 79, 7A, 7B, 7C, 7D ): // LD A,r
 		R8( opcode >> 3 & 7, 0 ) = R8( opcode & 7, 0 );
 		goto loop;
-	
+
 	CASE5( 06, 0E, 16, 1E, 26 ): // LD r,imm
 		R8( opcode >> 3, 0 ) = data;
 		pc++;
 		goto loop;
-	
+
 	case 0x36: // LD (HL),imm
 		pc++;
 		WRITE( rp.hl, data );
 		goto loop;
-	
+
 	CASE7( 46, 4E, 56, 5E, 66, 6E, 7E ): // LD r,(HL)
 		R8( opcode >> 3, 8 ) = READ( rp.hl );
 		goto loop;
-	
+
 	case 0x01: // LD rp,imm
 	case 0x11:
 	case 0x21:
 		R16( opcode, 4, 0x01 ) = GET_ADDR();
 		pc += 2;
 		goto loop;
-	
+
 	case 0x31: // LD sp,imm
 		sp = GET_ADDR();
 		pc += 2;
 		goto loop;
-	
+
 	case 0x2A:{// LD HL,(addr)
 		fuint16 addr = GET_ADDR();
 		pc += 2;
 		rp.hl = READ_WORD( addr );
 		goto loop;
 	}
-	
+
 	case 0x32:{// LD (addr),A
 		fuint16 addr = GET_ADDR();
 		pc += 2;
 		WRITE( addr, rg.a );
 		goto loop;
 	}
-	
+
 	case 0x22:{// LD (addr),HL
 		fuint16 addr = GET_ADDR();
 		pc += 2;
 		WRITE_WORD( addr, rp.hl );
 		goto loop;
 	}
-	
+
 	case 0x02: // LD (BC),A
 	case 0x12: // LD (DE),A
 		WRITE( R16( opcode, 4, 0x02 ), rg.a );
 		goto loop;
-	
+
 	case 0x0A: // LD A,(BC)
 	case 0x1A: // LD A,(DE)
 		rg.a = READ( R16( opcode, 4, 0x0A ) );
 		goto loop;
-	
+
 	case 0xF9: // LD SP,HL
 		sp = rp.hl;
 		goto loop;
-	
+
 // Rotate
-	
+
 	case 0x07:{// RLCA
 		fuint16 temp = rg.a;
 		temp = (temp << 1) | (temp >> 7);
@@ -703,7 +701,7 @@
 		rg.a = temp;
 		goto loop;
 	}
-	
+
 	case 0x0F:{// RRCA
 		fuint16 temp = rg.a;
 		flags = (flags & (S80 | Z40 | P04)) |
@@ -713,7 +711,7 @@
 		rg.a = temp;
 		goto loop;
 	}
-	
+
 	case 0x17:{// RLA
 		blargg_ulong temp = (rg.a << 1) | (flags & C01);
 		flags = (flags & (S80 | Z40 | P04)) |
@@ -722,7 +720,7 @@
 		rg.a = temp;
 		goto loop;
 	}
-	
+
 	case 0x1F:{// RRA
 		fuint16 temp = (flags << 7) | (rg.a >> 1);
 		flags = (flags & (S80 | Z40 | P04)) |
@@ -731,7 +729,7 @@
 		rg.a = temp;
 		goto loop;
 	}
-	
+
 // Misc
 	case 0x2F:{// CPL
 		fuint16 temp = ~rg.a;
@@ -741,19 +739,19 @@
 		rg.a = temp;
 		goto loop;
 	}
-	
+
 	case 0x3F:{// CCF
 		flags = ((flags & (S80 | Z40 | P04 | C01)) ^ C01) |
 				(flags << 4 & H10) |
 				(rg.a & (F20 | F08));
 		goto loop;
 	}
-	
+
 	case 0x37: // SCF
 		flags = (flags & (S80 | Z40 | P04)) | C01 |
 				(rg.a & (F20 | F08));
 		goto loop;
-	
+
 	case 0xDB: // IN A,(imm)
 		pc++;
 		rg.a = IN( data + rg.a * 0x100 );
@@ -765,52 +763,52 @@
 		rp.hl = temp;
 		goto loop;
 	}
-	
+
 	case 0xEB:{// EX DE,HL
 		fuint16 temp = rp.hl;
 		rp.hl = rp.de;
 		rp.de = temp;
 		goto loop;
 	}
-	
+
 	case 0xD9:{// EXX DE,HL
 		fuint16 temp = r.alt.w.bc;
 		r.alt.w.bc = rp.bc;
 		rp.bc = temp;
-		
+
 		temp = r.alt.w.de;
 		r.alt.w.de = rp.de;
 		rp.de = temp;
-		
+
 		temp = r.alt.w.hl;
 		r.alt.w.hl = rp.hl;
 		rp.hl = temp;
 		goto loop;
 	}
-	
+
 	case 0xF3: // DI
 		r.iff1 = 0;
 		r.iff2 = 0;
 		goto loop;
-	
+
 	case 0xFB: // EI
 		r.iff1 = 1;
 		r.iff2 = 1;
 		// TODO: delayed effect
 		goto loop;
-	
+
 	case 0x76: // HALT
 		goto halt;
-	
+
 //////////////////////////////////////// CB prefix
 	{
 	case 0xCB:
 		pc++;
 		switch ( data )
 		{
-	
+
 	// Rotate left
-		
+
 	#define RLC( read, write ) {\
 		fuint8 result = read;\
 		result = uint8_t (result << 1) | (result >> 7);\
@@ -818,67 +816,67 @@
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x06: // RLC (HL)
 			s_time += 7;
 			data = rp.hl;
 		rlc_data_addr:
 			RLC( READ( data ), WRITE( data, result ) )
-		
+
 		CASE7( 00, 01, 02, 03, 04, 05, 07 ):{// RLC r
 			uint8_t& reg = R8( data, 0 );
 			RLC( reg, reg = result )
 		}
-		
+
 	#define RL( read, write ) {\
 		fuint16 result = (read << 1) | (flags & C01);\
 		flags = SZ28PC( result );\
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x16: // RL (HL)
 			s_time += 7;
 			data = rp.hl;
 		rl_data_addr:
 			RL( READ( data ), WRITE( data, result ) )
-		
+
 		CASE7( 10, 11, 12, 13, 14, 15, 17 ):{// RL r
 			uint8_t& reg = R8( data, 0x10 );
 			RL( reg, reg = result )
 		}
-		
+
 	#define SLA( read, add, write ) {\
 		fuint16 result = (read << 1) | add;\
 		flags = SZ28PC( result );\
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x26: // SLA (HL)
 			s_time += 7;
 			data = rp.hl;
 		sla_data_addr:
 			SLA( READ( data ), 0, WRITE( data, result ) )
-		
+
 		CASE7( 20, 21, 22, 23, 24, 25, 27 ):{// SLA r
 			uint8_t& reg = R8( data, 0x20 );
 			SLA( reg, 0, reg = result )
 		}
-		
+
 		case 0x36: // SLL (HL)
 			s_time += 7;
 			data = rp.hl;
 		sll_data_addr:
 			SLA( READ( data ), 1, WRITE( data, result ) )
-		
+
 		CASE7( 30, 31, 32, 33, 34, 35, 37 ):{// SLL r
 			uint8_t& reg = R8( data, 0x30 );
 			SLA( reg, 1, reg = result )
 		}
-		
+
 	// Rotate right
-		
+
 	#define RRC( read, write ) {\
 		fuint8 result = read;\
 		flags = result & C01;\
@@ -887,18 +885,18 @@
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x0E: // RRC (HL)
 			s_time += 7;
 			data = rp.hl;
 		rrc_data_addr:
 			RRC( READ( data ), WRITE( data, result ) )
-		
+
 		CASE7( 08, 09, 0A, 0B, 0C, 0D, 0F ):{// RRC r
 			uint8_t& reg = R8( data, 0x08 );
 			RRC( reg, reg = result )
 		}
-		
+
 	#define RR( read, write ) {\
 		fuint8 result = read;\
 		fuint8 temp = result & C01;\
@@ -907,18 +905,18 @@
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x1E: // RR (HL)
 			s_time += 7;
 			data = rp.hl;
 		rr_data_addr:
 			RR( READ( data ), WRITE( data, result ) )
-		
+
 		CASE7( 18, 19, 1A, 1B, 1C, 1D, 1F ):{// RR r
 			uint8_t& reg = R8( data, 0x18 );
 			RR( reg, reg = result )
 		}
-		
+
 	#define SRA( read, write ) {\
 		fuint8 result = read;\
 		flags = result & C01;\
@@ -927,18 +925,18 @@
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x2E: // SRA (HL)
 			data = rp.hl;
 			s_time += 7;
 		sra_data_addr:
 			SRA( READ( data ), WRITE( data, result ) )
-		
+
 		CASE7( 28, 29, 2A, 2B, 2C, 2D, 2F ):{// SRA r
 			uint8_t& reg = R8( data, 0x28 );
 			SRA( reg, reg = result )
 		}
-		
+
 	#define SRL( read, write ) {\
 		fuint8 result = read;\
 		flags = result & C01;\
@@ -947,18 +945,18 @@
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x3E: // SRL (HL)
 			s_time += 7;
 			data = rp.hl;
 		srl_data_addr:
 			SRL( READ( data ), WRITE( data, result ) )
-		
+
 		CASE7( 38, 39, 3A, 3B, 3C, 3D, 3F ):{// SRL r
 			uint8_t& reg = R8( data, 0x38 );
 			SRL( reg, reg = result )
 		}
-		
+
 	// BIT
 		{
 			unsigned temp;
@@ -983,7 +981,7 @@
 					((masked - 1) >> 8 & (Z40 | P04));
 			goto loop;
 		}
-		
+
 	// SET/RES
 		CASE8( 86, 8E, 96, 9E, A6, AE, B6, BE ): // RES b,(HL)
 		CASE8( C6, CE, D6, DE, E6, EE, F6, FE ):{// SET b,(HL)
@@ -996,7 +994,7 @@
 			WRITE( rp.hl, temp );
 			goto loop;
 		}
-		
+
 		CASE7( C0, C1, C2, C3, C4, C5, C7 ): // SET 0,r
 		CASE7( C8, C9, CA, CB, CC, CD, CF ): // SET 1,r
 		CASE7( D0, D1, D2, D3, D4, D5, D7 ): // SET 2,r
@@ -1007,7 +1005,7 @@
 		CASE7( F8, F9, FA, FB, FC, FD, FF ): // SET 7,r
 			R8( data & 7, 0 ) |= 1 << (data >> 3 & 7);
 			goto loop;
-		
+
 		CASE7( 80, 81, 82, 83, 84, 85, 87 ): // RES 0,r
 		CASE7( 88, 89, 8A, 8B, 8C, 8D, 8F ): // RES 1,r
 		CASE7( 90, 91, 92, 93, 94, 95, 97 ): // RES 2,r
@@ -1059,20 +1057,20 @@
 			flags |= Z40;
 			goto loop;
 		}
-		
+
 		CASE8( 40, 48, 50, 58, 60, 68, 70, 78 ):{// IN r,(C)
 			int temp = IN( rp.bc );
 			R8( data >> 3, 8 ) = temp;
 			flags = (flags & C01) | SZ28P( temp );
 			goto loop;
 		}
-		
+
 		case 0x71: // OUT (C),0
 			rg.flags = 0;
 		CASE7( 41, 49, 51, 59, 61, 69, 79 ): // OUT (C),r
 			OUT( rp.bc, R8( data >> 3, 8 ) );
 			goto loop;
-		
+
 		{
 			unsigned temp;
 		case 0x73: // LD (ADDR),SP
@@ -1086,7 +1084,7 @@
 			WRITE_WORD( addr, temp );
 			goto loop;
 		}
-		
+
 		case 0x4B: // LD BC,(ADDR)
 		case 0x5B:{// LD DE,(ADDR)
 			fuint16 addr = GET_ADDR();
@@ -1094,14 +1092,14 @@
 			R16( data, 4, 0x4B ) = READ_WORD( addr );
 			goto loop;
 		}
-		
+
 		case 0x7B:{// LD SP,(ADDR)
 			fuint16 addr = GET_ADDR();
 			pc += 2;
 			sp = READ_WORD( addr );
 			goto loop;
 		}
-		
+
 		case 0x67:{// RRD
 			fuint8 temp = READ( rp.hl );
 			WRITE( rp.hl, (rg.a << 4) | (temp >> 4) );
@@ -1110,7 +1108,7 @@
 			rg.a = temp;
 			goto loop;
 		}
-		
+
 		case 0x6F:{// RLD
 			fuint8 temp = READ( rp.hl );
 			WRITE( rp.hl, (temp << 4) | (rg.a & 0x0F) );
@@ -1119,14 +1117,14 @@
 			rg.a = temp;
 			goto loop;
 		}
-		
+
 		CASE8( 44, 4C, 54, 5C, 64, 6C, 74, 7C ): // NEG
 			opcode = 0x10; // flag to do SBC instead of ADC
 			flags &= ~C01;
 			data = rg.a;
 			rg.a = 0;
 			goto adc_data;
-		
+
 		{
 			int inc;
 		case 0xA9: // CPD
@@ -1139,27 +1137,27 @@
 			fuint16 addr = rp.hl;
 			rp.hl = addr + inc;
 			int temp = READ( addr );
-			
+
 			int result = rg.a - temp;
 			flags = (flags & C01) | N02 |
 					((((temp ^ rg.a) & H10) ^ result) & (S80 | H10));
-			
+
 			if ( !(uint8_t) result ) flags |= Z40;
 			result -= (flags & H10) >> 4;
 			flags |= result & F08;
 			flags |= result << 4 & F20;
 			if ( !--rp.bc )
 				goto loop;
-			
+
 			flags |= V04;
 			if ( flags & Z40 || data < 0xB0 )
 				goto loop;
-			
+
 			pc -= 2;
 			s_time += 5;
 			goto loop;
 		}
-		
+
 		{
 			int inc;
 		case 0xA8: // LDD
@@ -1172,26 +1170,26 @@
 			fuint16 addr = rp.hl;
 			rp.hl = addr + inc;
 			int temp = READ( addr );
-			
+
 			addr = rp.de;
 			rp.de = addr + inc;
 			WRITE( addr, temp );
-			
+
 			temp += rg.a;
 			flags = (flags & (S80 | Z40 | C01)) |
 					(temp & F08) | (temp << 4 & F20);
 			if ( !--rp.bc )
 				goto loop;
-			
+
 			flags |= V04;
 			if ( data < 0xB0 )
 				goto loop;
-			
+
 			pc -= 2;
 			s_time += 5;
 			goto loop;
 		}
-		
+
 		{
 			int inc;
 		case 0xAB: // OUTD
@@ -1204,7 +1202,7 @@
 			fuint16 addr = rp.hl;
 			rp.hl = addr + inc;
 			int temp = READ( addr );
-			
+
 			int b = --rg.b;
 			flags = (temp >> 6 & N02) | SZ28( b );
 			if ( b && data >= 0xB0 )
@@ -1212,11 +1210,11 @@
 				pc -= 2;
 				s_time += 5;
 			}
-			
+
 			OUT( rp.bc, temp );
 			goto loop;
 		}
-		
+
 		{
 			int inc;
 		case 0xAA: // IND
@@ -1226,12 +1224,12 @@
 		case 0xA2: // INI
 		case 0xB2: // INIR
 				inc = +1;
-			
+
 			fuint16 addr = rp.hl;
 			rp.hl = addr + inc;
-			
+
 			int temp = IN( rp.bc );
-			
+
 			int b = --rg.b;
 			flags = (temp >> 6 & N02) | SZ28( b );
 			if ( b && data >= 0xB0 )
@@ -1239,25 +1237,25 @@
 				pc -= 2;
 				s_time += 5;
 			}
-			
+
 			WRITE( addr, temp );
 			goto loop;
 		}
-		
+
 		case 0x47: // LD I,A
 			r.i = rg.a;
 			goto loop;
-		
+
 		case 0x4F: // LD R,A
 			SET_R( rg.a );
 			debug_printf( "LD R,A not supported\n" );
 			warning = true;
 			goto loop;
-		
+
 		case 0x57: // LD A,I
 			rg.a = r.i;
 			goto ld_ai_common;
-		
+
 		case 0x5F: // LD A,R
 			rg.a = GET_R();
 			debug_printf( "LD A,R not supported\n" );
@@ -1265,23 +1263,23 @@
 		ld_ai_common:
 			flags = (flags & C01) | SZ28( rg.a ) | (r.iff2 << 2 & V04);
 			goto loop;
-		
+
 		CASE8( 45, 4D, 55, 5D, 65, 6D, 75, 7D ): // RETI/RETN
 			r.iff1 = r.iff2;
 			goto ret_taken;
-		
+
 		case 0x46: case 0x4E: case 0x66: case 0x6E: // IM 0
 			r.im = 0;
 			goto loop;
-		
+
 		case 0x56: case 0x76: // IM 1
 			r.im = 1;
 			goto loop;
-		
+
 		case 0x5E: case 0x7E: // IM 2
 			r.im = 2;
 			goto loop;
-		
+
 		default:
 			debug_printf( "Opcode $ED $%02X not supported\n", data );
 			warning = true;
@@ -1306,11 +1304,11 @@
 		{
 	// TODO: more efficient way of avoid negative address
 	#define IXY_DISP( ixy, disp ) uint16_t ((ixy) + (disp))
-	
+
 	#define SET_IXY( in ) if ( opcode == 0xDD ) ix = in; else iy = in;
-	
+
 	// ADD/ADC/SUB/SBC
-	
+
 		case 0x96: // SUB (IXY+disp)
 		case 0x86: // ADD (IXY+disp)
 			flags &= ~C01;
@@ -1320,7 +1318,7 @@
 			opcode = data;
 			data = READ( IXY_DISP( ixy, (int8_t) data2 ) );
 			goto adc_data;
-		
+
 		case 0x94: // SUB HXY
 		case 0x84: // ADD HXY
 			flags &= ~C01;
@@ -1329,7 +1327,7 @@
 			opcode = data;
 			data = ixy >> 8;
 			goto adc_data;
-		
+
 		case 0x95: // SUB LXY
 		case 0x85: // ADD LXY
 			flags &= ~C01;
@@ -1338,17 +1336,17 @@
 			opcode = data;
 			data = (uint8_t) ixy;
 			goto adc_data;
-		
+
 		{
 			unsigned temp;
 		case 0x39: // ADD IXY,SP
 			temp = sp;
 			goto add_ixy_data;
-		
+
 		case 0x29: // ADD IXY,HL
 			temp = ixy;
 			goto add_ixy_data;
-		
+
 		case 0x09: // ADD IXY,BC
 		case 0x19: // ADD IXY,DE
 			temp = R16( data, 4, 0x09 );
@@ -1363,63 +1361,63 @@
 			goto set_ixy;
 		}
 		}
-	
+
 	// AND
 		case 0xA6: // AND (IXY+disp)
 			pc++;
 			data = READ( IXY_DISP( ixy, (int8_t) data2 ) );
 			goto and_data;
-		
+
 		case 0xA4: // AND HXY
 			data = ixy >> 8;
 			goto and_data;
-		
+
 		case 0xA5: // AND LXY
 			data = (uint8_t) ixy;
 			goto and_data;
-	
+
 	// OR
 		case 0xB6: // OR (IXY+disp)
 			pc++;
 			data = READ( IXY_DISP( ixy, (int8_t) data2 ) );
 			goto or_data;
-		
+
 		case 0xB4: // OR HXY
 			data = ixy >> 8;
 			goto or_data;
-		
+
 		case 0xB5: // OR LXY
 			data = (uint8_t) ixy;
 			goto or_data;
-	
+
 	// XOR
 		case 0xAE: // XOR (IXY+disp)
 			pc++;
 			data = READ( IXY_DISP( ixy, (int8_t) data2 ) );
 			goto xor_data;
-		
+
 		case 0xAC: // XOR HXY
 			data = ixy >> 8;
 			goto xor_data;
-		
+
 		case 0xAD: // XOR LXY
 			data = (uint8_t) ixy;
 			goto xor_data;
-	
+
 	// CP
 		case 0xBE: // CP (IXY+disp)
 			pc++;
 			data = READ( IXY_DISP( ixy, (int8_t) data2 ) );
 			goto cp_data;
-		
+
 		case 0xBC: // CP HXY
 			data = ixy >> 8;
 			goto cp_data;
-		
+
 		case 0xBD: // CP LXY
 			data = (uint8_t) ixy;
 			goto cp_data;
-		
+
 	// LD
 		CASE7( 70, 71, 72, 73, 74, 75, 77 ): // LD (IXY+disp),r
 			data = R8( data, 0x70 );
@@ -1433,42 +1431,42 @@
 		CASE5( 44, 4C, 54, 5C, 7C ): // LD r,HXY
 			R8( data >> 3, 8 ) = ixy >> 8;
 			goto loop;
-		
+
 		case 0x64: // LD HXY,HXY
 		case 0x6D: // LD LXY,LXY
 			goto loop;
-		
+
 		CASE5( 45, 4D, 55, 5D, 7D ): // LD r,LXY
 			R8( data >> 3, 8 ) = ixy;
 			goto loop;
-		
+
 		CASE7( 46, 4E, 56, 5E, 66, 6E, 7E ): // LD r,(IXY+disp)
 			pc++;
 			R8( data >> 3, 8 ) = READ( IXY_DISP( ixy, (int8_t) data2 ) );
 			goto loop;
-		
+
 		case 0x26: // LD HXY,imm
 			pc++;
 			goto ld_hxy_data;
-			
+
 		case 0x65: // LD HXY,LXY
 			data2 = (uint8_t) ixy;
 			goto ld_hxy_data;
-		
+
 		CASE5( 60, 61, 62, 63, 67 ): // LD HXY,r
 			data2 = R8( data, 0x60 );
 		ld_hxy_data:
 			ixy = (uint8_t) ixy | (data2 << 8);
 			goto set_ixy;
-		
+
 		case 0x2E: // LD LXY,imm
 			pc++;
 			goto ld_lxy_data;
-			
+
 		case 0x6C: // LD LXY,HXY
 			data2 = ixy >> 8;
 			goto ld_lxy_data;
-		
+
 		CASE5( 68, 69, 6A, 6B, 6F ): // LD LXY,r
 			data2 = R8( data, 0x68 );
 		ld_lxy_data:
@@ -1485,26 +1483,26 @@
 		case 0xF9: // LD SP,IXY
 			sp = ixy;
 			goto loop;
-	
+
 		case 0x22:{// LD (ADDR),IXY
 			fuint16 addr = GET_ADDR();
 			pc += 2;
 			WRITE_WORD( addr, ixy );
 			goto loop;
 		}
-		
+
 		case 0x21: // LD IXY,imm
 			ixy = GET_ADDR();
 			pc += 2;
 			goto set_ixy;
-		
+
 		case 0x2A:{// LD IXY,(addr)
 			fuint16 addr = GET_ADDR();
 			ixy = READ_WORD( addr );
 			pc += 2;
 			goto set_ixy;
 		}
-		
+
 	// DD/FD CB prefix
 		case 0xCB: {
 			data = IXY_DISP( ixy, (int8_t) data2 );
@@ -1521,7 +1519,7 @@
 			case 0x1E: goto rr_data_addr; // RR (IXY)
 			case 0x2E: goto sra_data_addr; // SRA (IXY)
 			case 0x3E: goto srl_data_addr; // SRL (IXY)
-			
+
 			CASE8( 46, 4E, 56, 5E, 66, 6E, 76, 7E ):{// BIT b,(IXY+disp)
 				fuint8 temp = READ( data );
 				int masked = temp & 1 << (data2 >> 3 & 7);
@@ -1530,7 +1528,7 @@
 						((masked - 1) >> 8 & (Z40 | P04));
 				goto loop;
 			}
-			
+
 			CASE8( 86, 8E, 96, 9E, A6, AE, B6, BE ): // RES b,(IXY+disp)
 			CASE8( C6, CE, D6, DE, E6, EE, F6, FE ):{// SET b,(IXY+disp)
 				int temp = READ( data );
@@ -1541,7 +1539,7 @@
 				WRITE( data, temp );
 				goto loop;
 			}
-			
+
 			default:
 				debug_printf( "Opcode $%02X $CB $%02X not supported\n", opcode, data2 );
 				warning = true;
@@ -1549,35 +1547,35 @@
 			}
 			assert( false );
 		}
-		
+
 	// INC/DEC
 		case 0x23: // INC IXY
 			ixy = uint16_t (ixy + 1);
 			goto set_ixy;
-		
+
 		case 0x2B: // DEC IXY
 			ixy = uint16_t (ixy - 1);
 			goto set_ixy;
-		
+
 		case 0x34: // INC (IXY+disp)
 			ixy = IXY_DISP( ixy, (int8_t) data2 );
 			pc++;
 			data = READ( ixy ) + 1;
 			WRITE( ixy, data );
 			goto inc_set_flags;
-		
+
 		case 0x35: // DEC (IXY+disp)
 			ixy = IXY_DISP( ixy, (int8_t) data2 );
 			pc++;
 			data = READ( ixy ) - 1;
 			WRITE( ixy, data );
 			goto dec_set_flags;
-		
+
 		case 0x24: // INC HXY
 			ixy = uint16_t (ixy + 0x100);
 			data = ixy >> 8;
 			goto inc_xy_common;
-		
+
 		case 0x2C: // INC LXY
 			data = uint8_t (ixy + 1);
 			ixy = (ixy & 0xFF00) | data;
@@ -1589,12 +1587,12 @@
 			}
 			iy = ixy;
 			goto inc_set_flags;
-		
+
 		case 0x25: // DEC HXY
 			ixy = uint16_t (ixy - 0x100);
 			data = ixy >> 8;
 			goto dec_xy_common;
-		
+
 		case 0x2D: // DEC LXY
 			data = uint8_t (ixy - 1);
 			ixy = (ixy & 0xFF00) | data;
@@ -1606,31 +1604,31 @@
 			}
 			iy = ixy;
 			goto dec_set_flags;
-		
+
 	// PUSH/POP
 		case 0xE5: // PUSH IXY
 			data = ixy;
 			goto push_data;
-		
+
 		case 0xE1:{// POP IXY
 			ixy = READ_WORD( sp );
 			sp = uint16_t (sp + 2);
 			goto set_ixy;
 		}
-	
+
 	// Misc
-		
+
 		case 0xE9: // JP (IXY)
 			pc = ixy;
 			goto loop;
-		
+
 		case 0xE3:{// EX (SP),IXY
 			fuint16 temp = READ_WORD( sp );
 			WRITE_WORD( sp, ixy );
 			ixy = temp;
 			goto set_ixy;
 		}
-		
+
 		default:
 			debug_printf( "Unnecessary DD/FD prefix encountered\n" );
 			warning = true;
@@ -1639,16 +1637,16 @@
 		}
 		assert( false );
 	}
-	
+
 	}
 	debug_printf( "Unhandled main opcode: $%02X\n", opcode );
 	assert( false );
-	
+
 halt:
 	s_time &= 3; // increment by multiple of 4
 out_of_time:
 	pc--;
-	
+
 	s.time = s_time;
 	rg.flags = flags;
 	r.ix = ix;
@@ -1658,6 +1656,6 @@
 	this->r.b = rg;
 	this->state_ = s;
 	this->state = &this->state_;
-	
+
 	return warning;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Ay_Cpu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Ay_Cpu.h Changed

@@ -16,30 +16,27 @@
 public:
 	// Clear all registers and keep pointer to 64K memory passed in
 	void reset( void* mem_64k );
-	
+
 	// Run until specified time is reached. Returns true if suspicious/unsupported
 	// instruction was encountered at any point during run.
 	bool run( cpu_time_t end_time );
-	
+
 	// Time of beginning of next instruction
 	cpu_time_t time() const             { return state->time + state->base; }
-	
+
 	// Alter current time. Not supported during run() call.
 	void set_time( cpu_time_t t )       { state->time = t - state->base; }
 	void adjust_time( int delta )       { state->time += delta; }
-	
-	typedef BOOST::uint8_t uint8_t;
-	typedef BOOST::uint16_t uint16_t;
-	
+
 	#if BLARGG_BIG_ENDIAN
 		struct regs_t { uint8_t b, c, d, e, h, l, flags, a; };
 	#else
 		struct regs_t { uint8_t c, b, e, d, l, h, a, flags; };
 	#endif
 	BOOST_STATIC_ASSERT( sizeof (regs_t) == 8 );
-	
+
 	struct pairs_t { uint16_t bc, de, hl, fa; };
-	
+
 	// Registers are not updated until run() returns
 	struct registers_t {
 		uint16_t pc;
@@ -61,10 +58,10 @@
 		uint8_t im;
 	};
 	//registers_t r; (below for efficiency)
-	
+
 	// can read this far past end of memory
 	enum { cpu_padding = 0x100 };
-	
+
 public:
 	Ay_Cpu();
 private:

audacious-plugins-3.3.4.tar.bz2/src/console/Ay_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Ay_Emu.cxx Changed

@@ -28,12 +28,12 @@
 {
 	beeper_output = 0;
 	set_type( gme_ay_type );
-	
+
 	static const char* const names [osc_count] = {
 		"Wave 1", "Wave 2", "Wave 3", "Beeper"
 	};
 	set_voice_names( names );
-	
+
 	static int const types [osc_count] = {
 		wave_type | 0, wave_type | 1, wave_type | 2, mixed_type | 0
 	};
@@ -50,7 +50,7 @@
 	long pos = ptr - (byte const*) file.header;
 	long file_size = file.end - (byte const*) file.header;
 	assert( (unsigned long) pos <= (unsigned long) file_size - 2 );
-	int offset = (BOOST::int16_t) get_be16( ptr );
+	int offset = (int16_t) GET_BE16( ptr );
 	if ( !offset || blargg_ulong (pos + offset) > blargg_ulong (file_size - min_size) )
 		return 0;
 	return ptr + offset;
@@ -61,18 +61,18 @@
 	typedef Ay_Emu::header_t header_t;
 	out->header = (header_t const*) in;
 	out->end = in + size;
-	
+
 	if ( size < Ay_Emu::header_size )
 		return gme_wrong_file_type;
-	
+
 	header_t const& h = *(header_t const*) in;
 	if ( memcmp( h.tag, "ZXAYEMUL", 8 ) )
 		return gme_wrong_file_type;
-	
+
 	out->tracks = get_data( *out, h.track_info, (h.max_track + 1) * 4 );
 	if ( !out->tracks )
 		return "Missing track data";
-	
+
 	return 0;
 }
 
@@ -81,8 +81,8 @@
 	Gme_File::copy_field_( out->song, (char const*) get_data( file, file.tracks + track * 4, 1 ) );
 	byte const* track_info = get_data( file, file.tracks + track * 4 + 2, 6 );
 	if ( track_info )
-		out->length = get_be16( track_info + 4 ) * (1000L / 50); // frames to msec
-	
+		out->length = GET_BE16( track_info + 4 ) * (1000L / 50); // frames to msec
+
 	Gme_File::copy_field_( out->author, (char const*) get_data( file, file.header->author, 1 ) );
 	Gme_File::copy_field_( out->comment, (char const*) get_data( file, file.header->comment, 1 ) );
 }
@@ -96,16 +96,16 @@
 struct Ay_File : Gme_Info_
 {
 	Ay_Emu::file_t file;
-	
+
 	Ay_File() { set_type( gme_ay_type ); }
-	
+
 	blargg_err_t load_mem_( byte const* begin, long size )
 	{
 		RETURN_ERR( parse_header( begin, size, &file ) );
 		set_track_count( file.header->max_track + 1 );
 		return 0;
 	}
-	
+
 	blargg_err_t track_info_( track_info_t* out, int track ) const
 	{
 		copy_ay_fields( file, out, track );
@@ -124,19 +124,19 @@
 blargg_err_t Ay_Emu::load_mem_( byte const* in, long size )
 {
 	assert( offsetof (header_t,track_info [2]) == header_size );
-	
+
 	RETURN_ERR( parse_header( in, size, &file ) );
 	set_track_count( file.header->max_track + 1 );
-	
+
 	if ( file.header->vers > 2 )
 		set_warning( "Unknown file version" );
-	
+
 	set_voice_count( osc_count );
 	apu.volume( gain() );
-	
+
 	return setup_buffer( spectrum_clock );
 }
-	
+
 void Ay_Emu::update_eq( blip_eq_t const& eq )
 {
 	apu.treble_eq( eq );
@@ -160,43 +160,43 @@
 blargg_err_t Ay_Emu::start_track_( int track )
 {
 	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	
+
 	memset( mem.ram + 0x0000, 0xC9, 0x100 ); // fill RST vectors with RET
 	memset( mem.ram + 0x0100, 0xFF, 0x4000 - 0x100 );
 	memset( mem.ram + ram_start, 0x00, sizeof mem.ram - ram_start );
 	memset( mem.padding1, 0xFF, sizeof mem.padding1 );
 	memset( mem.ram + 0x10000, 0xFF, sizeof mem.ram - 0x10000 );
-	
+
 	// locate data blocks
 	byte const* const data = get_data( file, file.tracks + track * 4 + 2, 14 );
 	if ( !data ) return "File data missing";
-	
+
 	byte const* const more_data = get_data( file, data + 10, 6 );
 	if ( !more_data ) return "File data missing";
-	
+
 	byte const* blocks = get_data( file, data + 12, 8 );
 	if ( !blocks ) return "File data missing";
-	
+
 	// initial addresses
 	cpu::reset( mem.ram );
-	r.sp = get_be16( more_data );
+	r.sp = GET_BE16( more_data );
 	r.b.a = r.b.b = r.b.d = r.b.h = data [8];
 	r.b.flags = r.b.c = r.b.e = r.b.l = data [9];
 	r.alt.w = r.w;
 	r.ix = r.iy = r.w.hl;
-	
-	unsigned addr = get_be16( blocks );
+
+	unsigned addr = GET_BE16( blocks );
 	if ( !addr ) return "File data missing";
-	
-	unsigned init = get_be16( more_data + 2 );
+
+	unsigned init = GET_BE16( more_data + 2 );
 	if ( !init )
 		init = addr;
-	
+
 	// copy blocks into memory
 	do
 	{
 		blocks += 2;
-		unsigned len = get_be16( blocks ); blocks += 2;
+		unsigned len = GET_BE16( blocks ); blocks += 2;
 		if ( addr + len > 0x10000 )
 		{
 			set_warning( "Bad data block size" );
@@ -213,15 +213,15 @@
 		if ( addr < ram_start && addr >= 0x400 ) // several tracks use low data
 			debug_printf( "Block addr in ROM\n" );
 		memcpy( mem.ram + addr, in, len );
-		
+
 		if ( file.end - blocks < 8 )
 		{
 			set_warning( "Missing file data" );
 			break;
 		}
 	}
-	while ( (addr = get_be16( blocks )) != 0 );
-	
+	while ( (addr = GET_BE16( blocks )) != 0 );
+
 	// copy and configure driver
 	static byte const passive [] = {
 		0xF3, // DI
@@ -241,7 +241,7 @@
 		0x18, 0xF7 // JR LOOP
 	};
 	memcpy( mem.ram, passive, sizeof passive );
-	unsigned play_addr = get_be16( more_data + 4 );
+	unsigned play_addr = GET_BE16( more_data + 4 );
 	//debug_printf( "Play: $%04X\n", play_addr );
 	if ( play_addr )
 	{
@@ -251,24 +251,24 @@
 	}
 	mem.ram [2] = init;
 	mem.ram [3] = init >> 8;
-	
+
 	mem.ram [0x38] = 0xFB; // Put EI at interrupt vector (followed by RET)
-	
+
 	memcpy( mem.ram + 0x10000, mem.ram, 0x80 ); // some code wraps around (ugh)
-	
+
 	beeper_delta = int (apu.amp_range * 0.65);
 	last_beeper = 0;
 	apu.reset();
 	next_play = play_period;
-	
+
 	// start at spectrum speed
 	change_clock_rate( spectrum_clock );
 	set_tempo( tempo() );
-	
+
 	spectrum_mode = false;
 	cpc_mode = false;
 	cpc_latch = 0;
-	
+
 	return 0;
 }
 
@@ -284,14 +284,14 @@
 			spectrum_mode = true;
 			apu_addr = data & 0x0F;
 			return;
-		
+
 		case 0xBEFD:
 			spectrum_mode = true;
 			apu.write( time, apu_addr, data );
 			return;
 		}
 	}
-	
+
 	if ( !spectrum_mode )
 	{
 		switch ( addr >> 8 )
@@ -302,22 +302,22 @@
 			case 0xC0:
 				apu_addr = cpc_latch & 0x0F;
 				goto enable_cpc;
-			
+
 			case 0x80:
 				apu.write( time, apu_addr, cpc_latch );
 				goto enable_cpc;
 			}
 			break;
-		
+
 		case 0xF4:
 			cpc_latch = data;
 			goto enable_cpc;
 		}
 	}
-	
+
 	debug_printf( "Unmapped OUT: $%04X <- $%02X\n", addr, data );
 	return;
-	
+
 enable_cpc:
 	if ( !cpc_mode )
 	{
@@ -330,7 +330,7 @@
 void ay_cpu_out( Ay_Cpu* cpu, cpu_time_t time, unsigned addr, int data )
 {
 	Ay_Emu& emu = STATIC_CAST(Ay_Emu&,*cpu);
-	
+
 	if ( (addr & 0xFF) == 0xFE && !emu.cpc_mode )
 	{
 		int delta = emu.beeper_delta;
@@ -355,7 +355,7 @@
 	// keyboard read and other things
 	if ( (addr & 0xFF) == 0xFE )
 		return 0xFF; // other values break some beeper tunes
-	
+
 	debug_printf( "Unmapped IN : $%04X\n", addr );
 	return 0xFF;
 }
@@ -365,22 +365,22 @@
 	set_time( 0 );
 	if ( !(spectrum_mode | cpc_mode) )
 		duration /= 2; // until mode is set, leave room for halved clock rate
-	
+
 	while ( time() < duration )
 	{
 		cpu::run( min( duration, (blip_time_t) next_play ) );
-		
+
 		if ( time() >= next_play )
 		{
 			next_play += play_period;
-			
+
 			if ( r.iff1 )
 			{
 				if ( mem.ram [r.pc] == 0x76 )
 					r.pc++;
-				
+
 				r.iff1 = r.iff2 = 0;
-				
+
 				mem.ram [--r.sp] = uint8_t (r.pc >> 8);
 				mem.ram [--r.sp] = uint8_t (r.pc);
 				r.pc = 0x38;
@@ -398,8 +398,8 @@
 	next_play -= duration;
 	check( next_play >= 0 );
 	adjust_time( -duration );
-	
+
 	apu.end_frame( duration );
-	
+
 	return 0;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Ay_Emu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Ay_Emu.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Blip_Buffer.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Blip_Buffer.cxx Changed

@@ -37,13 +37,13 @@
 	clock_rate_ = 0;
 	bass_freq_ = 16;
 	length_ = 0;
-	
+
 	// assumptions code makes about implementation-defined features
 	#ifndef NDEBUG
 		// right shift of negative value preserves sign
 		buf_t_ i = -0x7FFFFFFE;
 		assert( (i >> 1) == -0x3FFFFFFF );
-		
+
 		// casting to short truncates to 16 bits and sign-extends
 		i = 0x18000;
 		assert( (short) i == -0x8000 );
@@ -83,7 +83,7 @@
 		assert( 0 );
 		return "Internal (tried to resize Silent_Blip_Buffer)";
 	}
-	
+
 	// start with maximum length that resampled time can represent
 	long new_size = (UINT_MAX >> BLIP_BUFFER_ACCURACY) - blip_buffer_extra_ - 64;
 	if ( msec != blip_max_length )
@@ -94,7 +94,7 @@
 		else
 			assert( 0 ); // fails if requested buffer length exceeds limit
 	}
-	
+
 	if ( buffer_size_ != new_size )
 	{
 		void* p = realloc( buffer_, (new_size + blip_buffer_extra_) * sizeof *buffer_ );
@@ -102,10 +102,10 @@
 			return "Out of memory";
 		buffer_ = (buf_t_*) p;
 	}
-	
+
 	buffer_size_ = new_size;
 	assert( buffer_size_ != silent_buf_size );
-	
+
 	// update things based on the sample rate
 	sample_rate_ = new_rate;
 	length_ = new_size * 1000 / new_rate - 1;
@@ -114,9 +114,9 @@
 	if ( clock_rate_ )
 		clock_rate( clock_rate_ );
 	bass_freq( bass_freq_ );
-	
+
 	clear();
-	
+
 	return 0; // success
 }
 
@@ -167,7 +167,7 @@
 		assert( 0 ); // sample rate and clock rates must be set first
 		return 0;
 	}
-	
+
 	if ( count > buffer_size_ )
 		count = buffer_size_;
 	blip_resampled_time_t time = (blip_resampled_time_t) count << BLIP_BUFFER_ACCURACY;
@@ -179,7 +179,7 @@
 	if ( count )
 	{
 		remove_silence( count );
-		
+
 		// copy remaining samples to beginning and clear old samples
 		long remain = samples_avail() + blip_buffer_extra_;
 		memmove( buffer_, buffer_ + count, remain * sizeof *buffer_ );
@@ -221,12 +221,12 @@
 {
 	if ( cutoff >= 0.999 )
 		cutoff = 0.999;
-	
+
 	if ( treble < -300.0 )
 		treble = -300.0;
 	if ( treble > 5.0 )
 		treble = 5.0;
-	
+
 	double const maxh = 4096.0;
 	double const rolloff = pow( 10.0, 1.0 / (maxh * 20.0) * treble / (1.0 - cutoff) );
 	double const pow_a_n = pow( rolloff, maxh - maxh * cutoff );
@@ -236,17 +236,17 @@
 		double angle = ((i - count) * 2 + 1) * to_angle;
 		double angle_maxh = angle * maxh;
 		double angle_maxh_mid = angle_maxh * cutoff;
-		
+
 		double y = maxh;
-		
+
 		// 0 to Fs/2*cutoff, flat
 		if ( angle_maxh_mid ) // unstable at t=0
 			y *= sin( angle_maxh_mid ) / angle_maxh_mid;
-		
+
 		// Fs/2*cutoff to Fs/2, logarithmic rolloff
 		double cosa = cos( angle );
 		double den = 1 + rolloff * (rolloff - cosa - cosa);
-		
+
 		// Becomes unstable when rolloff is near 1.0 and t is near 0,
 		// which is the only time den becomes small
 		if ( den > 1e-13 )
@@ -254,10 +254,10 @@
 			double num =
 				(cos( angle_maxh - angle ) * rolloff - cos( angle_maxh )) * pow_a_n -
 				 cos( angle_maxh_mid - angle ) * rolloff + cos( angle_maxh_mid );
-			
+
 			y = y * cutoff + num / den;
 		}
-		
+
 		out [i] = (float) y;
 	}
 }
@@ -271,9 +271,9 @@
 	if ( cutoff_freq )
 		oversample = half_rate / cutoff_freq;
 	double cutoff = rolloff_freq * oversample / half_rate;
-	
+
 	gen_sinc( out, count, blip_res * oversample, treble, cutoff );
-	
+
 	// apply (half of) hamming window
 	double to_fraction = PI / (count - 1);
 	for ( int i = count; i--; )
@@ -298,7 +298,7 @@
 		impulses [size - blip_res + p] += (short) error;
 		//printf( "error: %ld\n", error );
 	}
-	
+
 	//for ( int i = blip_res; i--; printf( "\n" ) )
 	// for ( int j = 0; j < width / 2; j++ )
 	// printf( "%5ld,", impulses [j * blip_res + i + 1] );
@@ -307,31 +307,31 @@
 void Blip_Synth_::treble_eq( blip_eq_t const& eq )
 {
 	float fimpulse [blip_res / 2 * (blip_widest_impulse_ - 1) + blip_res * 2];
-	
+
 	int const half_size = blip_res / 2 * (width - 1);
 	eq.generate( &fimpulse [blip_res], half_size );
-	
+
 	int i;
-	
+
 	// need mirror slightly past center for calculation
 	for ( i = blip_res; i--; )
 		fimpulse [blip_res + half_size + i] = fimpulse [blip_res + half_size - 1 - i];
-	
+
 	// starts at 0
 	for ( i = 0; i < blip_res; i++ )
 		fimpulse [i] = 0.0f;
-	
+
 	// find rescale factor
 	double total = 0.0;
 	for ( i = 0; i < half_size; i++ )
 		total += fimpulse [blip_res + i];
-	
+
 	//double const base_unit = 44800.0 - 128 * 18; // allows treble up to +0 dB
 	//double const base_unit = 37888.0; // allows treble to +5 dB
 	double const base_unit = 32768.0; // necessary for blip_unscaled to work
 	double rescale = base_unit / 2 / total;
 	kernel_unit = (long) base_unit;
-	
+
 	// integrate, first difference, rescale, convert to int
 	double sum = 0.0;
 	double next = 0.0;
@@ -343,7 +343,7 @@
 		next += fimpulse [i + blip_res];
 	}
 	adjust_impulse();
-	
+
 	// volume might require rescaling
 	double vol = volume_unit_;
 	if ( vol )
@@ -360,26 +360,26 @@
 		// use default eq if it hasn't been set yet
 		if ( !kernel_unit )
 			treble_eq( -8.0 );
-		
+
 		volume_unit_ = new_unit;
 		double factor = new_unit * (1L << blip_sample_bits) / kernel_unit;
-		
+
 		if ( factor > 0.0 )
 		{
 			int shift = 0;
-			
+
 			// if unit is really small, might need to attenuate kernel
 			while ( factor < 2.0 )
 			{
 				shift++;
 				factor *= 2.0;
 			}
-			
+
 			if ( shift )
 			{
 				kernel_unit >>= shift;
 				assert( kernel_unit > 0 ); // fails if volume unit is too low
-				
+
 				// keep values positive to avoid round-towards-zero of sign-preserving
 				// right shift for negative values
 				long offset = 0x8000 + (1 << (shift - 1));
@@ -400,12 +400,12 @@
 	long count = samples_avail();
 	if ( count > max_samples )
 		count = max_samples;
-	
+
 	if ( count )
 	{
 		int const bass = BLIP_READER_BASS( *this );
 		BLIP_READER_BEGIN( reader, *this );
-		
+
 		if ( !stereo )
 		{
 			for ( blip_long n = count; n; --n )
@@ -430,7 +430,7 @@
 			}
 		}
 		BLIP_READER_END( reader, *this );
-		
+
 		remove_samples( count );
 	}
 	return count;
@@ -443,9 +443,9 @@
 		assert( 0 );
 		return;
 	}
-	
+
 	buf_t_* out = buffer_ + (offset_ >> BLIP_BUFFER_ACCURACY) + blip_widest_impulse_ / 2;
-	
+
 	int const sample_shift = blip_sample_bits - 16;
 	int prev = 0;
 	while ( count-- )

audacious-plugins-3.3.4.tar.bz2/src/console/Blip_Buffer.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Blip_Buffer.h Changed

@@ -9,7 +9,7 @@
 	#if INT_MAX < 0x7FFFFFFF
 		#error "int must be at least 32 bits"
 	#endif
-	
+
 	typedef int blip_long;
 	typedef unsigned blip_ulong;
 
@@ -23,66 +23,66 @@
 class Blip_Buffer {
 public:
 	typedef const char* blargg_err_t;
-	
+
 	// Set output sample rate and buffer length in milliseconds (1/1000 sec, defaults
 	// to 1/4 second), then clear buffer. Returns NULL on success, otherwise if there
 	// isn't enough memory, returns error without affecting current buffer setup.
 	blargg_err_t set_sample_rate( long samples_per_sec, int msec_length = 1000 / 4 );
-	
+
 	// Set number of source time units per second
 	void clock_rate( long );
-	
+
 	// End current time frame of specified duration and make its samples available
 	// (along with any still-unread samples) for reading with read_samples(). Begins
 	// a new time frame at the end of the current frame.
 	void end_frame( blip_time_t time );
-	
+
 	// Read at most 'max_samples' out of buffer into 'dest', removing them from from
 	// the buffer. Returns number of samples actually read and removed. If stereo is
 	// true, increments 'dest' one extra time after writing each sample, to allow
 	// easy interleving of two channels into a stereo output buffer.
 	long read_samples( blip_sample_t* dest, long max_samples, int stereo = 0 );
-	
+
 // Additional optional features
 
 	// Current output sample rate
 	long sample_rate() const;
-	
+
 	// Length of buffer, in milliseconds
 	int length() const;
-	
+
 	// Number of source time units per second
 	long clock_rate() const;
-	
+
 	// Set frequency high-pass filter frequency, where higher values reduce bass more
 	void bass_freq( int frequency );
-	
+
 	// Number of samples delay from synthesis to samples read out
 	int output_latency() const;
-	
+
 	// Remove all available samples and clear buffer to silence. If 'entire_buffer' is
 	// false, just clears out any samples waiting rather than the entire buffer.
 	void clear( int entire_buffer = 1 );
-	
+
 	// Number of samples available for reading with read_samples()
 	long samples_avail() const;
-	
+
 	// Remove 'count' samples from those waiting to be read
 	void remove_samples( long count );
-	
+
 // Experimental features
-	
+
 	// Count number of clocks needed until 'count' samples will be available.
 	// If buffer can't even hold 'count' samples, returns number of clocks until
 	// buffer becomes full.
 	blip_time_t count_clocks( long count ) const;
-	
+
 	// Number of raw samples that can be mixed within frame of specified duration.
 	long count_samples( blip_time_t duration ) const;
-	
+
 	// Mix 'count' samples from 'buf' into buffer.
 	void mix_samples( blip_sample_t const* buf, long count );
-	
+
 	// not documented yet
 	void set_modified() { modified_ = 1; }
 	int clear_modified() { int b = modified_; modified_ = 0; return b; }
@@ -94,7 +94,7 @@
 public:
 	Blip_Buffer();
 	~Blip_Buffer();
-	
+
 	// Deprecated
 	typedef blip_resampled_time_t resampled_time_t;
 	blargg_err_t sample_rate( long r ) { return set_sample_rate( r ); }
@@ -120,10 +120,6 @@
 	friend class Blip_Reader;
 };
 
-#ifdef HAVE_CONFIG_H
-	#include "config.h"
-#endif
-
 // Number of bits in resample ratio fraction. Higher values give a more accurate ratio
 // but reduce maximum buffer size.
 #ifndef BLIP_BUFFER_ACCURACY
@@ -147,24 +143,24 @@
 	int const blip_buffer_extra_ = blip_widest_impulse_ + 2;
 	int const blip_res = 1 << BLIP_PHASE_BITS;
 	class blip_eq_t;
-	
+
 	class Blip_Synth_Fast_ {
 	public:
 		Blip_Buffer* buf;
 		int last_amp;
 		int delta_factor;
-		
+
 		void volume_unit( double );
 		Blip_Synth_Fast_();
 		void treble_eq( blip_eq_t const& ) { }
 	};
-	
+
 	class Blip_Synth_ {
 	public:
 		Blip_Buffer* buf;
 		int last_amp;
 		int delta_factor;
-		
+
 		void volume_unit( double );
 		Blip_Synth_( short* impulses, int width );
 		void treble_eq( blip_eq_t const& );
@@ -190,14 +186,14 @@
 public:
 	// Set overall volume of waveform
 	void volume( double v ) { impl.volume_unit( v * (1.0 / (range < 0 ? -range : range)) ); }
-	
+
 	// Configure low-pass filter (see blip_buffer.txt)
 	void treble_eq( blip_eq_t const& eq ) { impl.treble_eq( eq ); }
-	
+
 	// Get/set Blip_Buffer used for output
 	Blip_Buffer* output() const { return impl.buf; }
 	void output( Blip_Buffer* b ) { impl.buf = b; impl.last_amp = 0; }
-	
+
 	// Update amplitude of waveform at given time. Using this requires a separate
 	// Blip_Synth for each waveform.
 	void update( blip_time_t time, int amplitude );
@@ -209,10 +205,10 @@
 	// The actual change in amplitude is delta * (volume / range)
 	void offset( blip_time_t, int delta, Blip_Buffer* ) const;
 	void offset( blip_time_t t, int delta ) const { offset( t, delta, impl.buf ); }
-	
+
 	// Works directly in terms of fractional output samples. Contact author for more info.
 	void offset_resampled( blip_resampled_time_t, int delta, Blip_Buffer* ) const;
-	
+
 	// Same as offset(), except code is inlined for higher performance
 	void offset_inline( blip_time_t t, int delta, Blip_Buffer* buf ) const {
 		offset_resampled( t * buf->factor_ + buf->offset_, delta, buf );
@@ -220,7 +216,7 @@
 	void offset_inline( blip_time_t t, int delta ) const {
 		offset_resampled( t * impl.buf->factor_ + impl.buf->offset_, delta, impl.buf );
 	}
-	
+
 private:
 #if BLIP_BUFFER_FAST
 	Blip_Synth_Fast_ impl;
@@ -239,10 +235,10 @@
 	// Logarithmic rolloff to treble dB at half sampling rate. Negative values reduce
 	// treble, small positive values (0 to 5.0) increase treble.
 	blip_eq_t( double treble_db = 0 );
-	
+
 	// See blip_buffer.txt
 	blip_eq_t( double treble, long rolloff_freq, long sample_rate, long cutoff_freq = 0 );
-	
+
 private:
 	double treble;
 	long rolloff_freq;
@@ -263,7 +259,7 @@
 	blargg_err_t set_sample_rate( long samples_per_sec, int msec_length );
 	blip_time_t count_clocks( long count ) const;
 	void mix_samples( blip_sample_t const* buf, long count );
-	
+
 	Silent_Blip_Buffer();
 };
 
@@ -323,7 +319,7 @@
 	blip_long read_raw() const { return accum; }
 	void next( int bass_shift = 9 ) { accum += *buf++ - (accum >> bass_shift); }
 	void end( Blip_Buffer& b ) { b.reader_accum_ = accum; }
-	
+
 private:
 	const Blip_Buffer::buf_t_* buf;
 	blip_long accum;
@@ -346,14 +342,14 @@
 
 #if BLIP_BUFFER_FAST
 	blip_long left = buf [0] + delta;
-	
+
 	// Kind of crappy, but doing shift after multiply results in overflow.
 	// Alternate way of delaying multiply by delta_factor results in worse
 	// sub-sample resolution.
 	blip_long right = (delta >> BLIP_PHASE_BITS) * phase;
 	left -= right;
 	right += buf [1];
-	
+
 	buf [0] = left;
 	buf [1] = right;
 #else
@@ -361,17 +357,17 @@
 	int const fwd = (blip_widest_impulse_ - quality) / 2;
 	int const rev = fwd + quality - 2;
 	int const mid = quality / 2 - 1;
-	
+
 	imp_t const* BLIP_RESTRICT imp = impulses + blip_res - phase;
-	
+
 	#if defined (_M_IX86) || defined (_M_IA64) || defined (__i486__) || \
 			defined (__x86_64__) || defined (__ia64__) || defined (__i386__)
-	
+
 	// straight forward implementation resulted in better code on GCC for x86
-	
+
 	#define ADD_IMP( out, in ) \
 		buf [out] += (blip_long) imp [blip_res * (in)] * delta
-	
+
 	#define BLIP_FWD( i ) {\
 		ADD_IMP( fwd + i, i );\
 		ADD_IMP( fwd + 1 + i, i + 1 );\
@@ -392,14 +388,14 @@
 		if ( quality > 12 ) BLIP_REV( 6 )
 		if ( quality > 8 ) BLIP_REV( 4 )
 		BLIP_REV( 2 )
-		
+
 		ADD_IMP( rev , 1 );
 		ADD_IMP( rev + 1, 0 );
-		
+
 	#else
-	
+
 	// for RISC processors, help compiler by reading ahead of writes
-	
+
 	#define BLIP_FWD( i ) {\
 		blip_long t0 = i0 * delta + buf [fwd + i];\
 		blip_long t1 = imp [blip_res * (i + 1)] * delta + buf [fwd + 1 + i];\
@@ -414,7 +410,7 @@
 		buf [rev - r] = t0;\
 		buf [rev + 1 - r] = t1;\
 	}
-		
+
 		blip_long i0 = *imp;
 		BLIP_FWD( 0 )
 		if ( quality > 8 ) BLIP_FWD( 2 )
@@ -430,13 +426,13 @@
 		if ( quality > 12 ) BLIP_REV( 6 )
 		if ( quality > 8 ) BLIP_REV( 4 )
 		BLIP_REV( 2 )
-		
+
 		blip_long t0 = i0 * delta + buf [rev ];
 		blip_long t1 = *imp * delta + buf [rev + 1];
 		buf [rev ] = t0;
 		buf [rev + 1] = t1;
 	#endif
-	
+
 #endif
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Classic_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Classic_Emu.cxx Changed

@@ -23,7 +23,7 @@
 	buf = 0;
 	stereo_buffer = 0;
 	voice_types = 0;
-	
+
 	// avoid inconsistency in our duplicated constants
 	assert( (int) wave_type == (int) Multi_Buffer::wave_type );
 	assert( (int) noise_type == (int) Multi_Buffer::noise_type );
@@ -42,7 +42,7 @@
 	if ( buf )
 		buf->bass_freq( (int) equalizer().bass );
 }
-	
+
 blargg_err_t Classic_Emu::set_sample_rate_( long rate )
 {
 	if ( !buf )
@@ -124,12 +124,12 @@
 		int header_size, void* header_out, int fill, long pad_size )
 {
 	long file_offset = pad_size - header_size;
-	
+
 	rom_addr = 0;
 	mask = 0;
 	size_ = 0;
 	rom.clear();
-	
+
 	file_size_ = in.remain();
 	if ( file_size_ <= header_size ) // <= because there must be data after header
 		return gme_wrong_file_type;
@@ -141,20 +141,20 @@
 		rom.clear();
 		return err;
 	}
-	
+
 	file_size_ -= header_size;
 	memcpy( header_out, &rom [file_offset], header_size );
-	
+
 	memset( rom.begin() , fill, pad_size );
 	memset( rom.end() - pad_size, fill, pad_size );
-	
+
 	return 0;
 }
 
 void Rom_Data_::set_addr_( long addr, int unit )
 {
 	rom_addr = addr - unit - pad_extra;
-	
+
 	long rounded = (addr + file_size_ + unit - 1) / unit * unit;
 	if ( rounded <= 0 )
 	{
@@ -168,7 +168,7 @@
 			shift++;
 		mask = (1L << shift) - 1;
 	}
-	
+
 	if ( addr < 0 )
 		addr = 0;
 	size_ = rounded;

audacious-plugins-3.3.4.tar.bz2/src/console/Classic_Emu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Classic_Emu.h Changed

@@ -20,7 +20,7 @@
 	blargg_err_t setup_buffer( long clock_rate );
 	long clock_rate() const { return clock_rate_; }
 	void change_clock_rate( long ); // experimental
-	
+
 	// Overridable
 	virtual void set_voice( int index, Blip_Buffer* center,
 			Blip_Buffer* left, Blip_Buffer* right ) = 0;
@@ -60,7 +60,7 @@
 	blargg_long rom_addr;
 	blargg_long mask;
 	blargg_long size_; // TODO: eliminate
-	
+
 	blargg_err_t load_rom_data_( Data_Reader& in, int header_size, void* header_out,
 			int fill, long pad_size );
 	void set_addr_( long addr, int unit );
@@ -76,25 +76,25 @@
 	{
 		return load_rom_data_( in, header_size, header_out, fill, pad_size );
 	}
-	
+
 	// Size of file data read in (excluding header)
 	long file_size() const { return file_size_; }
-	
+
 	// Pointer to beginning of file data
 	byte* begin() const { return rom.begin() + pad_size; }
-	
+
 	// Set address that file data should start at
 	void set_addr( long addr ) { set_addr_( addr, unit ); }
-	
+
 	// Free data
 	void clear() { rom.clear(); }
-	
+
 	// Size of data + start addr, rounded to a multiple of unit
 	long size() const { return size_; }
-	
+
 	// Pointer to unmapped page filled with same value
 	byte* unmapped() { return rom.begin(); }
-	
+
 	// Mask address to nearest power of two greater than size()
 	blargg_long mask_addr( blargg_long addr ) const
 	{
@@ -103,7 +103,7 @@
 		#endif
 		return addr & mask;
 	}
-	
+
 	// Pointer to page starting at addr. Returns unmapped() if outside data.
 	byte* at_addr( blargg_long addr )
 	{

audacious-plugins-3.3.4.tar.bz2/src/console/Data_Reader.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Data_Reader.cxx Changed

@@ -29,10 +29,10 @@
 	{
 		if ( result >= 0 && result < s )
 			return eof_error;
-		
+
 		return "Read error";
 	}
-	
+
 	return 0;
 }
 
@@ -135,7 +135,7 @@
 {
 	pos = 0;
 }
-	
+
 long Mem_File_Reader::size() const { return size_; }
 
 long Mem_File_Reader::read_avail( void* p, long s )
@@ -244,31 +244,33 @@
 
 // Gzip_File_Reader
 
-#ifdef HAVE_ZLIB_H
-
-#include "zlib.h"
-
 static const char* get_gzip_eof( const char* path, long* eof )
 {
 	FILE* file = fopen( path, "rb" );
 	if ( !file )
 		return "Couldn't open file";
-	
-	unsigned char buf [4];
-	if ( fread( buf, 2, 1, file ) > 0 && buf [0] == 0x1F && buf [1] == 0x8B )
+
+	unsigned char buf[4];
+	if (fread (buf, 2, 1, file) == 1 && buf[0] == 0x1F && buf[1] == 0x8B)
 	{
-		fseek( file, -4, SEEK_END );
-		fread( buf, 4, 1, file );
-		*eof = get_le32( buf );
+		if (fseek (file, -4, SEEK_END) != 0 || fread (buf, 4, 1, file) != 1)
+			goto ERR_CLOSE;
+		*eof = GET_LE32 (buf);
 	}
 	else
 	{
-		fseek( file, 0, SEEK_END );
-		*eof = ftell( file );
+		long pos;
+		if (fseek (file, 0, SEEK_END) != 0 || (pos = ftell (file) < 0))
+			goto ERR_CLOSE;
+		*eof = pos;
 	}
-	const char* err = (ferror( file ) || feof( file )) ? "Couldn't get file size" : 0;
-	fclose( file );
-	return err;
+
+	fclose (file);
+	return 0;
+
+ERR_CLOSE:
+	fclose (file);
+	return "Couldn't get file size";
 }
 
 Gzip_File_Reader::Gzip_File_Reader() : file_( 0 ) { }
@@ -278,13 +280,13 @@
 blargg_err_t Gzip_File_Reader::open( const char* path )
 {
 	close();
-	
+
 	RETURN_ERR( get_gzip_eof( path, &size_ ) );
-	
+
 	file_ = gzopen( path, "rb" );
 	if ( !file_ )
 		return "Couldn't open file";
-	
+
 	return 0;
 }
 
@@ -311,5 +313,3 @@
 		file_ = 0;
 	}
 }
-
-#endif

audacious-plugins-3.3.4.tar.bz2/src/console/Data_Reader.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Data_Reader.h Changed

@@ -4,27 +4,29 @@
 #ifndef DATA_READER_H
 #define DATA_READER_H
 
+#include <zlib.h>
+
 #include "blargg_common.h"
 
 // Supports reading and finding out how many bytes are remaining
 class Data_Reader {
 public:
 	virtual ~Data_Reader() { }
-	
+
 	static const char eof_error []; // returned by read() when request goes beyond end
-	
+
 	// Read at most count bytes and return number actually read, or <= 0 if error
 	virtual long read_avail( void*, long n ) = 0;
-	
+
 	// Read exactly count bytes and return error if they couldn't be read
 	virtual blargg_err_t read( void*, long count );
-	
+
 	// Number of bytes remaining until end of file
 	virtual long remain() const = 0;
-	
+
 	// Read and discard count bytes
 	virtual blargg_err_t skip( long count );
-	
+
 public:
 	Data_Reader() { }
 	typedef blargg_err_t error_t; // deprecated
@@ -39,13 +41,13 @@
 public:
 	// Size of file
 	virtual long size() const = 0;
-	
+
 	// Current position in file
 	virtual long tell() const = 0;
-	
+
 	// Go to new position
 	virtual blargg_err_t seek( long ) = 0;
-	
+
 	long remain() const;
 	blargg_err_t skip( long n );
 };
@@ -55,7 +57,7 @@
 public:
 	blargg_err_t open( const char* path );
 	void close();
-	
+
 public:
 	Std_File_Reader();
 	~Std_File_Reader();
@@ -72,7 +74,7 @@
 class Mem_File_Reader : public File_Reader {
 public:
 	Mem_File_Reader( const void*, long size );
-	
+
 public:
 	long size() const;
 	long read_avail( void*, long );
@@ -128,13 +130,12 @@
 	long remain_;
 };
 
-#ifdef HAVE_ZLIB_H
 // Gzip compressed file reader
 class Gzip_File_Reader : public File_Reader {
 public:
 	blargg_err_t open( const char* path );
 	void close();
-	
+
 public:
 	Gzip_File_Reader();
 	~Gzip_File_Reader();
@@ -143,9 +144,8 @@
 	long tell() const;
 	blargg_err_t seek( long );
 private:
-	void* file_;
+	gzFile file_;
 	long size_;
 };
-#endif
 
 #endif

audacious-plugins-3.3.4.tar.bz2/src/console/Dual_Resampler.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Dual_Resampler.cxx Changed

@@ -54,18 +54,18 @@
 	long pair_count = sample_buf_size >> 1;
 	blip_time_t blip_time = blip_buf.count_clocks( pair_count );
 	int sample_count = oversamples_per_frame - resampler.written();
-	
+
 	int new_count = play_frame( blip_time, sample_count, resampler.buffer() );
 	assert( new_count < resampler_size );
-	
+
 	blip_buf.end_frame( blip_time );
 	assert( blip_buf.samples_avail() == pair_count );
-	
+
 	resampler.write( new_count );
-	
+
 	long count = resampler.read( sample_buf.begin(), sample_buf_size );
 	assert( count == (long) sample_buf_size );
-	
+
 	mix_samples( blip_buf, out );
 	blip_buf.remove_samples( pair_count );
 }
@@ -83,7 +83,7 @@
 		out += remain;
 		buf_pos += remain;
 	}
-	
+
 	// entire frames
 	while ( count >= (long) sample_buf_size )
 	{
@@ -91,7 +91,7 @@
 		out += sample_buf_size;
 		count -= sample_buf_size;
 	}
-	
+
 	// extra
 	if ( count )
 	{
@@ -107,25 +107,25 @@
 	Blip_Reader sn;
 	int bass = sn.begin( blip_buf );
 	const dsample_t* in = sample_buf.begin();
-	
+
 	for ( int n = sample_buf_size >> 1; n--; )
 	{
 		int s = sn.read();
 		blargg_long l = (blargg_long) in [0] * 2 + s;
-		if ( (BOOST::int16_t) l != l )
+		if ( (int16_t) l != l )
 			l = 0x7FFF - (l >> 24);
-		
+
 		sn.next( bass );
 		blargg_long r = (blargg_long) in [1] * 2 + s;
-		if ( (BOOST::int16_t) r != r )
+		if ( (int16_t) r != r )
 			r = 0x7FFF - (r >> 24);
-		
+
 		in += 2;
 		out [0] = l;
 		out [1] = r;
 		out += 2;
 	}
-	
+
 	sn.end( blip_buf );
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Dual_Resampler.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Dual_Resampler.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Effects_Buffer.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Effects_Buffer.cxx Changed

@@ -66,10 +66,10 @@
 Effects_Buffer::Effects_Buffer( bool center_only ) : Multi_Buffer( 2 )
 {
 	buf_count = center_only ? max_buf_count - 4 : max_buf_count;
-	
+
 	echo_pos = 0;
 	reverb_pos = 0;
-	
+
 	stereo_remain = 0;
 	effect_remain = 0;
 	effects_enabled = false;
@@ -82,16 +82,16 @@
 {
 	if ( !echo_buf.size() )
 		RETURN_ERR( echo_buf.resize( echo_size ) );
-	
+
 	if ( !reverb_buf.size() )
 		RETURN_ERR( reverb_buf.resize( reverb_size ) );
-	
+
 	for ( int i = 0; i < buf_count; i++ )
 		RETURN_ERR( bufs [i].set_sample_rate( rate, msec ) );
-	
+
 	config( config_ );
 	clear();
-	
+
 	return Multi_Buffer::set_sample_rate( bufs [0].sample_rate(), bufs [0].length() );
 }
 
@@ -113,10 +113,10 @@
 	effect_remain = 0;
 	if ( echo_buf.size() )
 		memset( &echo_buf [0], 0, echo_size * sizeof echo_buf [0] );
-	
+
 	if ( reverb_buf.size() )
 		memset( &reverb_buf [0], 0, reverb_size * sizeof reverb_buf [0] );
-	
+
 	for ( int i = 0; i < buf_count; i++ )
 		bufs [i].clear();
 }
@@ -133,51 +133,51 @@
 void Effects_Buffer::config( const config_t& cfg )
 {
 	channels_changed();
-	
+
 	// clear echo and reverb buffers
 	if ( !config_.effects_enabled && cfg.effects_enabled && echo_buf.size() )
 	{
 		memset( &echo_buf [0], 0, echo_size * sizeof echo_buf [0] );
 		memset( &reverb_buf [0], 0, reverb_size * sizeof reverb_buf [0] );
 	}
-	
+
 	config_ = cfg;
-	
+
 	if ( config_.effects_enabled )
 	{
 		// convert to internal format
-		
+
 		chans.pan_1_levels [0] = TO_FIXED( 1 ) - TO_FIXED( config_.pan_1 );
 		chans.pan_1_levels [1] = TO_FIXED( 2 ) - chans.pan_1_levels [0];
-		
+
 		chans.pan_2_levels [0] = TO_FIXED( 1 ) - TO_FIXED( config_.pan_2 );
 		chans.pan_2_levels [1] = TO_FIXED( 2 ) - chans.pan_2_levels [0];
-		
+
 		chans.reverb_level = TO_FIXED( config_.reverb_level );
 		chans.echo_level = TO_FIXED( config_.echo_level );
-		
+
 		int delay_offset = int (1.0 / 2000 * config_.delay_variance * sample_rate());
-		
+
 		int reverb_sample_delay = int (1.0 / 1000 * config_.reverb_delay * sample_rate());
 		chans.reverb_delay_l = pin_range( reverb_size -
 				(reverb_sample_delay - delay_offset) * 2, reverb_size - 2, 0 );
 		chans.reverb_delay_r = pin_range( reverb_size + 1 -
 				(reverb_sample_delay + delay_offset) * 2, reverb_size - 1, 1 );
-		
+
 		int echo_sample_delay = int (1.0 / 1000 * config_.echo_delay * sample_rate());
 		chans.echo_delay_l = pin_range( echo_size - 1 - (echo_sample_delay - delay_offset),
 				echo_size - 1 );
 		chans.echo_delay_r = pin_range( echo_size - 1 - (echo_sample_delay + delay_offset),
 				echo_size - 1 );
-		
+
 		chan_types [0].center = &bufs [0];
 		chan_types [0].left = &bufs [3];
 		chan_types [0].right = &bufs [4];
-		
+
 		chan_types [1].center = &bufs [1];
 		chan_types [1].left = &bufs [3];
 		chan_types [1].right = &bufs [4];
-		
+
 		chan_types [2].center = &bufs [2];
 		chan_types [2].left = &bufs [5];
 		chan_types [2].right = &bufs [6];
@@ -194,7 +194,7 @@
 			c.right = &bufs [2];
 		}
 	}
-	
+
 	if ( buf_count < max_buf_count )
 	{
 		for ( int i = 0; i < chan_types_count; i++ )
@@ -221,7 +221,7 @@
 	}
 	return chan_types [out];
 }
-	
+
 void Effects_Buffer::end_frame( blip_time_t clock_count )
 {
 	int bufs_used = 0;
@@ -230,14 +230,14 @@
 		bufs_used |= bufs [i].clear_modified() << i;
 		bufs [i].end_frame( clock_count );
 	}
-	
+
 	int stereo_mask = (config_.effects_enabled ? 0x78 : 0x06);
 	if ( (bufs_used & stereo_mask) && buf_count == max_buf_count )
 		stereo_remain = bufs [0].samples_avail() + bufs [0].output_latency();
-	
+
 	if ( effects_enabled || config_.effects_enabled )
 		effect_remain = bufs [0].samples_avail() + bufs [0].output_latency();
-	
+
 	effects_enabled = config_.effects_enabled;
 }
 
@@ -249,7 +249,7 @@
 long Effects_Buffer::read_samples( blip_sample_t* out, long total_samples )
 {
 	require( total_samples % 2 == 0 ); // count must be even
-	
+
 	long remain = bufs [0].samples_avail();
 	if ( remain > (total_samples >> 1) )
 		remain = (total_samples >> 1);
@@ -258,13 +258,13 @@
 	{
 		int active_bufs = buf_count;
 		long count = remain;
-		
+
 		// optimizing mixing to skip any channels which had nothing added
 		if ( effect_remain )
 		{
 			if ( count > effect_remain )
 				count = effect_remain;
-			
+
 			if ( stereo_remain )
 			{
 				mix_enhanced( out, count );
@@ -278,25 +278,25 @@
 		else if ( stereo_remain )
 		{
 			mix_stereo( out, count );
-			active_bufs = 3; 
+			active_bufs = 3;
 		}
 		else
 		{
 			mix_mono( out, count );
-			active_bufs = 1; 
+			active_bufs = 1;
 		}
-		
+
 		out += count * 2;
 		remain -= count;
-		
+
 		stereo_remain -= count;
 		if ( stereo_remain < 0 )
 			stereo_remain = 0;
-		
+
 		effect_remain -= count;
 		if ( effect_remain < 0 )
 			effect_remain = 0;
-		
+
 		for ( int i = 0; i < buf_count; i++ )
 		{
 			if ( i < active_bufs )
@@ -305,7 +305,7 @@
 				bufs [i].remove_silence( count ); // keep time synchronized
 		}
 	}
-	
+
 	return total_samples * 2;
 }
 
@@ -314,40 +314,40 @@
 	blip_sample_t* BLIP_RESTRICT out = out_;
 	int const bass = BLIP_READER_BASS( bufs [0] );
 	BLIP_READER_BEGIN( c, bufs [0] );
-	
+
 	// unrolled loop
 	for ( blargg_long n = count >> 1; n; --n )
 	{
 		blargg_long cs0 = BLIP_READER_READ( c );
 		BLIP_READER_NEXT( c, bass );
-		
+
 		blargg_long cs1 = BLIP_READER_READ( c );
 		BLIP_READER_NEXT( c, bass );
-		
-		if ( (BOOST::int16_t) cs0 != cs0 )
+
+		if ( (int16_t) cs0 != cs0 )
 			cs0 = 0x7FFF - (cs0 >> 24);
-		((BOOST::uint32_t*) out) [0] = ((BOOST::uint16_t) cs0) | (cs0 << 16);
-		
-		if ( (BOOST::int16_t) cs1 != cs1 )
+		((uint32_t*) out) [0] = ((uint16_t) cs0) | (cs0 << 16);
+
+		if ( (int16_t) cs1 != cs1 )
 			cs1 = 0x7FFF - (cs1 >> 24);
-		((BOOST::uint32_t*) out) [1] = ((BOOST::uint16_t) cs1) | (cs1 << 16);
+		((uint32_t*) out) [1] = ((uint16_t) cs1) | (cs1 << 16);
 		out += 4;
 	}
-	
+
 	if ( count & 1 )
 	{
 		int s = BLIP_READER_READ( c );
 		BLIP_READER_NEXT( c, bass );
 		out [0] = s;
 		out [1] = s;
-		if ( (BOOST::int16_t) s != s )
+		if ( (int16_t) s != s )
 		{
 			s = 0x7FFF - (s >> 24);
 			out [0] = s;
 			out [1] = s;
 		}
 	}
-	
+
 	BLIP_READER_END( c, bufs [0] );
 }
 
@@ -358,7 +358,7 @@
 	BLIP_READER_BEGIN( c, bufs [0] );
 	BLIP_READER_BEGIN( l, bufs [1] );
 	BLIP_READER_BEGIN( r, bufs [2] );
-	
+
 	while ( count-- )
 	{
 		int cs = BLIP_READER_READ( c );
@@ -367,19 +367,19 @@
 		int right = cs + BLIP_READER_READ( r );
 		BLIP_READER_NEXT( l, bass );
 		BLIP_READER_NEXT( r, bass );
-		
-		if ( (BOOST::int16_t) left != left )
+
+		if ( (int16_t) left != left )
 			left = 0x7FFF - (left >> 24);
-		
+
 		out [0] = left;
 		out [1] = right;
-		
+
 		out += 2;
-		
-		if ( (BOOST::int16_t) right != right )
+
+		if ( (int16_t) right != right )
 			out [-1] = 0x7FFF - (right >> 24);
 	}
-	
+
 	BLIP_READER_END( r, bufs [2] );
 	BLIP_READER_END( l, bufs [1] );
 	BLIP_READER_END( c, bufs [0] );
@@ -392,58 +392,58 @@
 	BLIP_READER_BEGIN( center, bufs [2] );
 	BLIP_READER_BEGIN( sq1, bufs [0] );
 	BLIP_READER_BEGIN( sq2, bufs [1] );
-	
+
 	blip_sample_t* const reverb_buf = this->reverb_buf.begin();
 	blip_sample_t* const echo_buf = this->echo_buf.begin();
 	int echo_pos = this->echo_pos;
 	int reverb_pos = this->reverb_pos;
-	
+
 	while ( count-- )
 	{
 		int sum1_s = BLIP_READER_READ( sq1 );
 		int sum2_s = BLIP_READER_READ( sq2 );
-		
+
 		BLIP_READER_NEXT( sq1, bass );
 		BLIP_READER_NEXT( sq2, bass );
-		
+
 		int new_reverb_l = FMUL( sum1_s, chans.pan_1_levels [0] ) +
 				FMUL( sum2_s, chans.pan_2_levels [0] ) +
 				reverb_buf [(reverb_pos + chans.reverb_delay_l) & reverb_mask];
-		
+
 		int new_reverb_r = FMUL( sum1_s, chans.pan_1_levels [1] ) +
 				FMUL( sum2_s, chans.pan_2_levels [1] ) +
 				reverb_buf [(reverb_pos + chans.reverb_delay_r) & reverb_mask];
-		
+
 		fixed_t reverb_level = chans.reverb_level;
 		reverb_buf [reverb_pos] = (blip_sample_t) FMUL( new_reverb_l, reverb_level );
 		reverb_buf [reverb_pos + 1] = (blip_sample_t) FMUL( new_reverb_r, reverb_level );
 		reverb_pos = (reverb_pos + 2) & reverb_mask;
-		
+
 		int sum3_s = BLIP_READER_READ( center );
 		BLIP_READER_NEXT( center, bass );
-		
+
 		int left = new_reverb_l + sum3_s + FMUL( chans.echo_level,
 				echo_buf [(echo_pos + chans.echo_delay_l) & echo_mask] );
 		int right = new_reverb_r + sum3_s + FMUL( chans.echo_level,
 				echo_buf [(echo_pos + chans.echo_delay_r) & echo_mask] );
-		
+
 		echo_buf [echo_pos] = sum3_s;
 		echo_pos = (echo_pos + 1) & echo_mask;
-		
-		if ( (BOOST::int16_t) left != left )
+
+		if ( (int16_t) left != left )
 			left = 0x7FFF - (left >> 24);
-		
+
 		out [0] = left;
 		out [1] = right;
-		
+
 		out += 2;
-		
-		if ( (BOOST::int16_t) right != right )
+
+		if ( (int16_t) right != right )
 			out [-1] = 0x7FFF - (right >> 24);
 	}
 	this->reverb_pos = reverb_pos;
 	this->echo_pos = echo_pos;
-	
+
 	BLIP_READER_END( sq1, bufs [0] );
 	BLIP_READER_END( sq2, bufs [1] );
 	BLIP_READER_END( center, bufs [2] );
@@ -460,64 +460,64 @@
 	BLIP_READER_BEGIN( r2, bufs [6] );
 	BLIP_READER_BEGIN( sq1, bufs [0] );
 	BLIP_READER_BEGIN( sq2, bufs [1] );
-	
+
 	blip_sample_t* const reverb_buf = this->reverb_buf.begin();
 	blip_sample_t* const echo_buf = this->echo_buf.begin();
 	int echo_pos = this->echo_pos;
 	int reverb_pos = this->reverb_pos;
-	
+
 	while ( count-- )
 	{
 		int sum1_s = BLIP_READER_READ( sq1 );
 		int sum2_s = BLIP_READER_READ( sq2 );
-		
+
 		BLIP_READER_NEXT( sq1, bass );
 		BLIP_READER_NEXT( sq2, bass );
-		
+
 		int new_reverb_l = FMUL( sum1_s, chans.pan_1_levels [0] ) +
 				FMUL( sum2_s, chans.pan_2_levels [0] ) + BLIP_READER_READ( l1 ) +
 				reverb_buf [(reverb_pos + chans.reverb_delay_l) & reverb_mask];
-		
+
 		int new_reverb_r = FMUL( sum1_s, chans.pan_1_levels [1] ) +
 				FMUL( sum2_s, chans.pan_2_levels [1] ) + BLIP_READER_READ( r1 ) +
 				reverb_buf [(reverb_pos + chans.reverb_delay_r) & reverb_mask];
-		
+
 		BLIP_READER_NEXT( l1, bass );
 		BLIP_READER_NEXT( r1, bass );
-		
+
 		fixed_t reverb_level = chans.reverb_level;
 		reverb_buf [reverb_pos] = (blip_sample_t) FMUL( new_reverb_l, reverb_level );
 		reverb_buf [reverb_pos + 1] = (blip_sample_t) FMUL( new_reverb_r, reverb_level );
 		reverb_pos = (reverb_pos + 2) & reverb_mask;
-		
+
 		int sum3_s = BLIP_READER_READ( center );
 		BLIP_READER_NEXT( center, bass );
-		
+
 		int left = new_reverb_l + sum3_s + BLIP_READER_READ( l2 ) + FMUL( chans.echo_level,
 				echo_buf [(echo_pos + chans.echo_delay_l) & echo_mask] );
 		int right = new_reverb_r + sum3_s + BLIP_READER_READ( r2 ) + FMUL( chans.echo_level,
 				echo_buf [(echo_pos + chans.echo_delay_r) & echo_mask] );
-		
+
 		BLIP_READER_NEXT( l2, bass );
 		BLIP_READER_NEXT( r2, bass );
-		
+
 		echo_buf [echo_pos] = sum3_s;
 		echo_pos = (echo_pos + 1) & echo_mask;
-		
-		if ( (BOOST::int16_t) left != left )
+
+		if ( (int16_t) left != left )
 			left = 0x7FFF - (left >> 24);
-		
+
 		out [0] = left;
 		out [1] = right;
-		
+
 		out += 2;
-		
-		if ( (BOOST::int16_t) right != right )
+
+		if ( (int16_t) right != right )
 			out [-1] = 0x7FFF - (right >> 24);
 	}
 	this->reverb_pos = reverb_pos;
 	this->echo_pos = echo_pos;
-	
+
 	BLIP_READER_END( l1, bufs [3] );
 	BLIP_READER_END( r1, bufs [4] );
 	BLIP_READER_END( l2, bufs [5] );

audacious-plugins-3.3.4.tar.bz2/src/console/Effects_Buffer.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Effects_Buffer.h Changed

@@ -12,7 +12,7 @@
 	// If center_only is true, only center buffers are created and
 	// less memory is used.
 	Effects_Buffer( bool center_only = false );
-	
+
 	// Channel Effect Center Pan
 	// ---------------------------------
 	// 0,5 reverb pan_1
@@ -20,7 +20,7 @@
 	// 2,7 echo -
 	// 3 echo -
 	// 4 echo -
-	
+
 	// Channel configuration
 	struct config_t {
 		double pan_1; // -1.0 = left, 0.0 = center, 1.0 = right
@@ -33,11 +33,11 @@
 		bool effects_enabled; // if false, use optimized simple mixer
 		config_t();
 	};
-	
+
 	// Set configuration of buffer
 	virtual void config( const config_t& );
 	void set_depth( double );
-	
+
 public:
 	~Effects_Buffer();
 	blargg_err_t set_sample_rate( long samples_per_sec, int msec = blip_default_length );
@@ -50,7 +50,7 @@
 	long samples_avail() const;
 private:
 	typedef long fixed_t;
-	
+
 	enum { max_buf_count = 7 };
 	Blip_Buffer bufs [max_buf_count];
 	enum { chan_types_count = 3 };
@@ -60,12 +60,12 @@
 	long effect_remain;
 	int buf_count;
 	bool effects_enabled;
-	
+
 	blargg_vector<blip_sample_t> reverb_buf;
 	blargg_vector<blip_sample_t> echo_buf;
 	int reverb_pos;
 	int echo_pos;
-	
+
 	struct {
 		fixed_t pan_1_levels [2];
 		fixed_t pan_2_levels [2];
@@ -76,7 +76,7 @@
 		int reverb_delay_r;
 		fixed_t reverb_level;
 	} chans;
-	
+
 	void mix_mono( blip_sample_t*, blargg_long );
 	void mix_stereo( blip_sample_t*, blargg_long );
 	void mix_enhanced( blip_sample_t*, blargg_long );

audacious-plugins-3.3.4.tar.bz2/src/console/Fir_Resampler.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Fir_Resampler.cxx Changed

@@ -31,7 +31,7 @@
 	double const to_w = maxh * 2 / width;
 	double const pow_a_n = pow( rolloff, maxh );
 	scale /= maxh * 2;
-	
+
 	double angle = (count / 2 - 1 + offset) * -step;
 	while ( count-- )
 	{
@@ -45,7 +45,7 @@
 					pow_a_n * rolloff * cos( (maxh - 1) * angle );
 			double den = 1 - rolloff_cos_a - rolloff_cos_a + rolloff * rolloff;
 			double sinc = scale * num / den - scale;
-			
+
 			out [-1] = (short) (cos( w ) * sinc + sinc);
 		}
 		angle += step;
@@ -83,11 +83,11 @@
 	clear();
 	return 0;
 }
-	
+
 double Fir_Resampler_::time_ratio( double new_factor, double rolloff, double gain )
 {
 	ratio_ = new_factor;
-	
+
 	double fstep = 0.0;
 	{
 		double least_error = 2;
@@ -106,14 +106,14 @@
 			}
 		}
 	}
-	
+
 	skip_bits = 0;
-	
+
 	step = stereo * (int) floor( fstep );
-	
+
 	ratio_ = fstep;
 	fstep = fmod( fstep, 1.0 );
-	
+
 	double filter = (ratio_ < 1.0) ? 1.0 : 1.0 / ratio_;
 	double pos = 0.0;
 	input_per_cycle = 0;
@@ -122,7 +122,7 @@
 		gen_sinc( rolloff, int (width_ * filter + 1) & ~1, pos, filter,
 				double (0x7FFF * gain * filter),
 				(int) width_, impulses + i * width_ );
-		
+
 		pos += fstep;
 		input_per_cycle += step;
 		if ( pos >= 0.9999999 )
@@ -132,16 +132,16 @@
 			input_per_cycle++;
 		}
 	}
-	
+
 	clear();
-	
+
 	return ratio_;
 }
 
 int Fir_Resampler_::input_needed( blargg_long output_count ) const
 {
 	blargg_long input_count = 0;
-	
+
 	unsigned long skip = skip_bits >> imp_phase;
 	int remain = res - imp_phase;
 	while ( (output_count -= 2) > 0 )
@@ -155,7 +155,7 @@
 		}
 		output_count -= 2;
 	}
-	
+
 	long input_extra = input_count - (write_pos - &buf [(width_ - 1) * stereo]);
 	if ( input_extra < 0 )
 		input_extra = 0;
@@ -167,7 +167,7 @@
 	int cycle_count = input_count / input_per_cycle;
 	int output_count = cycle_count * res * stereo;
 	input_count -= cycle_count * input_per_cycle;
-	
+
 	blargg_ulong skip = skip_bits >> imp_phase;
 	int remain = res - imp_phase;
 	while ( input_count >= 0 )
@@ -190,10 +190,10 @@
 	int max_count = remain - width_ * stereo;
 	if ( count > max_count )
 		count = max_count;
-	
+
 	remain -= count;
 	write_pos = &buf [remain];
 	memmove( buf.begin(), &buf [count], remain * sizeof buf [0] );
-	
+
 	return count;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Fir_Resampler.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Fir_Resampler.h Changed

@@ -9,50 +9,50 @@
 
 class Fir_Resampler_ {
 public:
-	
+
 	// Use Fir_Resampler<width> (below)
-	
+
 	// Set input/output resampling ratio and optionally low-pass rolloff and gain.
 	// Returns actual ratio used (rounded to internal precision).
 	double time_ratio( double factor, double rolloff = 0.999, double gain = 1.0 );
-	
+
 	// Current input/output ratio
 	double ratio() const { return ratio_; }
-	
+
 // Input
-	
+
 	typedef short sample_t;
-	
+
 	// Resize and clear input buffer
 	blargg_err_t buffer_size( int );
-	
+
 	// Clear input buffer. At least two output samples will be available after
 	// two input samples are written.
 	void clear();
-	
+
 	// Number of input samples that can be written
 	int max_write() const { return buf.end() - write_pos; }
-	
+
 	// Pointer to place to write input samples
 	sample_t* buffer() { return write_pos; }
-	
+
 	// Notify resampler that 'count' input samples have been written
 	void write( long count );
-	
+
 	// Number of input samples in buffer
 	int written() const { return write_pos - &buf [write_offset]; }
-	
+
 	// Skip 'count' input samples. Returns number of samples actually skipped.
 	int skip_input( long count );
-	
+
 // Output
-	
+
 	// Number of extra input samples needed until 'count' output samples are available
 	int input_needed( blargg_long count ) const;
-	
+
 	// Number of output samples available
 	int avail() const { return avail_( write_pos - &buf [width_ * stereo] ); }
-	
+
 public:
 	~Fir_Resampler_();
 protected:
@@ -69,7 +69,7 @@
 	int input_per_cycle;
 	double ratio_;
 	sample_t* impulses;
-	
+
 	Fir_Resampler_( int width, sample_t* );
 	int avail_( blargg_long input_count ) const;
 };
@@ -82,7 +82,7 @@
 	short impulses [max_res] [width];
 public:
 	Fir_Resampler() : Fir_Resampler_( width, impulses [0] ) { }
-	
+
 	// Read at most 'count' samples. Returns number of samples actually read.
 	typedef short sample_t;
 	int read( sample_t* out, blargg_long count );
@@ -106,24 +106,24 @@
 	sample_t const* imp = impulses [imp_phase];
 	int remain = res - imp_phase;
 	int const step = this->step;
-	
+
 	count >>= 1;
-	
+
 	if ( end_pos - in >= width * stereo )
 	{
 		end_pos -= width * stereo;
 		do
 		{
 			count--;
-			
+
 			// accumulate in extended precision
 			blargg_long l = 0;
 			blargg_long r = 0;
-			
+
 			const sample_t* i = in;
 			if ( count < 0 )
 				break;
-			
+
 			for ( int n = width / 2; n; --n )
 			{
 				int pt0 = imp [0];
@@ -135,36 +135,36 @@
 				r += pt1 * i [3];
 				i += 4;
 			}
-			
+
 			remain--;
-			
+
 			l >>= 15;
 			r >>= 15;
-			
+
 			in += (skip * stereo) & stereo;
 			skip >>= 1;
 			in += step;
-			
+
 			if ( !remain )
 			{
 				imp = impulses [0];
 				skip = skip_bits;
 				remain = res;
 			}
-			
+
 			out [0] = (sample_t) l;
 			out [1] = (sample_t) r;
 			out += 2;
 		}
 		while ( in <= end_pos );
 	}
-	
+
 	imp_phase = res - remain;
-	
+
 	int left = write_pos - in;
 	write_pos = &buf [left];
 	memmove( buf.begin(), in, left * sizeof *in );
-	
+
 	return out - out_begin;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Gb_Apu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Gb_Apu.cxx Changed

@@ -26,12 +26,12 @@
 	square2.synth = &square_synth;
 	wave.synth = &other_synth;
 	noise.synth = &other_synth;
-	
+
 	oscs [0] = &square1;
 	oscs [1] = &square2;
 	oscs [2] = &wave;
 	oscs [3] = &noise;
-	
+
 	for ( int i = 0; i < osc_count; i++ )
 	{
 		Gb_Osc& osc = *oscs [i];
@@ -42,7 +42,7 @@
 		osc.outputs [2] = 0;
 		osc.outputs [3] = 0;
 	}
-	
+
 	set_tempo( 1.0 );
 	volume( 1.0 );
 	reset();
@@ -104,21 +104,21 @@
 	next_frame_time = 0;
 	last_time = 0;
 	frame_count = 0;
-	
+
 	square1.reset();
 	square2.reset();
 	wave.reset();
 	noise.reset();
 	noise.bits = 1;
 	wave.wave_pos = 0;
-	
+
 	// avoid click at beginning
 	regs [vol_reg - start_addr] = 0x77;
 	update_volume();
-	
+
 	regs [status_reg - start_addr] = 0x01; // force power
 	write_register( 0, status_reg, 0x00 );
-	
+
 	static unsigned char const initial_wave [] = {
 		0x84,0x40,0x43,0xAA,0x2D,0x78,0x92,0x3C, // wave table
 		0x60,0x59,0x59,0xB0,0x34,0xB8,0x2E,0xDA
@@ -131,13 +131,13 @@
 	require( end_time >= last_time ); // end_time must not be before previous time
 	if ( end_time == last_time )
 		return;
-	
+
 	while ( true )
 	{
 		blip_time_t time = next_frame_time;
 		if ( time > end_time )
 			time = end_time;
-		
+
 		// run oscillators
 		for ( int i = 0; i < osc_count; ++i )
 		{
@@ -159,18 +159,18 @@
 			}
 		}
 		last_time = time;
-		
+
 		if ( time == end_time )
 			break;
-		
+
 		next_frame_time += frame_period;
-		
+
 		// 256 Hz actions
 		square1.clock_length();
 		square2.clock_length();
 		wave.clock_length();
 		noise.clock_length();
-		
+
 		frame_count = (frame_count + 1) & 3;
 		if ( frame_count == 0 )
 		{
@@ -179,7 +179,7 @@
 			square2.clock_envelope();
 			noise.clock_envelope();
 		}
-		
+
 		if ( frame_count & 1 )
 			square1.clock_sweep(); // 128 Hz action
 	}
@@ -189,10 +189,10 @@
 {
 	if ( end_time > last_time )
 		run_until( end_time );
-	
+
 	assert( next_frame_time >= end_time );
 	next_frame_time -= end_time;
-	
+
 	assert( last_time >= end_time );
 	last_time -= end_time;
 }
@@ -200,16 +200,16 @@
 void Gb_Apu::write_register( blip_time_t time, unsigned addr, int data )
 {
 	require( (unsigned) data < 0x100 );
-	
+
 	int reg = addr - start_addr;
 	if ( (unsigned) reg >= register_count )
 		return;
-	
+
 	run_until( time );
-	
+
 	int old_reg = regs [reg];
 	regs [reg] = data;
-	
+
 	if ( addr < vol_reg )
 	{
 		write_osc( reg / 5, reg, data );
@@ -225,22 +225,22 @@
 			if ( amp && osc.enabled && osc.output )
 				other_synth.offset( time, -amp, osc.output );
 		}
-		
+
 		if ( wave.outputs [3] )
 			other_synth.offset( time, 30, wave.outputs [3] );
-		
+
 		update_volume();
-		
+
 		if ( wave.outputs [3] )
 			other_synth.offset( time, -30, wave.outputs [3] );
-		
+
 		// oscs will update with new amplitude when next run
 	}
 	else if ( addr == 0xFF25 || addr == status_reg )
 	{
 		int mask = (regs [status_reg - start_addr] & 0x80) ? ~0 : 0;
 		int flags = regs [0xFF25 - start_addr] & mask;
-		
+
 		// left/right assignments
 		for ( int i = 0; i < osc_count; i++ )
 		{
@@ -258,7 +258,7 @@
 					other_synth.offset( time, -amp, old_output );
 			}
 		}
-		
+
 		if ( addr == status_reg && data != old_reg )
 		{
 			if ( !(data & 0x80) )
@@ -286,11 +286,11 @@
 int Gb_Apu::read_register( blip_time_t time, unsigned addr )
 {
 	run_until( time );
-	
+
 	int index = addr - start_addr;
 	require( (unsigned) index < register_count );
 	int data = regs [index];
-	
+
 	if ( addr == status_reg )
 	{
 		data = (data & 0x80) | 0x70;
@@ -301,6 +301,6 @@
 				data |= 1 << i;
 		}
 	}
-	
+
 	return data;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Gb_Apu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Gb_Apu.h Changed

@@ -8,77 +8,77 @@
 
 class Gb_Apu {
 public:
-	
+
 	// Set overall volume of all oscillators, where 1.0 is full volume
 	void volume( double );
-	
+
 	// Set treble equalization
 	void treble_eq( const blip_eq_t& );
-	
+
 	// Outputs can be assigned to a single buffer for mono output, or to three
 	// buffers for stereo output (using Stereo_Buffer to do the mixing).
-	
+
 	// Assign all oscillator outputs to specified buffer(s). If buffer
 	// is NULL, silences all oscillators.
 	void output( Blip_Buffer* mono );
 	void output( Blip_Buffer* center, Blip_Buffer* left, Blip_Buffer* right );
-	
+
 	// Assign single oscillator output to buffer(s). Valid indicies are 0 to 3,
 	// which refer to Square 1, Square 2, Wave, and Noise. If buffer is NULL,
 	// silences oscillator.
 	enum { osc_count = 4 };
 	void osc_output( int index, Blip_Buffer* mono );
 	void osc_output( int index, Blip_Buffer* center, Blip_Buffer* left, Blip_Buffer* right );
-	
+
 	// Reset oscillators and internal state
 	void reset();
-	
+
 	// Reads and writes at addr must satisfy start_addr <= addr <= end_addr
 	enum { start_addr = 0xFF10 };
 	enum { end_addr = 0xFF3F };
 	enum { register_count = end_addr - start_addr + 1 };
-	
+
 	// Write 'data' to address at specified time
 	void write_register( blip_time_t, unsigned addr, int data );
-	
+
 	// Read from address at specified time
 	int read_register( blip_time_t, unsigned addr );
-	
+
 	// Run all oscillators up to specified time, end current time frame, then
 	// start a new frame at time 0.
 	void end_frame( blip_time_t );
-	
+
 	void set_tempo( double );
-	
+
 public:
 	Gb_Apu();
 private:
 	// noncopyable
 	Gb_Apu( const Gb_Apu& );
 	Gb_Apu& operator = ( const Gb_Apu& );
-	
+
 	Gb_Osc* oscs [osc_count];
 	blip_time_t next_frame_time;
 	blip_time_t last_time;
 	blip_time_t frame_period;
 	double volume_unit;
 	int frame_count;
-	
+
 	Gb_Square square1;
 	Gb_Square square2;
 	Gb_Wave wave;
 	Gb_Noise noise;
-	BOOST::uint8_t regs [register_count];
+	uint8_t regs [register_count];
 	Gb_Square::Synth square_synth; // used by squares
 	Gb_Wave::Synth other_synth; // used by wave and noise
-	
+
 	void update_volume();
 	void run_until( blip_time_t );
 	void write_osc( int index, int reg, int data );
 };
 
 inline void Gb_Apu::output( Blip_Buffer* b ) { output( b, b, b ); }
-	
+
 inline void Gb_Apu::osc_output( int i, Blip_Buffer* b ) { osc_output( i, b, b, b ); }
 
 inline void Gb_Apu::volume( double vol )

audacious-plugins-3.3.4.tar.bz2/src/console/Gb_Cpu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Gb_Cpu.cxx Changed

@@ -56,16 +56,14 @@
 {
 	check( state == &state_ );
 	state = &state_;
-	
+
 	state_.remain = 0;
-	
+
 	for ( int i = 0; i < page_count + 1; i++ )
 		set_code_page( i, (uint8_t*) unmapped );
-	
+
 	memset( &r, 0, sizeof r );
 	//interrupts_enabled = false;
-	
-	blargg_verify_byte_order();
 }
 
 void Gb_Cpu::map_code( gb_addr_t start, unsigned size, void* data )
@@ -73,7 +71,7 @@
 	// address range must begin and end on page boundaries
 	require( start % page_size == 0 );
 	require( size % page_size == 0 );
-	
+
 	unsigned first_page = start / page_size;
 	for ( unsigned i = size / page_size; i--; )
 		set_code_page( first_page + i, (uint8_t*) data + i * page_size );
@@ -95,43 +93,41 @@
 	state_t s;
 	this->state = &s;
 	memcpy( &s, &this->state_, sizeof s );
-	
-	typedef BOOST::uint16_t uint16_t;
-	
+
 #if BLARGG_BIG_ENDIAN
-	#define R8( n ) (r8_ [n]) 
+	#define R8( n ) (r8_ [n])
 #elif BLARGG_LITTLE_ENDIAN
-	#define R8( n ) (r8_ [(n) ^ 1]) 
+	#define R8( n ) (r8_ [(n) ^ 1])
 #else
 	#error "Byte order of CPU must be known"
 #endif
-	
+
 	union {
 		core_regs_t rg; // individual registers
-		
+
 		struct {
-			BOOST::uint16_t bc, de, hl, unused; // pairs
+			uint16_t bc, de, hl, unused; // pairs
 		} rp;
-		
+
 		uint8_t r8_ [8]; // indexed registers (use R8 macro due to endian dependence)
-		BOOST::uint16_t r16 [4]; // indexed pairs
+		uint16_t r16 [4]; // indexed pairs
 	};
 	BOOST_STATIC_ASSERT( sizeof rg == 8 && sizeof rp == 8 );
-	
+
 	rg = r;
 	unsigned pc = r.pc;
 	unsigned sp = r.sp;
 	unsigned flags = r.flags;
-	
+
 loop:
-	
+
 	check( (unsigned long) pc < 0x10000 );
 	check( (unsigned long) sp < 0x10000 );
 	check( (flags & ~0xF0) == 0 );
-	
+
 	uint8_t const* instr = s.code_map [pc >> page_shift];
 	unsigned op;
-	
+
 	// TODO: eliminate this special case
 	#if BLARGG_NONPORTABLE
 		op = instr [pc];
@@ -142,19 +138,19 @@
 		op = *instr++;
 		pc++;
 	#endif
-	
+
 #define GET_ADDR() GET_LE16( instr )
-	
+
 	if ( !--s.remain )
 		goto stop;
-	
+
 	unsigned data;
 	data = *instr;
-	
+
 	#ifdef GB_CPU_LOG_H
 		gb_cpu_log( "new", pc - 1, op, data, instr [1] );
 	#endif
-	
+
 	switch ( op )
 	{
 
@@ -162,7 +158,7 @@
 #define BRANCH( cond )\
 {\
 	pc++;\
-	int offset = (BOOST::int8_t) data;\
+	int offset = (int8_t) data;\
 	if ( !(cond) ) goto loop;\
 	pc = uint16_t (pc + offset);\
 	goto loop;\
@@ -172,44 +168,44 @@
 
 	case 0x20: // JR NZ
 		BRANCH( !(flags & z_flag) )
-	
+
 	case 0x21: // LD HL,IMM (common)
 		rp.hl = GET_ADDR();
 		pc += 2;
 		goto loop;
-	
+
 	case 0x28: // JR Z
 		BRANCH( flags & z_flag )
-	
+
 	{
 		unsigned temp;
 	case 0xF0: // LD A,(0xFF00+imm)
 		temp = data | 0xFF00;
 		pc++;
 		goto ld_a_ind_comm;
-	
+
 	case 0xF2: // LD A,(0xFF00+C)
 		temp = rg.c | 0xFF00;
 		goto ld_a_ind_comm;
-	
+
 	case 0x0A: // LD A,(BC)
 		temp = rp.bc;
 		goto ld_a_ind_comm;
-	
+
 	case 0x3A: // LD A,(HL-)
 		temp = rp.hl;
 		rp.hl = temp - 1;
 		goto ld_a_ind_comm;
-	
+
 	case 0x1A: // LD A,(DE)
 		temp = rp.de;
 		goto ld_a_ind_comm;
-	
+
 	case 0x2A: // LD A,(HL+) (common)
 		temp = rp.hl;
 		rp.hl = temp + 1;
 		goto ld_a_ind_comm;
-		
+
 	case 0xFA: // LD A,IND16 (common)
 		temp = GET_ADDR();
 		pc += 2;
@@ -217,11 +213,11 @@
 		READ_FAST( temp, rg.a );
 		goto loop;
 	}
-	
+
 	case 0xBE: // CMP (HL)
 		data = READ( rp.hl );
 		goto cmp_comm;
-	
+
 	case 0xB8: // CMP B
 	case 0xB9: // CMP C
 	case 0xBA: // CMP D
@@ -230,7 +226,7 @@
 	case 0xBD: // CMP L
 		data = R8( op & 7 );
 		goto cmp_comm;
-	
+
 	case 0xFE: // CMP IMM
 		pc++;
 	cmp_comm:
@@ -256,7 +252,7 @@
 		READ_FAST( addr, R8( (op >> 3) & 7 ) );
 		goto loop;
 	}
-	
+
 	case 0xC4: // CNZ (next-most-common)
 		pc += 2;
 		if ( flags & z_flag )
@@ -272,7 +268,7 @@
 		sp = (sp - 1) & 0xFFFF;
 		WRITE( sp, data & 0xFF );
 		goto loop;
-	
+
 	case 0xC8: // RNZ (next-most-common)
 		if ( !(flags & z_flag) )
 			goto loop;
@@ -282,7 +278,7 @@
 		pc += 0x100 * READ( sp + 1 );
 		sp = (sp + 2) & 0xFFFF;
 		goto loop;
-	
+
 	case 0x00: // NOP
 	case 0x40: // LD B,B
 	case 0x49: // LD C,C
@@ -292,14 +288,14 @@
 	case 0x6D: // LD L,L
 	case 0x7F: // LD A,A
 		goto loop;
-	
+
 // CB Instructions
 
 	case 0xCB:
 		pc++;
 		// now data is the opcode
 		switch ( data ) {
-			
+
 		{
 			int temp;
 		case 0x46: // BIT b,(HL)
@@ -315,7 +311,7 @@
 				READ_FAST( addr, temp );
 				goto bit_comm;
 			}
-		
+
 		case 0x40: case 0x41: case 0x42: case 0x43: // BIT b,r
 		case 0x44: case 0x45: case 0x47: case 0x48:
 		case 0x49: case 0x4A: case 0x4B: case 0x4C:
@@ -338,7 +334,7 @@
 			flags ^= (temp << bit) & z_flag;
 			goto loop;
 		}
-		
+
 		case 0x86: // RES b,(HL)
 		case 0x8E:
 		case 0x96:
@@ -363,7 +359,7 @@
 			WRITE( rp.hl, temp | bit );
 			goto loop;
 		}
-		
+
 		case 0xC0: case 0xC1: case 0xC2: case 0xC3: // SET b,r
 		case 0xC4: case 0xC5: case 0xC7: case 0xC8:
 		case 0xC9: case 0xCA: case 0xCB: case 0xCC:
@@ -397,13 +393,13 @@
 		case 0xBB: case 0xBC: case 0xBD: case 0xBF:
 			R8( data & 7 ) &= ~(1 << ((data >> 3) & 7));
 			goto loop;
-		
+
 		{
 			int temp;
 		case 0x36: // SWAP (HL)
 			temp = READ( rp.hl );
 			goto swap_comm;
-		
+
 		case 0x30: // SWAP B
 		case 0x31: // SWAP C
 		case 0x32: // SWAP D
@@ -417,7 +413,7 @@
 			flags = 0;
 			goto shift_comm;
 		}
-		
+
 // Shift/Rotate
 
 		case 0x06: // RLC (HL)
@@ -425,13 +421,13 @@
 		case 0x26: // SLA (HL)
 			op = READ( rp.hl );
 			goto rl_comm;
-		
+
 		case 0x20: case 0x21: case 0x22: case 0x23: case 0x24: case 0x25: case 0x27: // SLA A
 		case 0x00: case 0x01: case 0x02: case 0x03: case 0x04: case 0x05: case 0x07: // RLC A
 		case 0x10: case 0x11: case 0x12: case 0x13: case 0x14: case 0x15: case 0x17: // RL A
 			op = R8( data & 7 );
 			goto rl_comm;
-		
+
 		case 0x3E: // SRL (HL)
 			data += 0x10; // bump up to 0x4n to avoid preserving sign bit
 		case 0x1E: // RR (HL)
@@ -439,7 +435,7 @@
 		case 0x2E: // SRA (HL)
 			op = READ( rp.hl );
 			goto rr_comm;
-		
+
 		case 0x38: case 0x39: case 0x3A: case 0x3B: case 0x3C: case 0x3D: case 0x3F: // SRL A
 			data += 0x10; // bump up to 0x4n
 		case 0x18: case 0x19: case 0x1A: case 0x1B: case 0x1C: case 0x1D: case 0x1F: // RR A
@@ -447,7 +443,7 @@
 		case 0x28: case 0x29: case 0x2A: case 0x2B: case 0x2C: case 0x2D: case 0x2F: // SRA A
 			op = R8( data & 7 );
 			goto rr_comm;
-		
+
 	} // CB op
 	assert( false ); // unhandled CB op
 
@@ -463,7 +459,7 @@
 			op |= op >> 8;
 		// SLA doesn't fill lower bit
 		goto shift_comm;
-	
+
 	case 0x0F: // RRCA
 	case 0x1F: // RRA
 		data = op;
@@ -516,7 +512,7 @@
 		data++;
 		WRITE( data, sp >> 8 );
 		goto loop;
-	
+
 	case 0xF9: // LD SP,HL
 		sp = rp.hl;
 		goto loop;
@@ -525,20 +521,20 @@
 		sp = GET_ADDR();
 		pc += 2;
 		goto loop;
-	
+
 	case 0x01: // LD BC,IMM
 	case 0x11: // LD DE,IMM
 		r16 [op >> 4] = GET_ADDR();
 		pc += 2;
 		goto loop;
-	
+
 	{
 		unsigned temp;
 	case 0xE0: // LD (0xFF00+imm),A
 		temp = data | 0xFF00;
 		pc++;
 		goto write_data_rg_a;
-	
+
 	case 0xE2: // LD (0xFF00+C),A
 		temp = rg.c | 0xFF00;
 		goto write_data_rg_a;
@@ -547,20 +543,20 @@
 		temp = rp.hl;
 		rp.hl = temp - 1;
 		goto write_data_rg_a;
-	
+
 	case 0x02: // LD (BC),A
 		temp = rp.bc;
 		goto write_data_rg_a;
-	
+
 	case 0x12: // LD (DE),A
 		temp = rp.de;
 		goto write_data_rg_a;
-	
+
 	case 0x22: // LD (HL+),A
 		temp = rp.hl;
 		rp.hl = temp + 1;
 		goto write_data_rg_a;
-		
+
 	case 0xEA: // LD IND16,A (common)
 		temp = GET_ADDR();
 		pc += 2;
@@ -568,42 +564,42 @@
 		WRITE( temp, rg.a );
 		goto loop;
 	}
-	
+
 	case 0x06: // LD B,IMM
 		rg.b = data;
 		pc++;
 		goto loop;
-	
+
 	case 0x0E: // LD C,IMM
 		rg.c = data;
 		pc++;
 		goto loop;
-	
+
 	case 0x16: // LD D,IMM
 		rg.d = data;
 		pc++;
 		goto loop;
-	
+
 	case 0x1E: // LD E,IMM
 		rg.e = data;
 		pc++;
 		goto loop;
-	
+
 	case 0x26: // LD H,IMM
 		rg.h = data;
 		pc++;
 		goto loop;
-	
+
 	case 0x2E: // LD L,IMM
 		rg.l = data;
 		pc++;
 		goto loop;
-	
+
 	case 0x36: // LD (HL),IMM
 		WRITE( rp.hl, data );
 		pc++;
 		goto loop;
-	
+
 	case 0x3E: // LD A,IMM
 		rg.a = data;
 		pc++;
@@ -616,7 +612,7 @@
 	case 0x23: // INC HL
 		r16 [op >> 4]++;
 		goto loop;
-	
+
 	case 0x33: // INC SP
 		sp = (sp + 1) & 0xFFFF;
 		goto loop;
@@ -626,18 +622,18 @@
 	case 0x2B: // DEC HL
 		r16 [op >> 4]--;
 		goto loop;
-	
+
 	case 0x3B: // DEC SP
 		sp = (sp - 1) & 0xFFFF;
 		goto loop;
-	
+
 	case 0x34: // INC (HL)
 		op = rp.hl;
 		data = READ( op );
 		data++;
 		WRITE( op, data & 0xFF );
 		goto inc_comm;
-	
+
 	case 0x04: // INC B
 	case 0x0C: // INC C (common)
 	case 0x14: // INC D
@@ -650,14 +646,14 @@
 	inc_comm:
 		flags = (flags & c_flag) | (((data & 15) - 1) & h_flag) | ((data >> 1) & z_flag);
 		goto loop;
-	
+
 	case 0x35: // DEC (HL)
 		op = rp.hl;
 		data = READ( op );
 		data--;
 		WRITE( op, data & 0xFF );
 		goto dec_comm;
-	
+
 	case 0x05: // DEC B
 	case 0x0D: // DEC C
 	case 0x15: // DEC D
@@ -680,17 +676,17 @@
 	{
 		blargg_ulong temp; // need more than 16 bits for carry
 		unsigned prev;
-		
+
 	case 0xF8: // LD HL,SP+imm
-		temp = BOOST::int8_t (data); // sign-extend to 16 bits
+		temp = int8_t (data); // sign-extend to 16 bits
 		pc++;
 		flags = 0;
 		temp += sp;
 		prev = sp;
 		goto add_16_hl;
-	
+
 	case 0xE8: // ADD SP,IMM
-		temp = BOOST::int8_t (data); // sign-extend to 16 bits
+		temp = int8_t (data); // sign-extend to 16 bits
 		pc++;
 		flags = 0;
 		temp += sp;
@@ -701,7 +697,7 @@
 	case 0x39: // ADD HL,SP
 		temp = sp;
 		goto add_hl_comm;
-	
+
 	case 0x09: // ADD HL,BC
 	case 0x19: // ADD HL,DE
 	case 0x29: // ADD HL,HL
@@ -717,11 +713,11 @@
 		flags |= (((temp & 0x0FFF) - (prev & 0x0FFF)) >> 7) & h_flag;
 		goto loop;
 	}
-	
+
 	case 0x86: // ADD (HL)
 		data = READ( rp.hl );
 		goto add_comm;
-	
+
 	case 0x80: // ADD B
 	case 0x81: // ADD C
 	case 0x82: // ADD D
@@ -731,7 +727,7 @@
 	case 0x87: // ADD A
 		data = R8( op & 7 );
 		goto add_comm;
-	
+
 	case 0xC6: // ADD IMM
 		pc++;
 	add_comm:
@@ -750,7 +746,7 @@
 	case 0x8E: // ADC (HL)
 		data = READ( rp.hl );
 		goto adc_comm;
-	
+
 	case 0x88: // ADC B
 	case 0x89: // ADC C
 	case 0x8A: // ADC D
@@ -760,7 +756,7 @@
 	case 0x8F: // ADC A
 		data = R8( op & 7 );
 		goto adc_comm;
-	
+
 	case 0xCE: // ADC IMM
 		pc++;
 	adc_comm:
@@ -771,7 +767,7 @@
 	case 0x96: // SUB (HL)
 		data = READ( rp.hl );
 		goto sub_comm;
-	
+
 	case 0x90: // SUB B
 	case 0x91: // SUB C
 	case 0x92: // SUB D
@@ -781,7 +777,7 @@
 	case 0x97: // SUB A
 		data = R8( op & 7 );
 		goto sub_comm;
-	
+
 	case 0xD6: // SUB IMM
 		pc++;
 	sub_comm:
@@ -793,7 +789,7 @@
 	case 0x9E: // SBC (HL)
 		data = READ( rp.hl );
 		goto sbc_comm;
-	
+
 	case 0x98: // SBC B
 	case 0x99: // SBC C
 	case 0x9A: // SBC D
@@ -803,7 +799,7 @@
 	case 0x9F: // SBC A
 		data = R8( op & 7 );
 		goto sbc_comm;
-	
+
 	case 0xDE: // SBC IMM
 		pc++;
 	sbc_comm:
@@ -821,7 +817,7 @@
 	case 0xA5: // AND L
 		data = R8( op & 7 );
 		goto and_comm;
-	
+
 	case 0xA6: // AND (HL)
 		data = READ( rp.hl );
 		pc--;
@@ -841,7 +837,7 @@
 	case 0xB5: // OR L
 		data = R8( op & 7 );
 		goto or_comm;
-	
+
 	case 0xB6: // OR (HL)
 		data = READ( rp.hl );
 		pc--;
@@ -861,7 +857,7 @@
 	case 0xAD: // XOR L
 		data = R8( op & 7 );
 		goto xor_comm;
-	
+
 	case 0xAE: // XOR (HL)
 		data = READ( rp.hl );
 		pc--;
@@ -873,7 +869,7 @@
 		data--;
 		flags = (data >> 1) & z_flag;
 		goto loop;
-	
+
 	case 0xAF: // XOR A
 		rg.a = 0;
 		flags = z_flag;
@@ -892,25 +888,25 @@
 			goto loop;
 		flags = rg.flags & 0xF0;
 		goto loop;
-	
+
 	case 0xC5: // PUSH BC
 		data = rp.bc;
 		goto push;
-	
+
 	case 0xD5: // PUSH DE
 		data = rp.de;
 		goto push;
-	
+
 	case 0xE5: // PUSH HL
 		data = rp.hl;
 		goto push;
-	
+
 	case 0xF5: // PUSH FA
 		data = (flags << 8) | rg.a;
 		goto push;
 
 // Flow control
-	
+
 	case 0xFF:
 		if ( pc == idle_addr + 1 )
 			goto stop;
@@ -919,19 +915,19 @@
 		data = pc;
 		pc = (op & 0x38) + rst_base;
 		goto push;
-	
+
 	case 0xCC: // CZ
 		pc += 2;
 		if ( flags & z_flag )
 			goto call;
 		goto loop;
-	
+
 	case 0xD4: // CNC
 		pc += 2;
 		if ( !(flags & c_flag) )
 			goto call;
 		goto loop;
-	
+
 	case 0xDC: // CC
 		pc += 2;
 		if ( flags & c_flag )
@@ -941,17 +937,17 @@
 	case 0xD9: // RETI
 		//interrupts_enabled = 1;
 		goto ret;
-	
+
 	case 0xC0: // RZ
 		if ( !(flags & z_flag) )
 			goto ret;
 		goto loop;
-	
+
 	case 0xD0: // RNC
 		if ( !(flags & c_flag) )
 			goto ret;
 		goto loop;
-	
+
 	case 0xD8: // RC
 		if ( flags & c_flag )
 			goto ret;
@@ -959,13 +955,13 @@
 
 	case 0x18: // JR
 		BRANCH( true )
-	
+
 	case 0x30: // JR NC
 		BRANCH( !(flags & c_flag) )
-	
+
 	case 0x38: // JR C
 		BRANCH( flags & c_flag )
-	
+
 	case 0xE9: // JP_HL
 		pc = rp.hl;
 		goto loop;
@@ -973,13 +969,13 @@
 	case 0xC3: // JP (next-most-common)
 		pc = GET_ADDR();
 		goto loop;
-	
+
 	case 0xC2: // JP NZ
 		pc += 2;
 		if ( !(flags & z_flag) )
 			goto jp_taken;
 		goto loop;
-	
+
 	case 0xCA: // JP Z (most common)
 		pc += 2;
 		if ( !(flags & z_flag) )
@@ -988,13 +984,13 @@
 		pc -= 2;
 		pc = GET_ADDR();
 		goto loop;
-	
+
 	case 0xD2: // JP NC
 		pc += 2;
 		if ( !(flags & c_flag) )
 			goto jp_taken;
 		goto loop;
-	
+
 	case 0xDA: // JP C
 		pc += 2;
 		if ( flags & c_flag )
@@ -1036,21 +1032,21 @@
 		s.remain++;
 		goto stop;
 	}
-	
+
 	// If this fails then the case above is missing an opcode
 	assert( false );
-	
+
 stop:
 	pc--;
-	
+
 	// copy state back
 	STATIC_CAST(core_regs_t&,r) = rg;
 	r.pc = pc;
 	r.sp = sp;
 	r.flags = flags;
-	
+
 	this->state = &state_;
 	memcpy( &this->state_, &s, sizeof this->state_ );
-	
+
 	return s.remain > 0;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Gb_Cpu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Gb_Cpu.h Changed

@@ -13,21 +13,19 @@
 class Gb_Cpu {
 	enum { clocks_per_instr = 4 };
 public:
-	typedef BOOST::uint8_t uint8_t;
-	
 	// Clear registers and map all pages to unmapped
 	void reset( void* unmapped = 0 );
-	
+
 	// Map code memory (memory accessed via the program counter). Start and size
 	// must be multiple of page_size.
 	enum { page_size = 0x2000 };
 	void map_code( gb_addr_t start, unsigned size, void* code );
-	
+
 	uint8_t* get_code( gb_addr_t );
-	
+
 	// Push a byte on the stack
 	void push_byte( int );
-	
+
 	// Game Boy Z80 registers. *Not* kept updated during a call to run().
 	struct core_regs_t {
 	#if BLARGG_BIG_ENDIAN
@@ -36,32 +34,32 @@
 		uint8_t c, b, e, d, l, h, a, flags;
 	#endif
 	};
-	
+
 	struct registers_t : core_regs_t {
 		long pc; // more than 16 bits to allow overflow detection
-		BOOST::uint16_t sp;
+		uint16_t sp;
 	};
 	registers_t r;
-	
+
 	// Interrupt enable flag set by EI and cleared by DI
 	//bool interrupts_enabled; // unused
-	
+
 	// Base address for RST vectors (normally 0)
 	gb_addr_t rst_base;
-	
+
 	// If CPU executes opcode 0xFF at this address, it treats as illegal instruction
 	enum { idle_addr = 0xF00D };
-	
+
 	// Run CPU for at least 'count' cycles and return false, or return true if
 	// illegal instruction is encountered.
 	bool run( blargg_long count );
-	
+
 	// Number of clock cycles remaining for most recent run() call
 	blargg_long remain() const { return state->remain * clocks_per_instr; }
-	
+
 	// Can read this many bytes past end of a page
 	enum { cpu_padding = 8 };
-	
+
 public:
 	Gb_Cpu() : rst_base( 0 ) { state = &state_; }
 	enum { page_shift = 13 };
@@ -70,18 +68,18 @@
 	// noncopyable
 	Gb_Cpu( const Gb_Cpu& );
 	Gb_Cpu& operator = ( const Gb_Cpu& );
-	
+
 	struct state_t {
 		uint8_t* code_map [page_count + 1];
 		blargg_long remain;
 	};
 	state_t* state; // points to state_ or a local copy within run()
 	state_t state_;
-	
+
 	void set_code_page( int, uint8_t* );
 };
 
-inline BOOST::uint8_t* Gb_Cpu::get_code( gb_addr_t addr )
+inline uint8_t* Gb_Cpu::get_code( gb_addr_t addr )
 {
 	return state->code_map [addr >> page_shift] + addr
 	#if !BLARGG_NONPORTABLE

audacious-plugins-3.3.4.tar.bz2/src/console/Gb_Oscs.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Gb_Oscs.cxx Changed

@@ -54,12 +54,12 @@
 	case 1:
 		length = 64 - (regs [1] & 0x3F);
 		break;
-	
+
 	case 2:
 		if ( !(data >> 4) )
 			enabled = false;
 		break;
-	
+
 	case 4:
 		if ( data & trigger )
 		{
@@ -92,12 +92,12 @@
 		sweep_delay = sweep_period;
 		regs [3] = sweep_freq & 0xFF;
 		regs [4] = (regs [4] & ~0x07) | (sweep_freq >> 8 & 0x07);
-		
+
 		int offset = sweep_freq >> (regs [0] & shift_mask);
 		if ( regs [0] & 0x08 )
 			offset = -offset;
 		sweep_freq += offset;
-		
+
 		if ( sweep_freq < 0 )
 		{
 			sweep_freq = 0;
@@ -114,13 +114,13 @@
 {
 	if ( sweep_freq == 2048 )
 		playing = false;
-	
+
 	static unsigned char const table [4] = { 1, 2, 4, 6 };
 	int const duty = table [regs [1] >> 6];
 	int amp = volume & playing;
 	if ( phase >= duty )
 		amp = -amp;
-	
+
 	int frequency = this->frequency();
 	if ( unsigned (frequency - 1) > 2040 ) // frequency < 1 || frequency > 2041
 	{
@@ -128,7 +128,7 @@
 		amp = volume >> 1;
 		playing = false;
 	}
-	
+
 	{
 		int delta = amp - last_amp;
 		if ( delta )
@@ -137,11 +137,11 @@
 			synth->offset( time, delta, output );
 		}
 	}
-	
+
 	time += delay;
 	if ( !playing )
 		time = end_time;
-	
+
 	if ( time < end_time )
 	{
 		int const period = (2048 - frequency) * 4;
@@ -159,7 +159,7 @@
 			time += period;
 		}
 		while ( time < end_time );
-		
+
 		this->phase = phase;
 		last_amp = delta >> 1;
 	}
@@ -174,7 +174,7 @@
 	int tap = 13 - (regs [3] & 8);
 	if ( bits >> tap & 2 )
 		amp = -amp;
-	
+
 	{
 		int delta = amp - last_amp;
 		if ( delta )
@@ -183,16 +183,16 @@
 			synth->offset( time, delta, output );
 		}
 	}
-	
+
 	time += delay;
 	if ( !playing )
 		time = end_time;
-	
+
 	if ( time < end_time )
 	{
 		static unsigned char const table [8] = { 8, 16, 32, 48, 64, 80, 96, 112 };
 		int period = table [regs [3] & 7] << (regs [3] >> 4);
-		
+
 		// keep parallel resampled time to eliminate time conversion in the loop
 		Blip_Buffer* const output = this->output;
 		const blip_resampled_time_t resampled_period =
@@ -200,7 +200,7 @@
 		blip_resampled_time_t resampled_time = output->resampled_time( time );
 		unsigned bits = this->bits;
 		int delta = amp * 2;
-		
+
 		do
 		{
 			unsigned changed = (bits >> tap) + 1;
@@ -215,7 +215,7 @@
 			resampled_time += resampled_period;
 		}
 		while ( time < end_time );
-		
+
 		this->bits = bits;
 		last_amp = delta >> 1;
 	}
@@ -232,15 +232,15 @@
 		if ( !(data & 0x80) )
 			enabled = false;
 		break;
-	
+
 	case 1:
 		length = 256 - regs [1];
 		break;
-	
+
 	case 2:
 		volume = data >> 5 & 3;
 		break;
-	
+
 	case 4:
 		if ( data & trigger & regs [0] )
 		{
@@ -258,14 +258,14 @@
 	int frequency;
 	{
 		int amp = (wave [wave_pos] >> volume_shift & playing) * 2;
-		
+
 		frequency = this->frequency();
 		if ( unsigned (frequency - 1) > 2044 ) // frequency < 1 || frequency > 2045
 		{
 			amp = 30 >> volume_shift & playing;
 			playing = false;
 		}
-		
+
 		int delta = amp - last_amp;
 		if ( delta )
 		{
@@ -273,17 +273,17 @@
 			synth->offset( time, delta, output );
 		}
 	}
-	
+
 	time += delay;
 	if ( !playing )
 		time = end_time;
-	
+
 	if ( time < end_time )
 	{
 		Blip_Buffer* const output = this->output;
 		int const period = (2048 - frequency) * 2;
 	 	int wave_pos = (this->wave_pos + 1) & (wave_size - 1);
-	 	
+
 		do
 		{
 			int amp = (wave [wave_pos] >> volume_shift) * 2;
@@ -297,7 +297,7 @@
 			time += period;
 		}
 		while ( time < end_time );
-		
+
 		this->wave_pos = (wave_pos - 1) & (wave_size - 1);
 	}
 	delay = time - end_time;
@@ -324,11 +324,11 @@
 			}
 		}
 		break;
-	
+
 	case 2:
 		wave.write_register( reg, data );
 		break;
-	
+
 	case 3:
 		if ( noise.write_register( reg, data ) )
 			noise.bits = 0x7FFF;

audacious-plugins-3.3.4.tar.bz2/src/console/Gb_Oscs.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Gb_Oscs.h Changed

@@ -11,18 +11,18 @@
 {
 	enum { trigger = 0x80 };
 	enum { len_enabled_mask = 0x40 };
-	
+
 	Blip_Buffer* outputs [4]; // NULL, right, left, center
 	Blip_Buffer* output;
 	int output_select;
-	BOOST::uint8_t* regs; // osc's 5 registers
-	
+	uint8_t* regs; // osc's 5 registers
+
 	int delay;
 	int last_amp;
 	int volume;
 	int length;
 	int enabled;
-	
+
 	void reset();
 	void clock_length();
 	int frequency() const { return (regs [4] & 7) * 0x100 + regs [3]; }
@@ -31,7 +31,7 @@
 struct Gb_Env : Gb_Osc
 {
 	int env_delay;
-	
+
 	void reset();
 	void clock_envelope();
 	bool write_register( int, int );
@@ -41,13 +41,13 @@
 {
 	enum { period_mask = 0x70 };
 	enum { shift_mask = 0x07 };
-	
+
 	typedef Blip_Synth<blip_good_quality,1> Synth;
 	Synth const* synth;
 	int sweep_delay;
 	int sweep_freq;
 	int phase;
-	
+
 	void reset();
 	void clock_sweep();
 	void run( blip_time_t, blip_time_t, int playing );
@@ -58,7 +58,7 @@
 	typedef Blip_Synth<blip_med_quality,1> Synth;
 	Synth const* synth;
 	unsigned bits;
-	
+
 	void run( blip_time_t, blip_time_t, int playing );
 };
 
@@ -68,8 +68,8 @@
 	Synth const* synth;
 	int wave_pos;
 	enum { wave_size = 32 };
-	BOOST::uint8_t wave [wave_size];
-	
+	uint8_t wave [wave_size];
+
 	void write_register( int, int );
 	void run( blip_time_t, blip_time_t, int playing );
 };

audacious-plugins-3.3.4.tar.bz2/src/console/Gbs_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Gbs_Emu.cxx Changed

@@ -24,21 +24,21 @@
 Gbs_Emu::Gbs_Emu()
 {
 	set_type( gme_gbs_type );
-	
+
 	static const char* const names [Gb_Apu::osc_count] = {
 		"Square 1", "Square 2", "Wave", "Noise"
 	};
 	set_voice_names( names );
-	
+
 	static int const types [Gb_Apu::osc_count] = {
 		wave_type | 1, wave_type | 2, wave_type | 0, mixed_type | 0
 	};
 	set_voice_types( types );
-	
+
 	set_silence_lookahead( 6 );
 	set_max_initial_silence( 21 );
 	set_gain( 1.2 );
-	
+
 	static equalizer_t const eq = { -1.0, 120 };
 	set_equalizer( eq );
 }
@@ -76,19 +76,19 @@
 struct Gbs_File : Gme_Info_
 {
 	Gbs_Emu::header_t h;
-	
+
 	Gbs_File() { set_type( gme_gbs_type ); }
-	
+
 	blargg_err_t load_( Data_Reader& in )
 	{
 		blargg_err_t err = in.read( &h, Gbs_Emu::header_size );
 		if ( err )
 			return (err == in.eof_error ? gme_wrong_file_type : err);
-		
+
 		set_track_count( h.track_count );
 		return check_gbs_header( &h );
 	}
-	
+
 	blargg_err_t track_info_( track_info_t* out, int ) const
 	{
 		copy_gbs_fields( h, out );
@@ -108,25 +108,25 @@
 {
 	assert( offsetof (header_t,copyright [32]) == header_size );
 	RETURN_ERR( rom.load( in, header_size, &header_, 0 ) );
-	
+
 	set_track_count( header_.track_count );
 	RETURN_ERR( check_gbs_header( &header_ ) );
-	
+
 	if ( header_.vers != 1 )
 		set_warning( "Unknown file version" );
-	
+
 	if ( header_.timer_mode & 0x78 )
 		set_warning( "Invalid timer mode" );
-	
-	unsigned load_addr = get_le16( header_.load_addr );
+
+	unsigned load_addr = GET_LE16( header_.load_addr );
 	if ( (header_.load_addr [1] | header_.init_addr [1] | header_.play_addr [1]) > 0x7F ||
 			load_addr < 0x400 )
 		set_warning( "Invalid load/init/play address" );
-	
+
 	set_voice_count( Gb_Apu::osc_count );
-	
+
 	apu.volume( gain() );
-	
+
 	return setup_buffer( 4194304 );
 }
 
@@ -174,7 +174,7 @@
 		play_period = blip_time_t (play_period / tempo());
 }
 
-static BOOST::uint8_t const sound_data [Gb_Apu::register_count] = {
+static uint8_t const sound_data [Gb_Apu::register_count] = {
 	0x80, 0xBF, 0x00, 0x00, 0xBF, // square 1
 	0x00, 0x3F, 0x00, 0x00, 0xBF, // square 2
 	0x7F, 0xFF, 0x9F, 0x00, 0xBF, // wave
@@ -187,7 +187,7 @@
 
 void Gbs_Emu::cpu_jsr( gb_addr_t addr )
 {
-	check( cpu::r.sp == get_le16( header_.stack_ptr ) );
+	check( cpu::r.sp == GET_LE16( header_.stack_ptr ) );
 	cpu::r.pc = addr;
 	cpu_write( --cpu::r.sp, idle_addr >> 8 );
 	cpu_write( --cpu::r.sp, idle_addr&0xFF );
@@ -202,37 +202,37 @@
 blargg_err_t Gbs_Emu::start_track_( int track )
 {
 	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	
+
 	memset( ram, 0, 0x4000 );
 	memset( ram + 0x4000, 0xFF, 0x1F80 );
 	memset( ram + 0x5F80, 0, sizeof ram - 0x5F80 );
 	ram [hi_page] = 0; // joypad reads back as 0
-	
+
 	apu.reset();
 	for ( int i = 0; i < (int) sizeof sound_data; i++ )
 		apu.write_register( 0, i + apu.start_addr, sound_data [i] );
-	
-	unsigned load_addr = get_le16( header_.load_addr );
+
+	unsigned load_addr = GET_LE16( header_.load_addr );
 	rom.set_addr( load_addr );
 	cpu::rst_base = load_addr;
-	
+
 	cpu::reset( rom.unmapped() );
-	
+
 	cpu::map_code( ram_addr, 0x10000 - ram_addr, ram );
 	cpu::map_code( 0, bank_size, rom.at_addr( 0 ) );
 	set_bank( rom.size() > bank_size );
-	
+
 	ram [hi_page + 6] = header_.timer_modulo;
 	ram [hi_page + 7] = header_.timer_mode;
 	update_timer();
 	next_play = play_period;
-	
+
 	cpu::r.a = track;
 	cpu::r.pc = idle_addr;
-	cpu::r.sp = get_le16( header_.stack_ptr );
+	cpu::r.sp = GET_LE16( header_.stack_ptr );
 	cpu_time = 0;
-	cpu_jsr( get_le16( header_.init_addr ) );
-	
+	cpu_jsr( GET_LE16( header_.init_addr ) );
+
 	return 0;
 }
 
@@ -245,7 +245,7 @@
 		cpu_time = duration;
 		bool result = cpu::run( count );
 		cpu_time -= cpu::remain();
-		
+
 		if ( result )
 		{
 			if ( cpu::r.pc == idle_addr )
@@ -255,11 +255,11 @@
 					cpu_time = duration;
 					break;
 				}
-				
+
 				if ( cpu_time < next_play )
 					cpu_time = next_play;
 				next_play += play_period;
-				cpu_jsr( get_le16( header_.play_addr ) );
+				cpu_jsr( GET_LE16( header_.play_addr ) );
 				GME_FRAME_HOOK( this );
 				// TODO: handle timer rates different than 60 Hz
 			}
@@ -278,12 +278,12 @@
 			}
 		}
 	}
-	
+
 	duration = cpu_time;
 	next_play -= cpu_time;
 	if ( next_play < 0 ) // could go negative if routine is taking too long to return
 		next_play = 0;
 	apu.end_frame( cpu_time );
-	
+
 	return 0;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Gme_File.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Gme_File.cxx Changed

@@ -41,7 +41,6 @@
 	user_data_ = 0;
 	user_cleanup_ = 0;
 	unload(); // clears fields
-	blargg_verify_byte_order(); // used by most emulator types, so save them the trouble
 }
 
 Gme_File::~Gme_File()
@@ -78,7 +77,7 @@
 		post_load_();
 	else
 		unload();
-	
+
 	return err;
 }
 
@@ -116,31 +115,31 @@
 {
 	if ( !in || !*in )
 		return;
-	
+
 	// remove spaces/junk from beginning
 	while ( in_size && unsigned (*in - 1) <= ' ' - 1 )
 	{
 		in++;
 		in_size--;
 	}
-	
+
 	// truncate
 	if ( in_size > max_field_ )
 		in_size = max_field_;
-	
+
 	// find terminator
 	int len = 0;
 	while ( len < in_size && in [len] )
 		len++;
-	
+
 	// remove spaces/junk from end
 	while ( len && unsigned (in [len - 1]) <= ' ' )
 		len--;
-	
+
 	// copy
 	out [len] = 0;
 	memcpy( out, in, len );
-	
+
 	// strip out stupid fields that should have been left blank
 	if ( !strcmp( out, "?" ) || !strcmp( out, "<?>" ) || !strcmp( out, "< ? >" ) )
 		out [0] = 0;
@@ -155,7 +154,7 @@
 {
 	if ( (unsigned) *track_io >= (unsigned) track_count() )
 		return "Invalid track";
-	
+
 	if ( (unsigned) *track_io < (unsigned) playlist.size() )
 	{
 		M3u_Playlist::entry_t const& e = playlist [*track_io];
@@ -183,20 +182,20 @@
 	out->loop_length = -1;
 	out->intro_length = -1;
 	out->song [0] = 0;
-	
+
 	out->game [0] = 0;
 	out->author [0] = 0;
 	out->copyright [0] = 0;
 	out->comment [0] = 0;
 	out->dumper [0] = 0;
 	out->system [0] = 0;
-	
+
 	copy_field_( out->system, type()->system );
-	
+
 	int remapped = track;
 	RETURN_ERR( remap_track_( &remapped ) );
 	RETURN_ERR( track_info_( out, remapped ) );
-	
+
 	// override with m3u info
 	if ( playlist.size() )
 	{
@@ -205,7 +204,7 @@
 		copy_field_( out->author, i.engineer );
 		copy_field_( out->author, i.composer );
 		copy_field_( out->dumper, i.ripping );
-		
+
 		M3u_Playlist::entry_t const& e = playlist [track];
 		copy_field_( out->song, e.name );
 		if ( e.length >= 0 ) out->length = e.length * 1000L;

audacious-plugins-3.3.4.tar.bz2/src/console/Gme_File.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Gme_File.h Changed

@@ -18,7 +18,7 @@
 	int track_count; /* non-zero for formats with a fixed number of tracks */
 	Music_Emu* (*new_emu)(); /* Create new emulator for this type (useful in C++ only) */
 	Music_Emu* (*new_info)(); /* Create new info reader for this type */
-	
+
 	/* internal */
 	const char* extension_;
 	int flags_;
@@ -27,12 +27,12 @@
 struct track_info_t
 {
 	long track_count;
-	
+
 	/* times in milliseconds; -1 if unknown */
 	long length;
 	long intro_length;
 	long loop_length;
-	
+
 	/* empty string if not available */
 	char system [256];
 	char game [256];
@@ -47,72 +47,71 @@
 struct Gme_File {
 public:
 // File loading
-	
+
 	// Each loads game music data from a file and returns an error if
 	// file is wrong type or is seriously corrupt. They also set warning
 	// string for minor problems.
-	
+
 	// Load from file on disk
 	blargg_err_t load_file( const char* path );
-	
+
 	// Load from custom data source (see Data_Reader.h)
 	blargg_err_t load( Data_Reader& );
-	
+
 	// Load from file already read into memory. Keeps pointer to data, so you
 	// must not free it until you're done with the file.
 	blargg_err_t load_mem( void const* data, long size );
-	
+
 	// Load an m3u playlist. Must be done after loading main music file.
 	blargg_err_t load_m3u( const char* path );
 	blargg_err_t load_m3u( Data_Reader& in );
-	
+
 	// Clears any loaded m3u playlist and any internal playlist that the music
 	// format supports (NSFE for example).
 	void clear_playlist();
-	
+
 // Informational
-	
+
 	// Type of emulator. For example if this returns gme_nsfe_type, this object
 	// is an NSFE emulator, and you can cast to an Nsfe_Emu* if necessary.
 	gme_type_t type() const;
-	
+
 	// Most recent warning string, or NULL if none. Clears current warning after
 	// returning.
 	const char* warning();
-	
+
 	// Number of tracks or 0 if no file has been loaded
 	int track_count() const;
-	
+
 	// Get information for a track (length, name, author, etc.)
 	// See gme.h for definition of struct track_info_t.
 	blargg_err_t track_info( track_info_t* out, int track ) const;
-	
+
 // User data/cleanup
-	
+
 	// Set/get pointer to data you want to associate with this emulator.
 	// You can use this for whatever you want.
 	void set_user_data( void* p ) { user_data_ = p; }
 	void* user_data() const { return user_data_; }
-	
+
 	// Register cleanup function to be called when deleting emulator, or NULL to
 	// clear it. Passes user_data to cleanup function.
 	void set_user_cleanup( gme_user_cleanup_t func ) { user_cleanup_ = func; }
-	
+
 public:
 	// deprecated
 	int error_count() const; // use warning()
 public:
 	Gme_File();
 	virtual ~Gme_File();
-	BLARGG_DISABLE_NOTHROW
-	typedef BOOST::uint8_t byte;
+	typedef uint8_t byte;
 protected:
 	// Services
 	void set_track_count( int n ) { track_count_ = raw_track_count_ = n; }
 	void set_warning( const char* s ) { warning_ = s; }
 	void set_type( gme_type_t t ) { type_ = t; }
 	blargg_err_t load_remaining_( void const* header, long header_size, Data_Reader& remaining );
-	
+
 	// Overridable
 	virtual void unload(); // called before loading file and if loading fails
 	virtual blargg_err_t load_( Data_Reader& ); // default loads then calls load_mem_()
@@ -121,14 +120,14 @@
 	virtual void pre_load();
 	virtual void post_load_();
 	virtual void clear_playlist_() { }
-	
+
 public:
 	blargg_err_t remap_track_( int* track_io ) const; // need by Music_Emu
 private:
 	// noncopyable
 	Gme_File( const Gme_File& );
 	Gme_File& operator = ( const Gme_File& );
-	
+
 	gme_type_t type_;
 	int track_count_;
 	int raw_track_count_;
@@ -138,7 +137,7 @@
 	M3u_Playlist playlist;
 	char playlist_warning [64];
 	blargg_vector<byte> file_data; // only if loaded into memory using default load
-	
+
 	blargg_err_t load_m3u_( blargg_err_t );
 	blargg_err_t post_load( blargg_err_t err );
 public:
@@ -147,18 +146,14 @@
 	static void copy_field_( char* out, const char* in );
 	static void copy_field_( char* out, const char* in, int len );
 };
-	
+
 Music_Emu* gme_new_( Music_Emu*, long sample_rate );
 
 #define GME_COPY_FIELD( in, out, name ) \
 	{ Gme_File::copy_field_( out->name, in.name, sizeof in.name ); }
 
 #ifndef GME_FILE_READER
-	#ifdef HAVE_ZLIB_H
-		#define GME_FILE_READER Gzip_File_Reader
-	#else
-		#define GME_FILE_READER Std_File_Reader
-	#endif
+	#define GME_FILE_READER Gzip_File_Reader
 #elif defined (GME_FILE_READER_INCLUDE)
 	#include GME_FILE_READER_INCLUDE
 #endif

audacious-plugins-3.3.4.tar.bz2/src/console/Gym_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Gym_Emu.cxx Changed

@@ -30,7 +30,7 @@
 	data = 0;
 	pos = 0;
 	set_type( gme_gym_type );
-	
+
 	static const char* const names [] = {
 		"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "PCM", "PSG"
 	};
@@ -47,7 +47,7 @@
 	if ( !memcmp( h.tag, "GYMX", 4 ) )
 	{
 		length = length * 50 / 3; // 1000 / 60
-		long loop = get_le32( h.loop_start );
+		long loop = GET_LE32( h.loop_start );
 		if ( loop )
 		{
 			out->intro_length = loop * 50 / 3;
@@ -59,20 +59,20 @@
 			out->intro_length = length; // make it clear that track is no longer than length
 			out->loop_length = 0;
 		}
-		
+
 		// more stupidity where the field should have been left
 		if ( strcmp( h.song, "Unknown Song" ) )
 			GME_COPY_FIELD( h, out, song );
-		
+
 		if ( strcmp( h.game, "Unknown Game" ) )
 			GME_COPY_FIELD( h, out, game );
-		
+
 		if ( strcmp( h.copyright, "Unknown Publisher" ) )
 			GME_COPY_FIELD( h, out, copyright );
-		
+
 		if ( strcmp( h.dumper, "Unknown Person" ) )
 			GME_COPY_FIELD( h, out, dumper );
-		
+
 		if ( strcmp( h.comment, "Header added by YMAMP" ) )
 			GME_COPY_FIELD( h, out, comment );
 	}
@@ -94,12 +94,12 @@
 			case 0:
 				time++;
 				break;
-			
+
 			case 1:
 			case 2:
 				p += 2;
 				break;
-			
+
 			case 3:
 				p += 1;
 				break;
@@ -114,15 +114,15 @@
 {
 	if ( size < 4 )
 		return gme_wrong_file_type;
-	
+
 	if ( memcmp( in, "GYMX", 4 ) == 0 )
 	{
 		if ( size < Gym_Emu::header_size + 1 )
 			return gme_wrong_file_type;
-		
+
 		if ( memcmp( ((Gym_Emu::header_t const*) in)->packed, "\0\0\0\0", 4 ) != 0 )
 			return "Packed GYM file not supported";
-		
+
 		if ( data_offset )
 			*data_offset = Gym_Emu::header_size;
 	}
@@ -130,7 +130,7 @@
 	{
 		return gme_wrong_file_type;
 	}
-	
+
 	return 0;
 }
 
@@ -139,9 +139,9 @@
 	byte const* file_begin;
 	byte const* file_end;
 	int data_offset;
-	
+
 	Gym_File() { set_type( gme_gym_type ); }
-	
+
 	blargg_err_t load_mem_( byte const* in, long size )
 	{
 		file_begin = in;
@@ -149,7 +149,7 @@
 		data_offset = 0;
 		return check_header( in, size, &data_offset );
 	}
-	
+
 	blargg_err_t track_info_( track_info_t* out, int ) const
 	{
 		long length = gym_track_length( &file_begin [data_offset], file_end );
@@ -175,13 +175,13 @@
 	dac_synth.volume( 0.125 / 256 * fm_gain * gain() );
 	double factor = Dual_Resampler::setup( oversample_factor, 0.990, fm_gain * gain() );
 	fm_sample_rate = sample_rate * factor;
-	
+
 	RETURN_ERR( blip_buf.set_sample_rate( sample_rate, int (1000 / 60.0 / min_tempo) ) );
 	blip_buf.clock_rate( clock_rate );
-	
+
 	RETURN_ERR( fm.set_rate( fm_sample_rate, base_clock / 7.0 ) );
 	RETURN_ERR( Dual_Resampler::reset( long (1.0 / 60 / min_tempo * sample_rate) ) );
-	
+
 	return 0;
 }
 
@@ -192,7 +192,7 @@
 		set_tempo( min_tempo );
 		return;
 	}
-	
+
 	if ( blip_buf.sample_rate() )
 	{
 		clocks_per_frame = long (clock_rate / 60 / tempo());
@@ -214,16 +214,16 @@
 	int offset = 0;
 	RETURN_ERR( check_header( in, size, &offset ) );
 	set_voice_count( 8 );
-	
+
 	data = in + offset;
 	data_end = in + size;
 	loop_begin = 0;
-	
+
 	if ( offset )
 		header_ = *(header_t const*) in;
 	else
 		memset( &header_, 0, sizeof header_ );
-	
+
 	return 0;
 }
 
@@ -232,14 +232,14 @@
 blargg_err_t Gym_Emu::start_track_( int track )
 {
 	RETURN_ERR( Music_Emu::start_track_( track ) );
-	
+
 	pos = data;
-	loop_remain = get_le32( header_.loop_start );
-	
+	loop_remain = GET_LE32( header_.loop_start );
+
 	prev_dac_count = 0;
 	dac_enabled = false;
 	dac_amp = -1;
-	
+
 	fm.reset();
 	apu.reset();
 	blip_buf.clear();
@@ -250,7 +250,7 @@
 void Gym_Emu::run_dac( int dac_count )
 {
 	// Guess beginning and end of sample and adjust rate and buffer position accordingly.
-	
+
 	// count dac samples in next frame
 	int next_dac_count = 0;
 	const byte* p = this->pos;
@@ -263,7 +263,7 @@
 		if ( cmd == 1 && data == 0x2A )
 			next_dac_count++;
 	}
-	
+
 	// detect beginning and end of sample
 	int rate_count = dac_count;
 	int start = 0;
@@ -276,17 +276,17 @@
 	{
 		rate_count = prev_dac_count;
 	}
-	
+
 	// Evenly space samples within buffer section being used
 	blip_resampled_time_t period = blip_buf.resampled_duration( clocks_per_frame ) / rate_count;
-	
+
 	blip_resampled_time_t time = blip_buf.resampled_time( 0 ) +
 			period * start + (period >> 1);
-	
+
 	int dac_amp = this->dac_amp;
 	if ( dac_amp < 0 )
 		dac_amp = dac_buf [0];
-	
+
 	for ( int i = 0; i < dac_count; i++ )
 	{
 		int delta = dac_buf [i] - dac_amp;
@@ -301,10 +301,10 @@
 {
 	int dac_count = 0;
 	const byte* pos = this->pos;
-	
+
 	if ( loop_remain && !--loop_remain )
 		loop_begin = pos; // find loop on first time through sequence
-	
+
 	int cmd;
 	while ( (cmd = *pos++) != 0 )
 	{
@@ -316,7 +316,7 @@
 			{
 				if ( data == 0x2B )
 					dac_enabled = (data2 & 0x80) != 0;
-				
+
 				fm.write0( data, data2 );
 			}
 			else if ( dac_count < (int) sizeof dac_buf )
@@ -337,23 +337,23 @@
 		{
 			// to do: many GYM streams are full of errors, and error count should
 			// reflect cases where music is really having problems
-			//log_error(); 
+			//log_error();
 			--pos; // put data back
 		}
 	}
-	
+
 	// loop
 	if ( pos >= data_end )
 	{
 		check( pos == data_end );
-		
+
 		if ( loop_begin )
 			pos = loop_begin;
 		else
 			set_track_ended();
 	}
 	this->pos = pos;
-	
+
 	// dac
 	if ( dac_count && !dac_muted )
 		run_dac( dac_count );
@@ -364,12 +364,12 @@
 {
 	if ( !track_ended() )
 		parse_frame();
-	
+
 	apu.end_frame( blip_time );
-	
+
 	memset( buf, 0, sample_count * sizeof *buf );
 	fm.run( sample_count >> 1, buf );
-	
+
 	return sample_count;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Gzip_Reader.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Gzip_Reader.cxx Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Gzip_Reader.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Gzip_Reader.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Hes_Apu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Hes_Apu.cxx Changed

@@ -32,7 +32,7 @@
 		osc->chans [2] = 0;
 	}
 	while ( osc != oscs );
-	
+
 	reset();
 }
 
@@ -40,7 +40,7 @@
 {
 	latch = 0;
 	balance = 0xFF;
-	
+
 	Hes_Osc* osc = &oscs [osc_count];
 	do
 	{
@@ -59,7 +59,7 @@
 	oscs [index].chans [0] = center;
 	oscs [index].chans [1] = left;
 	oscs [index].chans [2] = right;
-	
+
 	Hes_Osc* osc = &oscs [osc_count];
 	do
 	{
@@ -75,7 +75,7 @@
 	if ( osc_outputs_0 && control & 0x80 )
 	{
 		int dac = this->dac;
-		
+
 		int const volume_0 = volume [0];
 		{
 			int delta = dac * volume_0 - last_amp [0];
@@ -83,7 +83,7 @@
 				synth_.offset( last_time, delta, osc_outputs_0 );
 			osc_outputs_0->set_modified();
 		}
-		
+
 		Blip_Buffer* const osc_outputs_1 = outputs [1];
 		int const volume_1 = volume [1];
 		if ( osc_outputs_1 )
@@ -93,7 +93,7 @@
 				synth_.offset( last_time, delta, osc_outputs_1 );
 			osc_outputs_1->set_modified();
 		}
-		
+
 		blip_time_t time = last_time + delay;
 		if ( time < end_time )
 		{
@@ -122,7 +122,7 @@
 						time += period;
 					}
 					while ( time < end_time );
-					
+
 					this->noise_lfsr = noise_lfsr;
 					assert( noise_lfsr );
 				}
@@ -160,7 +160,7 @@
 						//if ( !(volume_0 | volume_1) )
 						// debug_printf( "Used period 0\n" );
 					}
-					
+
 					// maintain phase when silent
 					blargg_long count = (end_time - time + period - 1) / period;
 					phase += count; // phase will be masked below
@@ -173,7 +173,7 @@
 		if ( time < 0 )
 			time = 0;
 		delay = time;
-		
+
 		this->dac = dac;
 		last_amp [0] = dac * volume_0;
 		last_amp [1] = dac * volume_1;
@@ -195,18 +195,18 @@
 		ENTRY( 0.594604 ),ENTRY( 0.707107 ),ENTRY( 0.840896 ),ENTRY( 1.000000 ),
 		#undef ENTRY
 	};
-	
+
 	int vol = (osc.control & 0x1F) - 0x1E * 2;
-	
+
 	int left = vol + (osc.balance >> 3 & 0x1E) + (balance >> 3 & 0x1E);
 	if ( left < 0 ) left = 0;
-	
+
 	int right = vol + (osc.balance << 1 & 0x1E) + (balance << 1 & 0x1E);
 	if ( right < 0 ) right = 0;
-	
+
 	left = log_table [left ];
 	right = log_table [right];
-	
+
 	// optimizing for the common case of being centered also allows easy
 	// panning using Effects_Buffer
 	osc.outputs [0] = osc.chans [0]; // center
@@ -216,13 +216,13 @@
 		osc.outputs [0] = osc.chans [1]; // left
 		osc.outputs [1] = osc.chans [2]; // right
 	}
-	
+
 	if ( center_waves )
 	{
 		osc.last_amp [0] += (left - osc.volume [0]) * 16;
 		osc.last_amp [1] += (right - osc.volume [1]) * 16;
 	}
-	
+
 	osc.volume [0] = left;
 	osc.volume [1] = right;
 }
@@ -238,7 +238,7 @@
 		if ( balance != data )
 		{
 			balance = data;
-			
+
 			Hes_Osc* osc = &oscs [osc_count];
 			do
 			{
@@ -258,23 +258,23 @@
 		case 0x802:
 			osc.period = (osc.period & 0xF00) | data;
 			break;
-		
+
 		case 0x803:
 			osc.period = (osc.period & 0x0FF) | ((data & 0x0F) << 8);
 			break;
-		
+
 		case 0x804:
 			if ( osc.control & 0x40 & ~data )
 				osc.phase = 0;
 			osc.control = data;
 			balance_changed( osc );
 			break;
-		
+
 		case 0x805:
 			osc.balance = data;
 			balance_changed( osc );
 			break;
-		
+
 		case 0x806:
 			data &= 0x1F;
 			if ( !(osc.control & 0x40) )
@@ -287,12 +287,12 @@
 				osc.dac = data;
 			}
 			break;
-		
+
 		 case 0x807:
 		 	if ( &osc >= &oscs [4] )
 		 		osc.noise = data;
 		 	break;
-		 
+
 		 case 0x809:
 		 	if ( !(data & 0x80) && (data & 0x03) != 0 )
 		 		debug_printf( "HES LFO not supported\n" );

audacious-plugins-3.3.4.tar.bz2/src/console/Hes_Apu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Hes_Apu.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Hes_Cpu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Hes_Cpu.cxx Changed

@@ -50,20 +50,18 @@
 {
 	check( state == &state_ );
 	state = &state_;
-	
+
 	state_.time = 0;
 	state_.base = 0;
 	irq_time_ = future_hes_time;
 	end_time_ = future_hes_time;
-	
+
 	r.status = st_i;
 	r.sp = 0;
 	r.pc = 0;
 	r.a = 0;
 	r.x = 0;
 	r.y = 0;
-	
-	blargg_verify_byte_order();
 }
 
 void Hes_Cpu::set_mmr( int reg, int bank )
@@ -101,7 +99,7 @@
 	this->state = &s;
 	// even on x86, using s.time in place of s_time was slower
 	fint16 s_time = s.time;
-	
+
 	// registers
 	fuint16 pc = r.pc;
 	fuint8 a = r.a;
@@ -109,9 +107,9 @@
 	fuint8 y = r.y;
 	fuint16 sp;
 	SET_SP( r.sp );
-	
+
 	#define IS_NEG (nz & 0x8080)
-	
+
 	#define CALC_STATUS( out ) do {\
 		out = status & (st_v | st_d | st_i);\
 		out |= ((nz >> 8) | nz) & st_n;\
@@ -125,7 +123,7 @@
 		c = nz;\
 		nz |= ~in & st_z;\
 	} while ( 0 )
-	
+
 	fuint8 status;
 	fuint16 c; // carry set if (c & 0x100) != 0
 	fuint16 nz; // Z set if (nz & 0xFF) == 0, N set if (nz & 0x8080) != 0
@@ -133,12 +131,12 @@
 		fuint8 temp = r.status;
 		SET_STATUS( temp );
 	}
-	
+
 	goto loop;
 branch_not_taken:
 	s_time -= 2;
 loop:
-	
+
 	#ifndef NDEBUG
 	{
 		hes_time_t correct = end_time_;
@@ -157,10 +155,10 @@
 	check( (unsigned) GET_SP() < 0x100 );
 	check( (unsigned) a < 0x100 );
 	check( (unsigned) x < 0x100 );
-	
+
 	uint8_t const* instr = s.code_map [pc >> page_shift];
 	fuint8 opcode;
-	
+
 	// TODO: eliminate this special case
 	#if BLARGG_NONPORTABLE
 		opcode = instr [pc];
@@ -171,7 +169,7 @@
 		opcode = *instr++;
 		pc++;
 	#endif
-	
+
 	// TODO: each reference lists slightly different timing values, ugh
 	static uint8_t const clock_table [256] =
 	{// 0 1 2 3 4 5 6 7 8 9 A B C D E F
@@ -192,21 +190,21 @@
 		2,7,2,17,4,4,6,7,2,2,2,2,5,5,7,6,// E
 		4,7,7,17,2,4,6,7,2,5,4,2,2,5,7,6 // F
 	}; // 0x00 was 8
-	
+
 	fuint16 data;
 	data = clock_table [opcode];
 	if ( (s_time += data) >= 0 )
 		goto possibly_out_of_time;
 almost_out_of_time:
-	
+
 	data = *instr;
-	
+
 	#ifdef HES_CPU_LOG_H
 		log_cpu( "new", pc - 1, opcode, instr [0], instr [1], instr [2],
 				instr [3], instr [4], instr [5] );
 		//log_opcode( opcode );
 	#endif
-	
+
 	switch ( opcode )
 	{
 possibly_out_of_time:
@@ -230,41 +228,41 @@
 // TODO: more efficient way to handle negative branch that wraps PC around
 #define BRANCH( cond )\
 {\
-	fint16 offset = (BOOST::int8_t) data;\
+	fint16 offset = (int8_t) data;\
 	pc++;\
 	if ( !(cond) ) goto branch_not_taken;\
-	pc = BOOST::uint16_t (pc + offset);\
+	pc = uint16_t (pc + offset);\
 	goto loop;\
 }
 
 	case 0xF0: // BEQ
 		BRANCH( !((uint8_t) nz) );
-	
+
 	case 0xD0: // BNE
 		BRANCH( (uint8_t) nz );
-	
+
 	case 0x10: // BPL
 		BRANCH( !IS_NEG );
-	
+
 	case 0x90: // BCC
 		BRANCH( !(c & 0x100) )
-	
+
 	case 0x30: // BMI
 		BRANCH( IS_NEG )
-	
+
 	case 0x50: // BVC
 		BRANCH( !(status & st_v) )
-	
+
 	case 0x70: // BVS
 		BRANCH( status & st_v )
-	
+
 	case 0xB0: // BCS
 		BRANCH( c & 0x100 )
-	
+
 	case 0x80: // BRA
 	branch_taken:
 		BRANCH( true );
-	
+
 	case 0xFF:
 		if ( pc == idle_addr + 1 )
 			goto idle_done;
@@ -289,11 +287,11 @@
 		data = GET_MSB();
 		BRANCH( t & (1 << (opcode >> 4)) )
 	}
-	
+
 	case 0x4C: // JMP abs
 		pc = GET_ADDR();
 		goto loop;
-	
+
 	case 0x7C: // JMP (ind+X)
 		data += x;
 	case 0x6C:{// JMP (ind)
@@ -301,7 +299,7 @@
 		pc = GET_LE16( &READ_PROG( data ) );
 		goto loop;
 	}
-	
+
 // Subroutine
 
 	case 0x44: // BSR
@@ -309,7 +307,7 @@
 		sp = (sp - 2) | 0x100;
 		WRITE_LOW( sp, pc );
 		goto branch_taken;
-	
+
 	case 0x20: { // JSR
 		fuint16 temp = pc + 1;
 		pc = GET_ADDR();
@@ -318,16 +316,16 @@
 		WRITE_LOW( sp, temp );
 		goto loop;
 	}
-	
+
 	case 0x60: // RTS
 		pc = 0x100 * READ_LOW( 0x100 | (sp - 0xFF) );
 		pc += 1 + READ_LOW( sp );
 		sp = (sp - 0xFE) | 0x100;
 		goto loop;
-	
+
 	case 0x00: // BRK
 		goto handle_brk;
-	
+
 // Common
 
 	case 0xBD:{// LDA abs,X
@@ -338,21 +336,21 @@
 		a = nz;
 		goto loop;
 	}
-	
+
 	case 0x9D:{// STA abs,X
 		fuint16 addr = GET_ADDR() + x;
 		pc += 2;
 		CPU_WRITE_FAST( this, addr, a, TIME );
 		goto loop;
 	}
-	
+
 	case 0x95: // STA zp,x
 		data = uint8_t (data + x);
 	case 0x85: // STA zp
 		pc++;
 		WRITE_LOW( data, a );
 		goto loop;
-	
+
 	case 0xAE:{// LDX abs
 		fuint16 addr = GET_ADDR();
 		pc += 2;
@@ -360,14 +358,14 @@
 		x = nz;
 		goto loop;
 	}
-	
+
 	case 0xA5: // LDA zp
 		a = nz = READ_LOW( data );
 		pc++;
 		goto loop;
-	
+
 // Load/store
-	
+
 	{
 		fuint16 addr;
 	case 0x91: // STA (ind),Y
@@ -375,7 +373,7 @@
 		addr += READ_LOW( data ) + y;
 		pc++;
 		goto sta_ptr;
-	
+
 	case 0x81: // STA (ind,X)
 		data = uint8_t (data + x);
 	case 0x92: // STA (ind)
@@ -383,7 +381,7 @@
 		addr += READ_LOW( data );
 		pc++;
 		goto sta_ptr;
-	
+
 	case 0x99: // STA abs,Y
 		data += y;
 	case 0x8D: // STA abs
@@ -393,7 +391,7 @@
 		CPU_WRITE_FAST( this, addr, a, TIME );
 		goto loop;
 	}
-	
+
 	{
 		fuint16 addr;
 	case 0xA1: // LDA (ind,X)
@@ -403,14 +401,14 @@
 		addr += READ_LOW( data );
 		pc++;
 		goto a_nz_read_addr;
-	
+
 	case 0xB1:// LDA (ind),Y
 		addr = READ_LOW( data ) + y;
 		PAGE_CROSS_PENALTY( addr );
 		addr += 0x100 * READ_LOW( (uint8_t) (data + 1) );
 		pc++;
 		goto a_nz_read_addr;
-	
+
 	case 0xB9: // LDA abs,Y
 		data += y;
 		PAGE_CROSS_PENALTY( data );
@@ -432,12 +430,12 @@
 		CACHE_TIME();
 		goto loop;
 	}
-	
+
 	case 0xB5: // LDA zp,x
 		a = nz = READ_LOW( uint8_t (data + x) );
 		pc++;
 		goto loop;
-	
+
 	case 0xA9: // LDA #imm
 		pc++;
 		a = data;
@@ -470,14 +468,14 @@
 			goto loop; // Z should be clear, and nz must be non-zero if nz & a is
 		nz <<= 8; // set Z flag without affecting N flag
 		goto loop;
-		
+
 	{
 		fuint16 addr;
-		
+
 	case 0xB3: // TST abs,x
 		addr = GET_MSB() + x;
 		goto tst_abs;
-	
+
 	case 0x93: // TST abs
 		addr = GET_MSB();
 	tst_abs:
@@ -488,11 +486,11 @@
 		CACHE_TIME();
 		goto tst_common;
 	}
-	
+
 	case 0xA3: // TST zp,x
 		nz = READ_LOW( uint8_t (GET_MSB() + x) );
 		goto tst_common;
-	
+
 	case 0x83: // TST zp
 		nz = READ_LOW( GET_MSB() );
 	tst_common:
@@ -503,7 +501,7 @@
 			goto loop; // Z should be clear, and nz must be non-zero if nz & data is
 		nz <<= 8; // set Z flag without affecting N flag
 		goto loop;
-	
+
 	{
 		fuint16 addr;
 	case 0x0C: // TSB abs
@@ -511,7 +509,7 @@
 		addr = GET_ADDR();
 		pc++;
 		goto txb_addr;
-	
+
 	// TODO: everyone lists different behaviors for the status flags, ugh
 	case 0x04: // TSB zp
 	case 0x14: // TRB zp
@@ -528,7 +526,7 @@
 		CACHE_TIME();
 		goto loop;
 	}
-	
+
 	case 0x07: // RMBn
 	case 0x17:
 	case 0x27:
@@ -540,7 +538,7 @@
 		pc++;
 		READ_LOW( data ) &= ~(1 << (opcode >> 4));
 		goto loop;
-	
+
 	case 0x87: // SMBn
 	case 0x97:
 	case 0xA7:
@@ -552,9 +550,9 @@
 		pc++;
 		READ_LOW( data ) |= 1 << ((opcode >> 4) - 8);
 		goto loop;
-	
+
 // Load/store
-	
+
 	case 0x9E: // STZ abs,x
 		data += x;
 	case 0x9C: // STZ abs
@@ -564,28 +562,28 @@
 		WRITE( data, 0 );
 		CACHE_TIME();
 		goto loop;
-	
+
 	case 0x74: // STZ zp,x
 		data = uint8_t (data + x);
 	case 0x64: // STZ zp
 		pc++;
 		WRITE_LOW( data, 0 );
 		goto loop;
-	
+
 	case 0x94: // STY zp,x
 		data = uint8_t (data + x);
 	case 0x84: // STY zp
 		pc++;
 		WRITE_LOW( data, y );
 		goto loop;
-	
+
 	case 0x96: // STX zp,y
 		data = uint8_t (data + y);
 	case 0x86: // STX zp
 		pc++;
 		WRITE_LOW( data, x );
 		goto loop;
-	
+
 	case 0xB6: // LDX zp,y
 		data = uint8_t (data + y);
 	case 0xA6: // LDX zp
@@ -595,7 +593,7 @@
 		x = data;
 		nz = data;
 		goto loop;
-	
+
 	case 0xB4: // LDY zp,x
 		data = uint8_t (data + x);
 	case 0xA4: // LDY zp
@@ -605,7 +603,7 @@
 		y = data;
 		nz = data;
 		goto loop;
-	
+
 	case 0xBC: // LDY abs,X
 		data += x;
 		PAGE_CROSS_PENALTY( data );
@@ -617,13 +615,13 @@
 		CACHE_TIME();
 		goto loop;
 	}
-	
+
 	{
 		fuint8 temp;
 	case 0x8C: // STY abs
 		temp = y;
 		goto store_abs;
-	
+
 	case 0x8E: // STX abs
 		temp = x;
 	store_abs:
@@ -645,7 +643,7 @@
 		CACHE_TIME();
 		goto cpx_data;
 	}
-	
+
 	case 0xE4: // CPX zp
 		data = READ_LOW( data );
 	case 0xE0: // CPX #imm
@@ -655,7 +653,7 @@
 		c = ~nz;
 		nz &= 0xFF;
 		goto loop;
-	
+
 	case 0xCC:{// CPY abs
 		fuint16 addr = GET_ADDR();
 		pc++;
@@ -664,7 +662,7 @@
 		CACHE_TIME();
 		goto cpy_data;
 	}
-	
+
 	case 0xC4: // CPY zp
 		data = READ_LOW( data );
 	case 0xC0: // CPY #imm
@@ -674,7 +672,7 @@
 		c = ~nz;
 		nz &= 0xFF;
 		goto loop;
-	
+
 // Logical
 
 #define ARITH_ADDR_MODES( op )\
@@ -716,34 +714,34 @@
 		c = ~nz;
 		nz &= 0xFF;
 		goto loop;
-	
+
 	ARITH_ADDR_MODES( 0x25 ) // AND
 		nz = (a &= data);
 		pc++;
 		goto loop;
-	
+
 	ARITH_ADDR_MODES( 0x45 ) // EOR
 		nz = (a ^= data);
 		pc++;
 		goto loop;
-	
+
 	ARITH_ADDR_MODES( 0x05 ) // ORA
 		nz = (a |= data);
 		pc++;
 		goto loop;
-	
+
 // Add/subtract
 
 	ARITH_ADDR_MODES( 0xE5 ) // SBC
 		data ^= 0xFF;
 		goto adc_imm;
-	
+
 	ARITH_ADDR_MODES( 0x65 ) // ADC
 	adc_imm: {
 		if ( status & st_d )
 			debug_printf( "Decimal mode not supported\n" );
 		fint16 carry = c >> 8 & 1;
-		fint16 ov = (a ^ 0x80) + carry + (BOOST::int8_t) data; // sign-extend
+		fint16 ov = (a ^ 0x80) + carry + (int8_t) data; // sign-extend
 		status &= ~st_v;
 		status |= ov >> 2 & 0x40;
 		c = nz = a + data + carry;
@@ -751,7 +749,7 @@
 		a = (uint8_t) nz;
 		goto loop;
 	}
-	
+
 // Shift/rotate
 
 	case 0x4A: // LSR A
@@ -777,7 +775,7 @@
 		a = (uint8_t) nz;
 		goto loop;
 	}
-	
+
 	case 0x5E: // LSR abs,X
 		data += x;
 	case 0x4E: // LSR abs
@@ -791,11 +789,11 @@
 		c = temp << 8;
 		goto rotate_common;
 	}
-	
+
 	case 0x3E: // ROL abs,X
 		data += x;
 		goto rol_abs;
-	
+
 	case 0x1E: // ASL abs,X
 		data += x;
 	case 0x0E: // ASL abs
@@ -811,15 +809,15 @@
 		WRITE( data, (uint8_t) nz );
 		CACHE_TIME();
 		goto loop;
-	
+
 	case 0x7E: // ROR abs,X
 		data += x;
 		goto ror_abs;
-	
+
 	case 0x76: // ROR zp,x
 		data = uint8_t (data + x);
 		goto ror_zp;
-	
+
 	case 0x56: // LSR zp,x
 		data = uint8_t (data + x);
 	case 0x46: // LSR zp
@@ -831,11 +829,11 @@
 		c = temp << 8;
 		goto write_nz_zp;
 	}
-	
+
 	case 0x36: // ROL zp,x
 		data = uint8_t (data + x);
 		goto rol_zp;
-	
+
 	case 0x16: // ASL zp,x
 		data = uint8_t (data + x);
 	case 0x06: // ASL zp
@@ -845,35 +843,35 @@
 		nz = c >> 8 & 1;
 		nz |= (c = READ_LOW( data ) << 1);
 		goto write_nz_zp;
-	
+
 // Increment/decrement
 
 #define INC_DEC_AXY( reg, n ) reg = uint8_t (nz = reg + n); goto loop;
 
 	case 0x1A: // INA
 		INC_DEC_AXY( a, +1 )
-	
+
 	case 0xE8: // INX
 		INC_DEC_AXY( x, +1 )
-	
+
 	case 0xC8: // INY
 		INC_DEC_AXY( y, +1 )
 
 	case 0x3A: // DEA
 		INC_DEC_AXY( a, -1 )
-	
+
 	case 0xCA: // DEX
 		INC_DEC_AXY( x, -1 )
-	
+
 	case 0x88: // DEY
 		INC_DEC_AXY( y, -1 )
-	
+
 	case 0xF6: // INC zp,x
 		data = uint8_t (data + x);
 	case 0xE6: // INC zp
 		nz = 1;
 		goto add_nz_zp;
-	
+
 	case 0xD6: // DEC zp,x
 		data = uint8_t (data + x);
 	case 0xC6: // DEC zp
@@ -884,21 +882,21 @@
 		pc++;
 		WRITE_LOW( data, nz );
 		goto loop;
-	
+
 	case 0xFE: // INC abs,x
 		data = x + GET_ADDR();
 		goto inc_ptr;
-	
+
 	case 0xEE: // INC abs
 		data = GET_ADDR();
 	inc_ptr:
 		nz = 1;
 		goto inc_common;
-	
+
 	case 0xDE: // DEC abs,x
 		data = x + GET_ADDR();
 		goto dec_ptr;
-	
+
 	case 0xCE: // DEC abs
 		data = GET_ADDR();
 	dec_ptr:
@@ -910,24 +908,24 @@
 		WRITE( data, (uint8_t) nz );
 		CACHE_TIME();
 		goto loop;
-		
+
 // Transfer
 
 	case 0xA8: // TAY
 		y = a;
 		nz = a;
 		goto loop;
-	
+
 	case 0x98: // TYA
 		a = y;
 		nz = y;
 		goto loop;
-	
+
 	case 0xAA: // TAX
 		x = a;
 		nz = a;
 		goto loop;
-		
+
 	case 0x8A: // TXA
 		a = x;
 		nz = x;
@@ -936,53 +934,53 @@
 	case 0x9A: // TXS
 		SET_SP( x ); // verified (no flag change)
 		goto loop;
-	
+
 	case 0xBA: // TSX
 		x = nz = GET_SP();
 		goto loop;
-	
+
 	#define SWAP_REGS( r1, r2 ) {\
 		fuint8 t = r1;\
 		r1 = r2;\
 		r2 = t;\
 		goto loop;\
 	}
-	
+
 	case 0x02: // SXY
 		SWAP_REGS( x, y );
-	
+
 	case 0x22: // SAX
 		SWAP_REGS( a, x );
-	
+
 	case 0x42: // SAY
 		SWAP_REGS( a, y );
-	
+
 	case 0x62: // CLA
 		a = 0;
 		goto loop;
-	
+
 	case 0x82: // CLX
 		x = 0;
 		goto loop;
-	
+
 	case 0xC2: // CLY
 		y = 0;
 		goto loop;
-	
+
 // Stack
-	
+
 	case 0x48: // PHA
 		PUSH( a );
 		goto loop;
-		
+
 	case 0xDA: // PHX
 		PUSH( x );
 		goto loop;
-		
+
 	case 0x5A: // PHY
 		PUSH( y );
 		goto loop;
-		
+
 	case 0x40:{// RTI
 		fuint8 temp = READ_LOW( sp );
 		pc = READ_LOW( 0x100 | (sp - 0xFF) );
@@ -1002,21 +1000,21 @@
 		}
 		goto loop;
 	}
-	
+
 	#define POP() READ_LOW( sp ); sp = (sp - 0xFF) | 0x100
-	
+
 	case 0x68: // PLA
 		a = nz = POP();
 		goto loop;
-	
+
 	case 0xFA: // PLX
 		x = nz = POP();
 		goto loop;
-	
+
 	case 0x7A: // PLY
 		y = nz = POP();
 		goto loop;
-	
+
 	case 0x28:{// PLP
 		fuint8 temp = POP();
 		fuint8 changed = status ^ temp;
@@ -1028,36 +1026,36 @@
 		goto handle_cli;
 	}
 	#undef POP
-	
+
 	case 0x08: { // PHP
 		fuint8 temp;
 		CALC_STATUS( temp );
 		PUSH( temp | st_b );
 		goto loop;
 	}
-	
+
 // Flags
 
 	case 0x38: // SEC
 		c = (unsigned) ~0;
 		goto loop;
-	
+
 	case 0x18: // CLC
 		c = 0;
 		goto loop;
-		
+
 	case 0xB8: // CLV
 		status &= ~st_v;
 		goto loop;
-	
+
 	case 0xD8: // CLD
 		status &= ~st_d;
 		goto loop;
-	
+
 	case 0xF8: // SED
 		status |= st_d;
 		goto loop;
-	
+
 	case 0x58: // CLI
 		if ( !(status & st_i) )
 			goto loop;
@@ -1075,7 +1073,7 @@
 		s_time += delta;
 		if ( s_time < 0 )
 			goto loop;
-		
+
 		if ( delta >= s_time + 1 )
 		{
 			// delayed irq until after next instruction
@@ -1088,7 +1086,7 @@
 		debug_printf( "Delayed CLI not supported\n" ); // TODO: implement
 		goto loop;
 	}
-	
+
 	case 0x78: // SEI
 		if ( status & st_i )
 			goto loop;
@@ -1103,9 +1101,9 @@
 		debug_printf( "Delayed SEI not supported\n" ); // TODO: implement
 		goto loop;
 	}
-	
+
 // Special
-	
+
 	case 0x53:{// TAM
 		fuint8 const bits = data; // avoid using data across function call
 		pc++;
@@ -1114,7 +1112,7 @@
 				set_mmr( i, a );
 		goto loop;
 	}
-	
+
 	case 0x43:{// TMA
 		pc++;
 		byte const* in = mmr;
@@ -1127,7 +1125,7 @@
 		while ( (data >>= 1) != 0 );
 		goto loop;
 	}
-	
+
 	case 0x03: // ST0
 	case 0x13: // ST1
 	case 0x23:{// ST2
@@ -1140,7 +1138,7 @@
 		CACHE_TIME();
 		goto loop;
 	}
-	
+
 	case 0xEA: // NOP
 		goto loop;
 
@@ -1148,10 +1146,10 @@
 		debug_printf( "CSL not supported\n" );
 		illegal_encountered = true;
 		goto loop;
-	
+
 	case 0xD4: // CSH
 		goto loop;
-	
+
 	case 0xF4: { // SET
 		//fuint16 operand = GET_MSB();
 		debug_printf( "SET not handled\n" );
@@ -1161,7 +1159,7 @@
 		illegal_encountered = true;
 		goto loop;
 	}
-	
+
 // Block transfer
 
 	{
@@ -1169,11 +1167,11 @@
 		fint16 in_inc;
 		fuint16 out_alt;
 		fint16 out_inc;
-		
+
 	case 0xE3: // TIA
 		in_alt = 0;
 		goto bxfer_alt;
-	
+
 	case 0xF3: // TAI
 		in_alt = 1;
 	bxfer_alt:
@@ -1181,17 +1179,17 @@
 		out_alt = in_inc;
 		out_inc = in_alt;
 		goto bxfer;
-	
+
 	case 0xD3: // TIN
 		in_inc = 1;
 		out_inc = 0;
 		goto bxfer_no_alt;
-	
+
 	case 0xC3: // TDD
 		in_inc = -1;
 		out_inc = -1;
 		goto bxfer_no_alt;
-	
+
 	case 0x73: // TII
 		in_inc = 1;
 		out_inc = 1;
@@ -1238,37 +1236,37 @@
 		goto loop;
 	}
 	assert( false );
-	
+
 	int result_;
 handle_brk:
 	pc++;
 	result_ = 6;
-	
+
 interrupt:
 	{
 		s_time += 7;
-		
+
 		WRITE_LOW( 0x100 | (sp - 1), pc >> 8 );
 		WRITE_LOW( 0x100 | (sp - 2), pc );
 		pc = GET_LE16( &READ_PROG( 0xFFF0 ) + result_ );
-		
+
 		sp = (sp - 3) | 0x100;
 		fuint8 temp;
 		CALC_STATUS( temp );
 		if ( result_ == 6 )
 			temp |= st_b;
 		WRITE_LOW( sp, temp );
-		
+
 		status &= ~st_d;
 		status |= st_i;
 		this->r.status = status; // update externally-visible I flag
-		
+
 		blargg_long delta = s.base - end_time_;
 		s.base = end_time_;
 		s_time += delta;
 		goto loop;
 	}
-	
+
 idle_done:
 	s_time = 0;
 out_of_time:
@@ -1280,24 +1278,24 @@
 		goto interrupt;
 	if ( s_time < 0 )
 		goto loop;
-	
+
 	s.time = s_time;
-	
+
 	r.pc = pc;
 	r.sp = GET_SP();
 	r.a = a;
 	r.x = x;
 	r.y = y;
-	
+
 	{
 		fuint8 temp;
 		CALC_STATUS( temp );
 		r.status = temp;
 	}
-	
+
 	this->state_ = s;
 	this->state = &this->state_;
-	
+
 	return illegal_encountered;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Hes_Cpu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Hes_Cpu.h Changed

@@ -12,22 +12,20 @@
 
 class Hes_Cpu {
 public:
-	typedef BOOST::uint8_t uint8_t;
-	
 	void reset();
-	
+
 	enum { page_size = 0x2000 };
 	enum { page_shift = 13 };
 	enum { page_count = 8 };
 	void set_mmr( int reg, int bank );
-	
+
 	uint8_t const* get_code( hes_addr_t );
-	
+
 	uint8_t ram [page_size];
-	
+
 	// not kept updated during a call to run()
 	struct registers_t {
-		BOOST::uint16_t pc;
+		uint16_t pc;
 		uint8_t a;
 		uint8_t x;
 		uint8_t y;
@@ -35,35 +33,35 @@
 		uint8_t sp;
 	};
 	registers_t r;
-	
+
 	// page mapping registers
 	uint8_t mmr [page_count + 1];
-	
+
 	// Set end_time and run CPU from current time. Returns true if any illegal
 	// instructions were encountered.
 	bool run( hes_time_t end_time );
-	
+
 	// Time of beginning of next instruction to be executed
 	hes_time_t time() const             { return state->time + state->base; }
 	void set_time( hes_time_t t )       { state->time = t - state->base; }
 	void adjust_time( int delta )       { state->time += delta; }
-	
+
 	hes_time_t irq_time() const         { return irq_time_; }
 	void set_irq_time( hes_time_t );
-	
+
 	hes_time_t end_time() const         { return end_time_; }
 	void set_end_time( hes_time_t );
-	
+
 	void end_frame( hes_time_t );
-	
+
 	// Attempt to execute instruction here results in CPU advancing time to
 	// lesser of irq_time() and end_time() (or end_time() if IRQs are
 	// disabled)
 	enum { idle_addr = 0x1FFF };
-	
+
 	// Can read this many bytes past end of a page
 	enum { cpu_padding = 8 };
-	
+
 public:
 	Hes_Cpu() { state = &state_; }
 	enum { irq_inhibit = 0x04 };
@@ -71,7 +69,7 @@
 	// noncopyable
 	Hes_Cpu( const Hes_Cpu& );
 	Hes_Cpu& operator = ( const Hes_Cpu& );
-	
+
 	struct state_t {
 		uint8_t const* code_map [page_count + 1];
 		hes_time_t base;
@@ -81,12 +79,12 @@
 	state_t state_;
 	hes_time_t irq_time_;
 	hes_time_t end_time_;
-	
+
 	void set_code_page( int, void const* );
 	inline int update_end_time( hes_time_t end, hes_time_t irq );
 };
 
-inline BOOST::uint8_t const* Hes_Cpu::get_code( hes_addr_t addr )
+inline uint8_t const* Hes_Cpu::get_code( hes_addr_t addr )
 {
 	return state->code_map [addr >> page_shift] + addr
 	#if !BLARGG_NONPORTABLE

audacious-plugins-3.3.4.tar.bz2/src/console/Hes_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Hes_Emu.cxx Changed

@@ -29,12 +29,12 @@
 {
 	timer.raw_load = 0;
 	set_type( gme_hes_type );
-	
+
 	static const char* const names [Hes_Apu::osc_count] = {
 		"Wave 1", "Wave 2", "Wave 3", "Wave 4", "Multi 1", "Multi 2"
 	};
 	set_voice_names( names );
-	
+
 	static int const types [Hes_Apu::osc_count] = {
 		wave_type | 0, wave_type | 1, wave_type | 2, wave_type | 3,
 		mixed_type | 0, mixed_type | 1
@@ -61,19 +61,19 @@
 		int len = 0x20;
 		if ( in [0x1F] && !in [0x2F] )
 			len = 0x30; // fields are sometimes 16 bytes longer (ugh)
-		
+
 		// since text fields are where any data could be, detect non-text
 		// and fields with data after zero byte terminator
-		
+
 		int i = 0;
 		for ( i = 0; i < len && in [i]; i++ )
 			if ( ((in [i] + 1) & 0xFF) < ' ' + 1 ) // also treat 0xFF as non-text
 				return 0; // non-ASCII found
-		
+
 		for ( ; i < len; i++ )
 			if ( in [i] )
 				return 0; // data after terminator
-		
+
 		Gme_File::copy_field_( out, (char const*) in, len );
 		in += len;
 	}
@@ -110,9 +110,9 @@
 		char unused [0x20];
 		byte fields [0x30 * 3];
 	} h;
-	
+
 	Hes_File() { set_type( gme_hes_type ); }
-	
+
 	blargg_err_t load_( Data_Reader& in )
 	{
 		assert( offsetof (header_t,fields) == Hes_Emu::header_size + 0x20 );
@@ -121,7 +121,7 @@
 			return (err == in.eof_error ? gme_wrong_file_type : err);
 		return check_hes_header( &h );
 	}
-	
+
 	blargg_err_t track_info_( track_info_t* out, int ) const
 	{
 		copy_hes_fields( h.fields, out );
@@ -142,24 +142,24 @@
 {
 	assert( offsetof (header_t,unused [4]) == header_size );
 	RETURN_ERR( rom.load( in, header_size, &header_, unmapped ) );
-	
+
 	RETURN_ERR( check_hes_header( header_.tag ) );
-	
+
 	if ( header_.vers != 0 )
 		set_warning( "Unknown file version" );
-	
+
 	if ( memcmp( header_.data_tag, "DATA", 4 ) )
 		set_warning( "Data header missing" );
-	
+
 	if ( memcmp( header_.unused, "\0\0\0\0", 4 ) )
 		set_warning( "Unknown header data" );
-	
+
 	// File spec supports multiple blocks, but I haven't found any, and
 	// many files have bad sizes in the only block, so it's simpler to
 	// just try to load the damn data as best as possible.
-	
-	long addr = get_le32( header_.addr );
-	long size = get_le32( header_.size );
+
+	long addr = GET_LE32( header_.addr );
+	long size = GET_LE32( header_.size );
 	long const rom_max = 0x100000;
 	if ( addr & ~(rom_max - 1) )
 	{
@@ -168,7 +168,7 @@
 	}
 	if ( (unsigned long) (addr + size) > (unsigned long) rom_max )
 		set_warning( "Invalid size" );
-	
+
 	if ( size != rom.file_size() )
 	{
 		if ( size <= rom.file_size() - 4 && !memcmp( rom.begin() + size, "DATA", 4 ) )
@@ -178,13 +178,13 @@
 		else
 			set_warning( "Missing file data" );
 	}
-	
+
 	rom.set_addr( addr );
-	
+
 	set_voice_count( apu.osc_count );
-	
+
 	apu.volume( gain() );
-	
+
 	return setup_buffer( 7159091 );
 }
 
@@ -215,40 +215,40 @@
 blargg_err_t Hes_Emu::start_track_( int track )
 {
 	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	
+
 	memset( ram, 0, sizeof ram ); // some HES music relies on zero fill
 	memset( sgx, 0, sizeof sgx );
-	
+
 	apu.reset();
 	cpu::reset();
-	
+
 	for ( unsigned i = 0; i < sizeof header_.banks; i++ )
 		set_mmr( i, header_.banks [i] );
 	set_mmr( page_count, 0xFF ); // unmapped beyond end of address space
-	
+
 	irq.disables = timer_mask | vdp_mask;
 	irq.timer = future_hes_time;
 	irq.vdp = future_hes_time;
-	
+
 	timer.enabled = false;
 	timer.raw_load= 0x80;
 	timer.count = timer.load;
 	timer.fired = false;
 	timer.last_time = 0;
-	
+
 	vdp.latch = 0;
 	vdp.control = 0;
 	vdp.next_vbl = 0;
-	
+
 	ram [0x1FF] = (idle_addr - 1) >> 8;
 	ram [0x1FE] = (idle_addr - 1) & 0xFF;
 	r.sp = 0xFD;
-	r.pc = get_le16( header_.init_addr );
+	r.pc = GET_LE16( header_.init_addr );
 	r.a = track;
-	
+
 	recalc_timer_load();
 	last_frame_hook = 0;
-	
+
 	return 0;
 }
 
@@ -261,7 +261,7 @@
 	case 0:
 		vdp.latch = data & 0x1F;
 		break;
-	
+
 	case 2:
 		if ( vdp.latch == 5 )
 		{
@@ -276,7 +276,7 @@
 			debug_printf( "VDP not supported: $%02X <- $%02X\n", vdp.latch, data );
 		}
 		break;
-	
+
 	case 3:
 		debug_printf( "VDP MSB not supported: $%02X <- $%02X\n", vdp.latch, data );
 		break;
@@ -293,7 +293,7 @@
 		apu.write_data( t, addr, data );
 		return;
 	}
-	
+
 	hes_time_t time = this->time();
 	switch ( addr )
 	{
@@ -302,7 +302,7 @@
 	case 0x0003:
 		cpu_write_vdp( addr, data );
 		return;
-	
+
 	case 0x0C00: {
 		run_until( time );
 		timer.raw_load = (data & 0x7F) + 1;
@@ -310,7 +310,7 @@
 		timer.count = timer.load;
 		break;
 	}
-	
+
 	case 0x0C01:
 		data &= 1;
 		if ( timer.enabled == data )
@@ -320,21 +320,21 @@
 		if ( data )
 			timer.count = timer.load;
 		break;
-	
+
 	case 0x1402:
 		run_until( time );
 		irq.disables = data;
 		if ( (data & 0xF8) && (data & 0xF8) != 0xF8 ) // flag questionable values
 			debug_printf( "Int mask: $%02X\n", data );
 		break;
-	
+
 	case 0x1403:
 		run_until( time );
 		if ( timer.enabled )
 			timer.count = timer.load;
 		timer.fired = false;
 		break;
-	
+
 #ifndef NDEBUG
 	case 0x1000: // I/O port
 	case 0x0402: // palette
@@ -342,13 +342,13 @@
 	case 0x0404:
 	case 0x0405:
 		return;
-		
+
 	default:
 		debug_printf( "unmapped write $%04X <- $%02X\n", addr, data );
 		return;
 #endif
 	}
-	
+
 	irq_changed();
 }
 
@@ -365,22 +365,22 @@
 		run_until( time );
 		irq_changed();
 		return 0x20;
-		
+
 	case 0x0002:
 	case 0x0003:
 		debug_printf( "VDP read not supported: %d\n", addr );
 		return 0;
-	
+
 	case 0x0C01:
 		//return timer.enabled; // TODO: remove?
 	case 0x0C00:
 		run_until( time );
 		debug_printf( "Timer count read\n" );
 		return (unsigned) (timer.count - 1) / timer_base;
-	
+
 	case 0x1402:
 		return irq.disables;
-	
+
 	case 0x1403:
 		{
 			int status = 0;
@@ -388,18 +388,18 @@
 			if ( irq.vdp <= time ) status |= vdp_mask;
 			return status;
 		}
-		
+
 	#ifndef NDEBUG
 		case 0x1000: // I/O port
 		case 0x180C: // CD-ROM
 		case 0x180D:
 			break;
-		
+
 		default:
 			debug_printf( "unmapped read $%04X\n", addr );
 	#endif
 	}
-	
+
 	return unmapped;
 }
 
@@ -411,7 +411,7 @@
 {
 	while ( vdp.next_vbl < present )
 		vdp.next_vbl += play_period;
-	
+
 	hes_time_t elapsed = present - timer.last_time;
 	if ( elapsed > 0 )
 	{
@@ -428,25 +428,25 @@
 void Hes_Emu::irq_changed()
 {
 	hes_time_t present = time();
-	
+
 	if ( irq.timer > present )
 	{
 		irq.timer = future_hes_time;
 		if ( timer.enabled && !timer.fired )
 			irq.timer = present + timer.count;
 	}
-	
+
 	if ( irq.vdp > present )
 	{
 		irq.vdp = future_hes_time;
 		if ( vdp.control & 0x08 )
 			irq.vdp = vdp.next_vbl;
 	}
-	
+
 	hes_time_t time = future_hes_time;
 	if ( !(irq.disables & timer_mask) ) time = irq.timer;
 	if ( !(irq.disables & vdp_mask) ) time = min( time, irq.vdp );
-	
+
 	set_irq_time( time );
 }
 
@@ -454,11 +454,11 @@
 {
 	check( time() >= end_time() ||
 			(!(r.status & i_flag_mask) && time() >= irq_time()) );
-	
+
 	if ( !(r.status & i_flag_mask) )
 	{
 		hes_time_t present = time();
-		
+
 		if ( irq.timer <= present && !(irq.disables & timer_mask) )
 		{
 			timer.fired = true;
@@ -477,7 +477,7 @@
 			#endif
 			return 0x0A;
 		}
-		
+
 		if ( irq.vdp <= present && !(irq.disables & vdp_mask) )
 		{
 			// work around for bugs with music not acknowledging VDP
@@ -507,15 +507,15 @@
 blargg_err_t Hes_Emu::run_clocks( blip_time_t& duration_, int )
 {
 	blip_time_t const duration = duration_; // cache
-	
+
 	if ( cpu::run( duration ) )
 		set_warning( "Emulation error (illegal instruction)" );
-	
+
 	check( time() >= duration );
 	//check( time() - duration < 20 ); // Txx instruction could cause going way over
-	
+
 	run_until( duration );
-	
+
 	// end time frame
 	timer.last_time -= duration;
 	vdp.next_vbl -= duration;
@@ -526,6 +526,6 @@
 	::adjust_time( irq.timer, duration );
 	::adjust_time( irq.vdp, duration );
 	apu.end_frame( duration );
-	
+
 	return 0;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Hes_Emu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Hes_Emu.h Changed

@@ -25,10 +25,10 @@
 		byte addr [4];
 		byte unused [4];
 	};
-	
+
 	// Header for currently loaded file
 	header_t const& header() const { return header_; }
-	
+
 	static gme_type_t static_type() { return gme_hes_type; }
 
 public:
@@ -45,7 +45,7 @@
 	void unload();
 public: private: friend class Hes_Cpu;
 	byte* write_pages [page_count + 1]; // 0 if unmapped or I/O space
-	
+
 	int cpu_read_( hes_addr_t );
 	int cpu_read( hes_addr_t );
 	void cpu_write_( hes_addr_t, int data );
@@ -59,7 +59,7 @@
 	hes_time_t play_period;
 	hes_time_t last_frame_hook;
 	int timer_base;
-	
+
 	struct {
 		hes_time_t last_time;
 		blargg_long count;
@@ -68,25 +68,25 @@
 		byte enabled;
 		byte fired;
 	} timer;
-	
+
 	struct {
 		hes_time_t next_vbl;
 		byte latch;
 		byte control;
 	} vdp;
-	
+
 	struct {
 		hes_time_t timer;
 		hes_time_t vdp;
 		byte disables;
 	} irq;
-	
+
 	void recalc_timer_load();
-	
+
 	// large items
 	Hes_Apu apu;
 	byte sgx [3 * page_size + cpu_padding];
-	
+
 	void irq_changed();
 	void run_until( hes_time_t );
 };

audacious-plugins-3.3.4.tar.bz2/src/console/Kss_Cpu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Kss_Cpu.cxx Changed

@@ -62,7 +62,7 @@
 Kss_Cpu::Kss_Cpu()
 {
 	state = &state_;
-	
+
 	for ( int i = 0x100; --i >= 0; )
 	{
 		int even = 1;
@@ -90,10 +90,10 @@
 	state_.time = 0;
 	state_.base = 0;
 	end_time_ = 0;
-	
+
 	for ( int i = 0; i < page_count + 1; i++ )
 		set_page( i, unmapped_write, unmapped_read );
-	
+
 	memset( &r, 0, sizeof r );
 }
 
@@ -102,7 +102,7 @@
 	// address range must begin and end on page boundaries
 	require( addr % page_size == 0 );
 	require( size % page_size == 0 );
-	
+
 	unsigned first_page = addr / page_size;
 	for ( unsigned i = size / page_size; i--; )
 	{
@@ -123,9 +123,9 @@
 #define OUT( addr, data ) CPU_OUT( this, addr, data, TIME )
 
 #if BLARGG_BIG_ENDIAN
-	#define R8( n, offset ) ((r8_ - offset) [n]) 
+	#define R8( n, offset ) ((r8_ - offset) [n])
 #elif BLARGG_LITTLE_ENDIAN
-	#define R8( n, offset ) ((r8_ - offset) [(n) ^ 1]) 
+	#define R8( n, offset ) ((r8_ - offset) [(n) ^ 1])
 #else
 	#error "Byte order of CPU must be known"
 #endif
@@ -173,9 +173,9 @@
 	state_t s = this->state_;
 	this->state = &s;
 	bool warning = false;
-	
-	typedef BOOST::int8_t int8_t;
-	
+
+	typedef int8_t int8_t;
+
 	union {
 		regs_t rg;
 		pairs_t rp;
@@ -183,35 +183,35 @@
 		uint16_t r16_ [4];
 	};
 	rg = this->r.b;
-	
+
 	cpu_time_t s_time = s.time;
 	fuint16 pc = r.pc;
 	fuint16 sp = r.sp;
 	fuint16 ix = r.ix; // TODO: keep in memory for direct access?
 	fuint16 iy = r.iy;
 	int flags = r.b.flags;
-	
+
 	goto loop;
 jr_not_taken:
 	s_time -= 5;
 	goto loop;
 call_not_taken:
-	s_time -= 7; 
+	s_time -= 7;
 jp_not_taken:
 	pc += 2;
 loop:
-	
+
 	check( (unsigned long) pc < 0x10000 );
 	check( (unsigned long) sp < 0x10000 );
 	check( (unsigned) flags < 0x100 );
 	check( (unsigned) ix < 0x10000 );
 	check( (unsigned) iy < 0x10000 );
-	
+
 	uint8_t const* instr = s.read [pc >> page_shift];
 #define GET_ADDR() GET_LE16( instr )
-	
+
 	fuint8 opcode;
-	
+
 	// TODO: eliminate this special case
 	#if BLARGG_NONPORTABLE
 		opcode = instr [pc];
@@ -222,7 +222,7 @@
 		opcode = *instr++;
 		pc++;
 	#endif
-	
+
 	static byte const base_timing [0x100] = {
 	// 0 1 2 3 4 5 6 7 8 9 A B C D E F
 		 4,10, 7, 6, 4, 4, 7, 4, 4,11, 7, 6, 4, 4, 7, 4, // 0
@@ -242,22 +242,22 @@
 		11,10,10,19,17,11, 7,11,11, 4,10, 4,17, 8, 7,11, // E
 		11,10,10, 4,17,11, 7,11,11, 6,10, 4,17, 8, 7,11, // F
 	};
-	
+
 	fuint16 data;
 	data = base_timing [opcode];
 	if ( (s_time += data) >= 0 )
 		goto possibly_out_of_time;
 almost_out_of_time:
-	
+
 	data = READ_PROG( pc );
-	
+
 	#ifdef Z80_CPU_LOG_H
 		//log_opcode( opcode, READ_PROG( pc ) );
 		z80_log_regs( rg.a, rp.bc, rp.de, rp.hl, sp, ix, iy );
 		z80_cpu_log( "new", pc - 1, opcode, READ_PROG( pc ),
 				READ_PROG( pc + 1 ), READ_PROG( pc + 2 ) );
 	#endif
-	
+
 	switch ( opcode )
 	{
 possibly_out_of_time:
@@ -271,40 +271,40 @@
 	case 0x00: // NOP
 	CASE7( 40, 49, 52, 5B, 64, 6D, 7F ): // LD B,B etc.
 		goto loop;
-	
+
 	case 0x08:{// EX AF,AF'
 		int temp = r.alt.b.a;
 		r.alt.b.a = rg.a;
 		rg.a = temp;
-		
+
 		temp = r.alt.b.flags;
 		r.alt.b.flags = flags;
 		flags = temp;
 		goto loop;
 	}
-	
+
 	case 0xD3: // OUT (imm),A
 		pc++;
 		OUT( data + rg.a * 0x100, rg.a );
 		goto loop;
-		
+
 	case 0x2E: // LD L,imm
 		pc++;
 		rg.l = data;
 		goto loop;
-	
+
 	case 0x3E: // LD A,imm
 		pc++;
 		rg.a = data;
 		goto loop;
-	
+
 	case 0x3A:{// LD A,(addr)
 		fuint16 addr = GET_ADDR();
 		pc += 2;
 		rg.a = READ( addr );
 		goto loop;
 	}
-	
+
 // Conditional
 
 #define ZERO (flags & Z40)
@@ -315,14 +315,14 @@
 // JR
 // TODO: more efficient way to handle negative branch that wraps PC around
 #define JR( cond ) {\
-	int offset = (BOOST::int8_t) data;\
+	int offset = (int8_t) data;\
 	pc++;\
 	if ( !(cond) )\
 		goto jr_not_taken;\
 	pc = uint16_t (pc + offset);\
 	goto loop;\
 }
-	
+
 	case 0x20: JR( !ZERO ) // JR NZ,disp
 	case 0x28: JR( ZERO ) // JR Z,disp
 	case 0x30: JR( !CARRY ) // JR NC,disp
@@ -334,10 +334,10 @@
 		rg.b = temp;
 		JR( temp )
 	}
-	
+
 // JP
 #define JP( cond ) if ( !(cond) ) goto jp_not_taken; pc = GET_ADDR(); goto loop;
-	
+
 	case 0xC2: JP( !ZERO ) // JP NZ,addr
 	case 0xCA: JP( ZERO ) // JP Z,addr
 	case 0xD2: JP( !CARRY ) // JP NC,addr
@@ -346,18 +346,18 @@
 	case 0xEA: JP( EVEN ) // JP PE,addr
 	case 0xF2: JP( !MINUS ) // JP P,addr
 	case 0xFA: JP( MINUS ) // JP M,addr
-	
+
 	case 0xC3: // JP addr
 		pc = GET_ADDR();
 		goto loop;
-	
+
 	case 0xE9: // JP HL
 		pc = rp.hl;
 		goto loop;
 
 // RET
 #define RET( cond ) if ( cond ) goto ret_taken; s_time -= 6; goto loop;
-	
+
 	case 0xC0: RET( !ZERO ) // RET NZ
 	case 0xC8: RET( ZERO ) // RET Z
 	case 0xD0: RET( !CARRY ) // RET NC
@@ -366,13 +366,13 @@
 	case 0xE8: RET( EVEN ) // RET PE
 	case 0xF0: RET( !MINUS ) // RET P
 	case 0xF8: RET( MINUS ) // RET M
-	
+
 	case 0xC9: // RET
 	ret_taken:
 		pc = READ_WORD( sp );
 		sp = uint16_t (sp + 2);
 		goto loop;
-	
+
 // CALL
 #define CALL( cond ) if ( cond ) goto call_taken; goto call_not_taken;
 
@@ -384,7 +384,7 @@
 	case 0xEC: CALL( EVEN ) // CALL PE,addr
 	case 0xF4: CALL( !MINUS ) // CALL P,addr
 	case 0xFC: CALL( MINUS ) // CALL M,addr
-	
+
 	case 0xCD:{// CALL addr
 	call_taken:
 		fuint16 addr = pc + 2;
@@ -393,7 +393,7 @@
 		WRITE_WORD( sp, addr );
 		goto loop;
 	}
-	
+
 	case 0xFF: // RST
 		if ( pc > idle_addr )
 			goto hit_idle_addr;
@@ -406,7 +406,7 @@
 	case 0xF5: // PUSH AF
 		data = rg.a * 0x100u + flags;
 		goto push_data;
-	
+
 	case 0xC5: // PUSH BC
 	case 0xD5: // PUSH DE
 	case 0xE5: // PUSH HL
@@ -415,20 +415,20 @@
 		sp = uint16_t (sp - 2);
 		WRITE_WORD( sp, data );
 		goto loop;
-	
+
 	case 0xF1: // POP AF
 		flags = READ( sp );
 		rg.a = READ( sp + 1 );
 		sp = uint16_t (sp + 2);
 		goto loop;
-	
+
 	case 0xC1: // POP BC
 	case 0xD1: // POP DE
 	case 0xE1: // POP HL
 		R16( opcode, 4, 0xC1 ) = READ_WORD( sp );
 		sp = uint16_t (sp + 2);
 		goto loop;
-	
+
 // ADC/ADD/SBC/SUB
 	case 0x96: // SUB (HL)
 	case 0x86: // ADD (HL)
@@ -437,7 +437,7 @@
 	case 0x8E: // ADC (HL)
 		data = READ( rp.hl );
 		goto adc_data;
-	
+
 	case 0xD6: // SUB A,imm
 	case 0xC6: // ADD imm
 		flags &= ~C01;
@@ -445,7 +445,7 @@
 	case 0xCE: // ADC imm
 		pc++;
 		goto adc_data;
-	
+
 	CASE7( 90, 91, 92, 93, 94, 95, 97 ): // SUB r
 	CASE7( 80, 81, 82, 83, 84, 85, 87 ): // ADD r
 		flags &= ~C01;
@@ -471,11 +471,11 @@
 	case 0xBE: // CP (HL)
 		data = READ( rp.hl );
 		goto cp_data;
-	
+
 	case 0xFE: // CP imm
 		pc++;
 		goto cp_data;
-	
+
 	CASE7( B8, B9, BA, BB, BC, BD, BF ): // CP r
 		data = R8( opcode, 0xB8 );
 	cp_data: {
@@ -489,13 +489,13 @@
 		flags |= Z40;
 		goto loop;
 	}
-	
+
 // ADD HL,rp
-	
+
 	case 0x39: // ADD HL,SP
 		data = sp;
 		goto add_hl_data;
-	
+
 	case 0x09: // ADD HL,BC
 	case 0x19: // ADD HL,DE
 	case 0x29: // ADD HL,HL
@@ -510,21 +510,21 @@
 				((data ^ sum) >> 8 & H10);
 		goto loop;
 	}
-	
+
 	case 0x27:{// DAA
 		int a = rg.a;
 		if ( a > 0x99 )
 			flags |= C01;
-		
+
 		int adjust = 0x60 & -(flags & C01);
-		
+
 		if ( flags & H10 || (a & 0x0F) > 9 )
 			adjust |= 0x06;
-		
+
 		if ( flags & N02 )
 			adjust = -adjust;
 		a += adjust;
-		
+
 		flags = (flags & (C01 | N02)) |
 				((rg.a ^ a) & H10) |
 				SZ28P( (uint8_t) a );
@@ -536,26 +536,26 @@
 		// more optimized, but probably not worth the obscurity
 		int f = (rg.a + (0xFF - 0x99)) >> 8 | flags; // (a > 0x99 ? C01 : 0) | flags
 		int adjust = 0x60 & -(f & C01); // f & C01 ? 0x60 : 0
-		
+
 		if ( (((rg.a + (0x0F - 9)) ^ rg.a) | f) & H10 ) // flags & H10 || (rg.a & 0x0F) > 9
 			adjust |= 0x06;
-		
+
 		if ( f & N02 )
 			adjust = -adjust;
 		int a = rg.a + adjust;
-		
+
 		flags = (f & (N02 | C01)) | ((rg.a ^ a) & H10) | SZ28P( (uint8_t) a );
 		rg.a = a;
 		goto loop;
 	}
 	*/
-	
+
 // INC/DEC
 	case 0x34: // INC (HL)
 		data = READ( rp.hl ) + 1;
 		WRITE( rp.hl, data );
 		goto inc_set_flags;
-	
+
 	CASE7( 04, 0C, 14, 1C, 24, 2C, 3C ): // INC r
 		data = ++R8( opcode >> 3, 0 );
 	inc_set_flags:
@@ -566,12 +566,12 @@
 			goto loop;
 		flags |= V04;
 		goto loop;
-	
+
 	case 0x35: // DEC (HL)
 		data = READ( rp.hl ) - 1;
 		WRITE( rp.hl, data );
 		goto dec_set_flags;
-	
+
 	CASE7( 05, 0D, 15, 1D, 25, 2D, 3D ): // DEC r
 		data = --R8( opcode >> 3, 0 );
 	dec_set_flags:
@@ -588,46 +588,46 @@
 	case 0x23: // INC HL
 		R16( opcode, 4, 0x03 )++;
 		goto loop;
-	
+
 	case 0x33: // INC SP
 		sp = uint16_t (sp + 1);
 		goto loop;
-	
+
 	case 0x0B: // DEC BC
 	case 0x1B: // DEC DE
 	case 0x2B: // DEC HL
 		R16( opcode, 4, 0x0B )--;
 		goto loop;
-	
+
 	case 0x3B: // DEC SP
 		sp = uint16_t (sp - 1);
 		goto loop;
-	
+
 // AND
 	case 0xA6: // AND (HL)
 		data = READ( rp.hl );
 		goto and_data;
-	
+
 	case 0xE6: // AND imm
 		pc++;
 		goto and_data;
-	
+
 	CASE7( A0, A1, A2, A3, A4, A5, A7 ): // AND r
 		data = R8( opcode, 0xA0 );
 	and_data:
 		rg.a &= data;
 		flags = SZ28P( rg.a ) | H10;
 		goto loop;
-	
+
 // OR
 	case 0xB6: // OR (HL)
 		data = READ( rp.hl );
 		goto or_data;
-	
+
 	case 0xF6: // OR imm
 		pc++;
 		goto or_data;
-	
+
 	CASE7( B0, B1, B2, B3, B4, B5, B7 ): // OR r
 		data = R8( opcode, 0xB0 );
 	or_data:
@@ -639,11 +639,11 @@
 	case 0xAE: // XOR (HL)
 		data = READ( rp.hl );
 		goto xor_data;
-	
+
 	case 0xEE: // XOR imm
 		pc++;
 		goto xor_data;
-	
+
 	CASE7( A8, A9, AA, AB, AC, AD, AF ): // XOR r
 		data = R8( opcode, 0xA8 );
 	xor_data:
@@ -655,7 +655,7 @@
 	CASE7( 70, 71, 72, 73, 74, 75, 77 ): // LD (HL),r
 		WRITE( rp.hl, R8( opcode, 0x70 ) );
 		goto loop;
-	
+
 	CASE6( 41, 42, 43, 44, 45, 47 ): // LD B,r
 	CASE6( 48, 4A, 4B, 4C, 4D, 4F ): // LD C,r
 	CASE6( 50, 51, 53, 54, 55, 57 ): // LD D,r
@@ -665,70 +665,70 @@
 	CASE6( 78, 79, 7A, 7B, 7C, 7D ): // LD A,r
 		R8( opcode >> 3 & 7, 0 ) = R8( opcode & 7, 0 );
 		goto loop;
-	
+
 	CASE5( 06, 0E, 16, 1E, 26 ): // LD r,imm
 		R8( opcode >> 3, 0 ) = data;
 		pc++;
 		goto loop;
-	
+
 	case 0x36: // LD (HL),imm
 		pc++;
 		WRITE( rp.hl, data );
 		goto loop;
-	
+
 	CASE7( 46, 4E, 56, 5E, 66, 6E, 7E ): // LD r,(HL)
 		R8( opcode >> 3, 8 ) = READ( rp.hl );
 		goto loop;
-	
+
 	case 0x01: // LD rp,imm
 	case 0x11:
 	case 0x21:
 		R16( opcode, 4, 0x01 ) = GET_ADDR();
 		pc += 2;
 		goto loop;
-	
+
 	case 0x31: // LD sp,imm
 		sp = GET_ADDR();
 		pc += 2;
 		goto loop;
-	
+
 	case 0x2A:{// LD HL,(addr)
 		fuint16 addr = GET_ADDR();
 		pc += 2;
 		rp.hl = READ_WORD( addr );
 		goto loop;
 	}
-	
+
 	case 0x32:{// LD (addr),A
 		fuint16 addr = GET_ADDR();
 		pc += 2;
 		WRITE( addr, rg.a );
 		goto loop;
 	}
-	
+
 	case 0x22:{// LD (addr),HL
 		fuint16 addr = GET_ADDR();
 		pc += 2;
 		WRITE_WORD( addr, rp.hl );
 		goto loop;
 	}
-	
+
 	case 0x02: // LD (BC),A
 	case 0x12: // LD (DE),A
 		WRITE( R16( opcode, 4, 0x02 ), rg.a );
 		goto loop;
-	
+
 	case 0x0A: // LD A,(BC)
 	case 0x1A: // LD A,(DE)
 		rg.a = READ( R16( opcode, 4, 0x0A ) );
 		goto loop;
-	
+
 	case 0xF9: // LD SP,HL
 		sp = rp.hl;
 		goto loop;
-	
+
 // Rotate
-	
+
 	case 0x07:{// RLCA
 		fuint16 temp = rg.a;
 		temp = (temp << 1) | (temp >> 7);
@@ -737,7 +737,7 @@
 		rg.a = temp;
 		goto loop;
 	}
-	
+
 	case 0x0F:{// RRCA
 		fuint16 temp = rg.a;
 		flags = (flags & (S80 | Z40 | P04)) |
@@ -747,7 +747,7 @@
 		rg.a = temp;
 		goto loop;
 	}
-	
+
 	case 0x17:{// RLA
 		blargg_ulong temp = (rg.a << 1) | (flags & C01);
 		flags = (flags & (S80 | Z40 | P04)) |
@@ -756,7 +756,7 @@
 		rg.a = temp;
 		goto loop;
 	}
-	
+
 	case 0x1F:{// RRA
 		fuint16 temp = (flags << 7) | (rg.a >> 1);
 		flags = (flags & (S80 | Z40 | P04)) |
@@ -765,7 +765,7 @@
 		rg.a = temp;
 		goto loop;
 	}
-	
+
 // Misc
 	case 0x2F:{// CPL
 		fuint16 temp = ~rg.a;
@@ -775,19 +775,19 @@
 		rg.a = temp;
 		goto loop;
 	}
-	
+
 	case 0x3F:{// CCF
 		flags = ((flags & (S80 | Z40 | P04 | C01)) ^ C01) |
 				(flags << 4 & H10) |
 				(rg.a & (F20 | F08));
 		goto loop;
 	}
-	
+
 	case 0x37: // SCF
 		flags = (flags & (S80 | Z40 | P04)) | C01 |
 				(rg.a & (F20 | F08));
 		goto loop;
-	
+
 	case 0xDB: // IN A,(imm)
 		pc++;
 		rg.a = IN( data + rg.a * 0x100 );
@@ -799,52 +799,52 @@
 		rp.hl = temp;
 		goto loop;
 	}
-	
+
 	case 0xEB:{// EX DE,HL
 		fuint16 temp = rp.hl;
 		rp.hl = rp.de;
 		rp.de = temp;
 		goto loop;
 	}
-	
+
 	case 0xD9:{// EXX DE,HL
 		fuint16 temp = r.alt.w.bc;
 		r.alt.w.bc = rp.bc;
 		rp.bc = temp;
-		
+
 		temp = r.alt.w.de;
 		r.alt.w.de = rp.de;
 		rp.de = temp;
-		
+
 		temp = r.alt.w.hl;
 		r.alt.w.hl = rp.hl;
 		rp.hl = temp;
 		goto loop;
 	}
-	
+
 	case 0xF3: // DI
 		r.iff1 = 0;
 		r.iff2 = 0;
 		goto loop;
-	
+
 	case 0xFB: // EI
 		r.iff1 = 1;
 		r.iff2 = 1;
 		// TODO: delayed effect
 		goto loop;
-	
+
 	case 0x76: // HALT
 		goto halt;
-	
+
 //////////////////////////////////////// CB prefix
 	{
 	case 0xCB:
 		pc++;
 		switch ( data )
 		{
-	
+
 	// Rotate left
-		
+
 	#define RLC( read, write ) {\
 		fuint8 result = read;\
 		result = uint8_t (result << 1) | (result >> 7);\
@@ -852,67 +852,67 @@
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x06: // RLC (HL)
 			s_time += 7;
 			data = rp.hl;
 		rlc_data_addr:
 			RLC( READ( data ), WRITE( data, result ) )
-		
+
 		CASE7( 00, 01, 02, 03, 04, 05, 07 ):{// RLC r
 			uint8_t& reg = R8( data, 0 );
 			RLC( reg, reg = result )
 		}
-		
+
 	#define RL( read, write ) {\
 		fuint16 result = (read << 1) | (flags & C01);\
 		flags = SZ28PC( result );\
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x16: // RL (HL)
 			s_time += 7;
 			data = rp.hl;
 		rl_data_addr:
 			RL( READ( data ), WRITE( data, result ) )
-		
+
 		CASE7( 10, 11, 12, 13, 14, 15, 17 ):{// RL r
 			uint8_t& reg = R8( data, 0x10 );
 			RL( reg, reg = result )
 		}
-		
+
 	#define SLA( read, add, write ) {\
 		fuint16 result = (read << 1) | add;\
 		flags = SZ28PC( result );\
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x26: // SLA (HL)
 			s_time += 7;
 			data = rp.hl;
 		sla_data_addr:
 			SLA( READ( data ), 0, WRITE( data, result ) )
-		
+
 		CASE7( 20, 21, 22, 23, 24, 25, 27 ):{// SLA r
 			uint8_t& reg = R8( data, 0x20 );
 			SLA( reg, 0, reg = result )
 		}
-		
+
 		case 0x36: // SLL (HL)
 			s_time += 7;
 			data = rp.hl;
 		sll_data_addr:
 			SLA( READ( data ), 1, WRITE( data, result ) )
-		
+
 		CASE7( 30, 31, 32, 33, 34, 35, 37 ):{// SLL r
 			uint8_t& reg = R8( data, 0x30 );
 			SLA( reg, 1, reg = result )
 		}
-		
+
 	// Rotate right
-		
+
 	#define RRC( read, write ) {\
 		fuint8 result = read;\
 		flags = result & C01;\
@@ -921,18 +921,18 @@
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x0E: // RRC (HL)
 			s_time += 7;
 			data = rp.hl;
 		rrc_data_addr:
 			RRC( READ( data ), WRITE( data, result ) )
-		
+
 		CASE7( 08, 09, 0A, 0B, 0C, 0D, 0F ):{// RRC r
 			uint8_t& reg = R8( data, 0x08 );
 			RRC( reg, reg = result )
 		}
-		
+
 	#define RR( read, write ) {\
 		fuint8 result = read;\
 		fuint8 temp = result & C01;\
@@ -941,18 +941,18 @@
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x1E: // RR (HL)
 			s_time += 7;
 			data = rp.hl;
 		rr_data_addr:
 			RR( READ( data ), WRITE( data, result ) )
-		
+
 		CASE7( 18, 19, 1A, 1B, 1C, 1D, 1F ):{// RR r
 			uint8_t& reg = R8( data, 0x18 );
 			RR( reg, reg = result )
 		}
-		
+
 	#define SRA( read, write ) {\
 		fuint8 result = read;\
 		flags = result & C01;\
@@ -961,18 +961,18 @@
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x2E: // SRA (HL)
 			data = rp.hl;
 			s_time += 7;
 		sra_data_addr:
 			SRA( READ( data ), WRITE( data, result ) )
-		
+
 		CASE7( 28, 29, 2A, 2B, 2C, 2D, 2F ):{// SRA r
 			uint8_t& reg = R8( data, 0x28 );
 			SRA( reg, reg = result )
 		}
-		
+
 	#define SRL( read, write ) {\
 		fuint8 result = read;\
 		flags = result & C01;\
@@ -981,18 +981,18 @@
 		write;\
 		goto loop;\
 	}
-		
+
 		case 0x3E: // SRL (HL)
 			s_time += 7;
 			data = rp.hl;
 		srl_data_addr:
 			SRL( READ( data ), WRITE( data, result ) )
-		
+
 		CASE7( 38, 39, 3A, 3B, 3C, 3D, 3F ):{// SRL r
 			uint8_t& reg = R8( data, 0x38 );
 			SRL( reg, reg = result )
 		}
-		
+
 	// BIT
 		{
 			unsigned temp;
@@ -1017,7 +1017,7 @@
 					((masked - 1) >> 8 & (Z40 | P04));
 			goto loop;
 		}
-		
+
 	// SET/RES
 		CASE8( 86, 8E, 96, 9E, A6, AE, B6, BE ): // RES b,(HL)
 		CASE8( C6, CE, D6, DE, E6, EE, F6, FE ):{// SET b,(HL)
@@ -1030,7 +1030,7 @@
 			WRITE( rp.hl, temp );
 			goto loop;
 		}
-		
+
 		CASE7( C0, C1, C2, C3, C4, C5, C7 ): // SET 0,r
 		CASE7( C8, C9, CA, CB, CC, CD, CF ): // SET 1,r
 		CASE7( D0, D1, D2, D3, D4, D5, D7 ): // SET 2,r
@@ -1041,7 +1041,7 @@
 		CASE7( F8, F9, FA, FB, FC, FD, FF ): // SET 7,r
 			R8( data & 7, 0 ) |= 1 << (data >> 3 & 7);
 			goto loop;
-		
+
 		CASE7( 80, 81, 82, 83, 84, 85, 87 ): // RES 0,r
 		CASE7( 88, 89, 8A, 8B, 8C, 8D, 8F ): // RES 1,r
 		CASE7( 90, 91, 92, 93, 94, 95, 97 ): // RES 2,r
@@ -1096,20 +1096,20 @@
 			flags |= Z40;
 			goto loop;
 		}
-		
+
 		CASE8( 40, 48, 50, 58, 60, 68, 70, 78 ):{// IN r,(C)
 			int temp = IN( rp.bc );
 			R8( data >> 3, 8 ) = temp;
 			flags = (flags & C01) | SZ28P( temp );
 			goto loop;
 		}
-		
+
 		case 0x71: // OUT (C),0
 			rg.flags = 0;
 		CASE7( 41, 49, 51, 59, 61, 69, 79 ): // OUT (C),r
 			OUT( rp.bc, R8( data >> 3, 8 ) );
 			goto loop;
-		
+
 		{
 			unsigned temp;
 		case 0x73: // LD (ADDR),SP
@@ -1123,7 +1123,7 @@
 			WRITE_WORD( addr, temp );
 			goto loop;
 		}
-		
+
 		case 0x4B: // LD BC,(ADDR)
 		case 0x5B:{// LD DE,(ADDR)
 			fuint16 addr = GET_ADDR();
@@ -1131,14 +1131,14 @@
 			R16( data, 4, 0x4B ) = READ_WORD( addr );
 			goto loop;
 		}
-		
+
 		case 0x7B:{// LD SP,(ADDR)
 			fuint16 addr = GET_ADDR();
 			pc += 2;
 			sp = READ_WORD( addr );
 			goto loop;
 		}
-		
+
 		case 0x67:{// RRD
 			fuint8 temp = READ( rp.hl );
 			WRITE( rp.hl, (rg.a << 4) | (temp >> 4) );
@@ -1147,7 +1147,7 @@
 			rg.a = temp;
 			goto loop;
 		}
-		
+
 		case 0x6F:{// RLD
 			fuint8 temp = READ( rp.hl );
 			WRITE( rp.hl, (temp << 4) | (rg.a & 0x0F) );
@@ -1156,14 +1156,14 @@
 			rg.a = temp;
 			goto loop;
 		}
-		
+
 		CASE8( 44, 4C, 54, 5C, 64, 6C, 74, 7C ): // NEG
 			opcode = 0x10; // flag to do SBC instead of ADC
 			flags &= ~C01;
 			data = rg.a;
 			rg.a = 0;
 			goto adc_data;
-		
+
 		{
 			int inc;
 		case 0xA9: // CPD
@@ -1176,27 +1176,27 @@
 			fuint16 addr = rp.hl;
 			rp.hl = addr + inc;
 			int temp = READ( addr );
-			
+
 			int result = rg.a - temp;
 			flags = (flags & C01) | N02 |
 					((((temp ^ rg.a) & H10) ^ result) & (S80 | H10));
-			
+
 			if ( !(uint8_t) result ) flags |= Z40;
 			result -= (flags & H10) >> 4;
 			flags |= result & F08;
 			flags |= result << 4 & F20;
 			if ( !--rp.bc )
 				goto loop;
-			
+
 			flags |= V04;
 			if ( flags & Z40 || data < 0xB0 )
 				goto loop;
-			
+
 			pc -= 2;
 			s_time += 5;
 			goto loop;
 		}
-		
+
 		{
 			int inc;
 		case 0xA8: // LDD
@@ -1209,26 +1209,26 @@
 			fuint16 addr = rp.hl;
 			rp.hl = addr + inc;
 			int temp = READ( addr );
-			
+
 			addr = rp.de;
 			rp.de = addr + inc;
 			WRITE( addr, temp );
-			
+
 			temp += rg.a;
 			flags = (flags & (S80 | Z40 | C01)) |
 					(temp & F08) | (temp << 4 & F20);
 			if ( !--rp.bc )
 				goto loop;
-			
+
 			flags |= V04;
 			if ( data < 0xB0 )
 				goto loop;
-			
+
 			pc -= 2;
 			s_time += 5;
 			goto loop;
 		}
-		
+
 		{
 			int inc;
 		case 0xAB: // OUTD
@@ -1241,7 +1241,7 @@
 			fuint16 addr = rp.hl;
 			rp.hl = addr + inc;
 			int temp = READ( addr );
-			
+
 			int b = --rg.b;
 			flags = (temp >> 6 & N02) | SZ28( b );
 			if ( b && data >= 0xB0 )
@@ -1249,11 +1249,11 @@
 				pc -= 2;
 				s_time += 5;
 			}
-			
+
 			OUT( rp.bc, temp );
 			goto loop;
 		}
-		
+
 		{
 			int inc;
 		case 0xAA: // IND
@@ -1263,12 +1263,12 @@
 		case 0xA2: // INI
 		case 0xB2: // INIR
 				inc = +1;
-			
+
 			fuint16 addr = rp.hl;
 			rp.hl = addr + inc;
-			
+
 			int temp = IN( rp.bc );
-			
+
 			int b = --rg.b;
 			flags = (temp >> 6 & N02) | SZ28( b );
 			if ( b && data >= 0xB0 )
@@ -1276,25 +1276,25 @@
 				pc -= 2;
 				s_time += 5;
 			}
-			
+
 			WRITE( addr, temp );
 			goto loop;
 		}
-		
+
 		case 0x47: // LD I,A
 			r.i = rg.a;
 			goto loop;
-		
+
 		case 0x4F: // LD R,A
 			SET_R( rg.a );
 			debug_printf( "LD R,A not supported\n" );
 			warning = true;
 			goto loop;
-		
+
 		case 0x57: // LD A,I
 			rg.a = r.i;
 			goto ld_ai_common;
-		
+
 		case 0x5F: // LD A,R
 			rg.a = GET_R();
 			debug_printf( "LD A,R not supported\n" );
@@ -1302,23 +1302,23 @@
 		ld_ai_common:
 			flags = (flags & C01) | SZ28( rg.a ) | (r.iff2 << 2 & V04);
 			goto loop;
-		
+
 		CASE8( 45, 4D, 55, 5D, 65, 6D, 75, 7D ): // RETI/RETN
 			r.iff1 = r.iff2;
 			goto ret_taken;
-		
+
 		case 0x46: case 0x4E: case 0x66: case 0x6E: // IM 0
 			r.im = 0;
 			goto loop;
-		
+
 		case 0x56: case 0x76: // IM 1
 			r.im = 1;
 			goto loop;
-		
+
 		case 0x5E: case 0x7E: // IM 2
 			r.im = 2;
 			goto loop;
-		
+
 		default:
 			debug_printf( "Opcode $ED $%02X not supported\n", data );
 			warning = true;
@@ -1344,11 +1344,11 @@
 	// TODO: more efficient way of avoid negative address
 	// TODO: avoid using this as argument to READ() since it is evaluated twice
 	#define IXY_DISP( ixy, disp ) uint16_t ((ixy) + (disp))
-	
+
 	#define SET_IXY( in ) if ( opcode == 0xDD ) ix = in; else iy = in;
-	
+
 	// ADD/ADC/SUB/SBC
-	
+
 		case 0x96: // SUB (IXY+disp)
 		case 0x86: // ADD (IXY+disp)
 			flags &= ~C01;
@@ -1358,7 +1358,7 @@
 			opcode = data;
 			data = READ( IXY_DISP( ixy, (int8_t) data2 ) );
 			goto adc_data;
-		
+
 		case 0x94: // SUB HXY
 		case 0x84: // ADD HXY
 			flags &= ~C01;
@@ -1367,7 +1367,7 @@
 			opcode = data;
 			data = ixy >> 8;
 			goto adc_data;
-		
+
 		case 0x95: // SUB LXY
 		case 0x85: // ADD LXY
 			flags &= ~C01;
@@ -1376,17 +1376,17 @@
 			opcode = data;
 			data = (uint8_t) ixy;
 			goto adc_data;
-		
+
 		{
 			unsigned temp;
 		case 0x39: // ADD IXY,SP
 			temp = sp;
 			goto add_ixy_data;
-		
+
 		case 0x29: // ADD IXY,HL
 			temp = ixy;
 			goto add_ixy_data;
-		
+
 		case 0x09: // ADD IXY,BC
 		case 0x19: // ADD IXY,DE
 			temp = R16( data, 4, 0x09 );
@@ -1401,63 +1401,63 @@
 			goto set_ixy;
 		}
 		}
-	
+
 	// AND
 		case 0xA6: // AND (IXY+disp)
 			pc++;
 			data = READ( IXY_DISP( ixy, (int8_t) data2 ) );
 			goto and_data;
-		
+
 		case 0xA4: // AND HXY
 			data = ixy >> 8;
 			goto and_data;
-		
+
 		case 0xA5: // AND LXY
 			data = (uint8_t) ixy;
 			goto and_data;
-	
+
 	// OR
 		case 0xB6: // OR (IXY+disp)
 			pc++;
 			data = READ( IXY_DISP( ixy, (int8_t) data2 ) );
 			goto or_data;
-		
+
 		case 0xB4: // OR HXY
 			data = ixy >> 8;
 			goto or_data;
-		
+
 		case 0xB5: // OR LXY
 			data = (uint8_t) ixy;
 			goto or_data;
-	
+
 	// XOR
 		case 0xAE: // XOR (IXY+disp)
 			pc++;
 			data = READ( IXY_DISP( ixy, (int8_t) data2 ) );
 			goto xor_data;
-		
+
 		case 0xAC: // XOR HXY
 			data = ixy >> 8;
 			goto xor_data;
-		
+
 		case 0xAD: // XOR LXY
 			data = (uint8_t) ixy;
 			goto xor_data;
-	
+
 	// CP
 		case 0xBE: // CP (IXY+disp)
 			pc++;
 			data = READ( IXY_DISP( ixy, (int8_t) data2 ) );
 			goto cp_data;
-		
+
 		case 0xBC: // CP HXY
 			data = ixy >> 8;
 			goto cp_data;
-		
+
 		case 0xBD: // CP LXY
 			data = (uint8_t) ixy;
 			goto cp_data;
-		
+
 	// LD
 		CASE7( 70, 71, 72, 73, 74, 75, 77 ): // LD (IXY+disp),r
 			data = R8( data, 0x70 );
@@ -1471,42 +1471,42 @@
 		CASE5( 44, 4C, 54, 5C, 7C ): // LD r,HXY
 			R8( data >> 3, 8 ) = ixy >> 8;
 			goto loop;
-		
+
 		case 0x64: // LD HXY,HXY
 		case 0x6D: // LD LXY,LXY
 			goto loop;
-		
+
 		CASE5( 45, 4D, 55, 5D, 7D ): // LD r,LXY
 			R8( data >> 3, 8 ) = ixy;
 			goto loop;
-		
+
 		CASE7( 46, 4E, 56, 5E, 66, 6E, 7E ): // LD r,(IXY+disp)
 			pc++;
 			R8( data >> 3, 8 ) = READ( IXY_DISP( ixy, (int8_t) data2 ) );
 			goto loop;
-		
+
 		case 0x26: // LD HXY,imm
 			pc++;
 			goto ld_hxy_data;
-			
+
 		case 0x65: // LD HXY,LXY
 			data2 = (uint8_t) ixy;
 			goto ld_hxy_data;
-		
+
 		CASE5( 60, 61, 62, 63, 67 ): // LD HXY,r
 			data2 = R8( data, 0x60 );
 		ld_hxy_data:
 			ixy = (uint8_t) ixy | (data2 << 8);
 			goto set_ixy;
-		
+
 		case 0x2E: // LD LXY,imm
 			pc++;
 			goto ld_lxy_data;
-			
+
 		case 0x6C: // LD LXY,HXY
 			data2 = ixy >> 8;
 			goto ld_lxy_data;
-		
+
 		CASE5( 68, 69, 6A, 6B, 6F ): // LD LXY,r
 			data2 = R8( data, 0x68 );
 		ld_lxy_data:
@@ -1523,26 +1523,26 @@
 		case 0xF9: // LD SP,IXY
 			sp = ixy;
 			goto loop;
-	
+
 		case 0x22:{// LD (ADDR),IXY
 			fuint16 addr = GET_ADDR();
 			pc += 2;
 			WRITE_WORD( addr, ixy );
 			goto loop;
 		}
-		
+
 		case 0x21: // LD IXY,imm
 			ixy = GET_ADDR();
 			pc += 2;
 			goto set_ixy;
-		
+
 		case 0x2A:{// LD IXY,(addr)
 			fuint16 addr = GET_ADDR();
 			ixy = READ_WORD( addr );
 			pc += 2;
 			goto set_ixy;
 		}
-		
+
 	// DD/FD CB prefix
 		case 0xCB: {
 			data = IXY_DISP( ixy, (int8_t) data2 );
@@ -1559,7 +1559,7 @@
 			case 0x1E: goto rr_data_addr; // RR (IXY)
 			case 0x2E: goto sra_data_addr; // SRA (IXY)
 			case 0x3E: goto srl_data_addr; // SRL (IXY)
-			
+
 			CASE8( 46, 4E, 56, 5E, 66, 6E, 76, 7E ):{// BIT b,(IXY+disp)
 				fuint8 temp = READ( data );
 				int masked = temp & 1 << (data2 >> 3 & 7);
@@ -1568,7 +1568,7 @@
 						((masked - 1) >> 8 & (Z40 | P04));
 				goto loop;
 			}
-			
+
 			CASE8( 86, 8E, 96, 9E, A6, AE, B6, BE ): // RES b,(IXY+disp)
 			CASE8( C6, CE, D6, DE, E6, EE, F6, FE ):{// SET b,(IXY+disp)
 				int temp = READ( data );
@@ -1579,7 +1579,7 @@
 				WRITE( data, temp );
 				goto loop;
 			}
-			
+
 			default:
 				debug_printf( "Opcode $%02X $CB $%02X not supported\n", opcode, data2 );
 				warning = true;
@@ -1587,35 +1587,35 @@
 			}
 			assert( false );
 		}
-		
+
 	// INC/DEC
 		case 0x23: // INC IXY
 			ixy = uint16_t (ixy + 1);
 			goto set_ixy;
-		
+
 		case 0x2B: // DEC IXY
 			ixy = uint16_t (ixy - 1);
 			goto set_ixy;
-		
+
 		case 0x34: // INC (IXY+disp)
 			ixy = IXY_DISP( ixy, (int8_t) data2 );
 			pc++;
 			data = READ( ixy ) + 1;
 			WRITE( ixy, data );
 			goto inc_set_flags;
-		
+
 		case 0x35: // DEC (IXY+disp)
 			ixy = IXY_DISP( ixy, (int8_t) data2 );
 			pc++;
 			data = READ( ixy ) - 1;
 			WRITE( ixy, data );
 			goto dec_set_flags;
-		
+
 		case 0x24: // INC HXY
 			ixy = uint16_t (ixy + 0x100);
 			data = ixy >> 8;
 			goto inc_xy_common;
-		
+
 		case 0x2C: // INC LXY
 			data = uint8_t (ixy + 1);
 			ixy = (ixy & 0xFF00) | data;
@@ -1627,12 +1627,12 @@
 			}
 			iy = ixy;
 			goto inc_set_flags;
-		
+
 		case 0x25: // DEC HXY
 			ixy = uint16_t (ixy - 0x100);
 			data = ixy >> 8;
 			goto dec_xy_common;
-		
+
 		case 0x2D: // DEC LXY
 			data = uint8_t (ixy - 1);
 			ixy = (ixy & 0xFF00) | data;
@@ -1644,31 +1644,31 @@
 			}
 			iy = ixy;
 			goto dec_set_flags;
-		
+
 	// PUSH/POP
 		case 0xE5: // PUSH IXY
 			data = ixy;
 			goto push_data;
-		
+
 		case 0xE1:{// POP IXY
 			ixy = READ_WORD( sp );
 			sp = uint16_t (sp + 2);
 			goto set_ixy;
 		}
-	
+
 	// Misc
-		
+
 		case 0xE9: // JP (IXY)
 			pc = ixy;
 			goto loop;
-		
+
 		case 0xE3:{// EX (SP),IXY
 			fuint16 temp = READ_WORD( sp );
 			WRITE_WORD( sp, ixy );
 			ixy = temp;
 			goto set_ixy;
 		}
-		
+
 		default:
 			debug_printf( "Unnecessary DD/FD prefix encountered\n" );
 			warning = true;
@@ -1677,11 +1677,11 @@
 		}
 		assert( false );
 	}
-	
+
 	}
 	debug_printf( "Unhandled main opcode: $%02X\n", opcode );
 	assert( false );
-	
+
 hit_idle_addr:
 	s_time -= 11;
 	goto out_of_time;
@@ -1689,7 +1689,7 @@
 	s_time &= 3; // increment by multiple of 4
 out_of_time:
 	pc--;
-	
+
 	s.time = s_time;
 	rg.flags = flags;
 	r.ix = ix;
@@ -1699,6 +1699,6 @@
 	this->r.b = rg;
 	this->state_ = s;
 	this->state = &this->state_;
-	
+
 	return warning;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Kss_Cpu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Kss_Cpu.h Changed

@@ -15,41 +15,37 @@
 
 class Kss_Cpu {
 public:
-	typedef BOOST::uint8_t uint8_t;
-	
 	// Clear registers and map all pages to unmapped
 	void reset( void* unmapped_write, void const* unmapped_read );
-	
+
 	// Map memory. Start and size must be multiple of page_size.
 	enum { page_size = 0x2000 };
 	void map_mem( unsigned addr, blargg_ulong size, void* write, void const* read );
-	
+
 	// Map address to page
 	uint8_t* write( unsigned addr );
 	uint8_t const* read( unsigned addr );
-	
+
 	// Run until specified time is reached. Returns true if suspicious/unsupported
 	// instruction was encountered at any point during run.
 	bool run( cpu_time_t end_time );
-	
+
 	// Time of beginning of next instruction
 	cpu_time_t time() const             { return state->time + state->base; }
-	
+
 	// Alter current time. Not supported during run() call.
 	void set_time( cpu_time_t t )       { state->time = t - state->base; }
 	void adjust_time( int delta )       { state->time += delta; }
-	
-	typedef BOOST::uint16_t uint16_t;
-	
+
 	#if BLARGG_BIG_ENDIAN
 		struct regs_t { uint8_t b, c, d, e, h, l, flags, a; };
 	#else
 		struct regs_t { uint8_t c, b, e, d, l, h, a, flags; };
 	#endif
 	BOOST_STATIC_ASSERT( sizeof (regs_t) == 8 );
-	
+
 	struct pairs_t { uint16_t bc, de, hl, fa; };
-	
+
 	// Registers are not updated until run() returns
 	struct registers_t {
 		uint16_t pc;
@@ -71,12 +67,12 @@
 		uint8_t im;
 	};
 	//registers_t r; (below for efficiency)
-	
+
 	enum { idle_addr = 0xFFFF };
-	
+
 	// can read this far past end of a page
 	enum { cpu_padding = 0x100 };
-	
+
 public:
 	Kss_Cpu();
 	enum { page_shift = 13 };
@@ -104,12 +100,12 @@
 	#define KSS_CPU_PAGE_OFFSET( addr ) ((addr) & (page_size - 1))
 #endif
 
-inline BOOST::uint8_t* Kss_Cpu::write( unsigned addr )
+inline uint8_t* Kss_Cpu::write( unsigned addr )
 {
 	return state->write [addr >> page_shift] + KSS_CPU_PAGE_OFFSET( addr );
 }
 
-inline BOOST::uint8_t const* Kss_Cpu::read( unsigned addr )
+inline uint8_t const* Kss_Cpu::read( unsigned addr )
 {
 	return state->read [addr >> page_shift] + KSS_CPU_PAGE_OFFSET( addr );
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Kss_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Kss_Emu.cxx Changed

@@ -31,13 +31,13 @@
 		"Wave 1", "Wave 2", "Wave 3", "Wave 4", "Wave 5"
 	};
 	set_voice_names( names );
-	
+
 	static int const types [osc_count] = {
 		wave_type | 0, wave_type | 1, wave_type | 2,
 		wave_type | 3, wave_type | 4, wave_type | 5, wave_type | 6, wave_type | 7
 	};
 	set_voice_types( types );
-	
+
 	memset( unmapped_read, 0xFF, sizeof unmapped_read );
 }
 
@@ -80,9 +80,9 @@
 struct Kss_File : Gme_Info_
 {
 	Kss_Emu::header_t header_;
-	
+
 	Kss_File() { set_type( gme_kss_type ); }
-	
+
 	blargg_err_t load_( Data_Reader& in )
 	{
 		blargg_err_t err = in.read( &header_, Kss_Emu::header_size );
@@ -90,7 +90,7 @@
 			return (err == in.eof_error ? gme_wrong_file_type : err);
 		return check_kss_header( &header_ );
 	}
-	
+
 	blargg_err_t track_info_( track_info_t* out, int ) const
 	{
 		copy_kss_fields( header_, out );
@@ -124,9 +124,9 @@
 	assert( offsetof (header_t,device_flags) == header_size - 1 );
 	assert( offsetof (ext_header_t,msx_audio_vol) == ext_header_size - 1 );
 	RETURN_ERR( rom.load( in, header_size, STATIC_CAST(header_t*,&header_), 0 ) );
-	
+
 	RETURN_ERR( check_kss_header( header_.tag ) );
-	
+
 	if ( header_.tag [3] == 'C' )
 	{
 		if ( header_.extra_header )
@@ -147,19 +147,19 @@
 		if ( header_.extra_header > 0x10 )
 			set_warning( "Unknown data in header" );
 	}
-	
+
 	if ( header_.device_flags & 0x09 )
 		set_warning( "FM sound not supported" );
-	
+
 	scc_enabled = 0xC000;
 	if ( header_.device_flags & 0x04 )
 		scc_enabled = 0;
-	
+
 	if ( header_.device_flags & 0x02 && !sn )
 		CHECK_ALLOC( sn = BLARGG_NEW( Sms_Apu ) );
-	
+
 	set_voice_count( osc_count );
-	
+
 	return setup_buffer( ::clock_rate );
 }
 
@@ -197,7 +197,7 @@
 
 	memset( ram, 0xC9, 0x4000 );
 	memset( ram + 0x4000, 0, sizeof ram - 0x4000 );
-	
+
 	// copy driver code to lo RAM
 	static byte const bios [] = {
 		0xD3, 0xA0, 0xF5, 0x7B, 0xD3, 0xA1, 0xF1, 0xC9, // $0001: WRTPSG
@@ -209,18 +209,18 @@
 	};
 	memcpy( ram + 0x01, bios, sizeof bios );
 	memcpy( ram + 0x93, vectors, sizeof vectors );
-	
+
 	// copy non-banked data into RAM
-	unsigned load_addr = get_le16( header_.load_addr );
-	long orig_load_size = get_le16( header_.load_size );
+	unsigned load_addr = GET_LE16( header_.load_addr );
+	long orig_load_size = GET_LE16( header_.load_size );
 	long load_size = min( orig_load_size, rom.file_size() );
 	load_size = min( load_size, long (mem_size - load_addr) );
 	if ( load_size != orig_load_size )
 		set_warning( "Excessive data size" );
 	memcpy( ram + load_addr, rom.begin() + header_.extra_header, load_size );
-	
+
 	rom.set_addr( -load_size - header_.extra_header );
-	
+
 	// check available bank data
 	blargg_long const bank_size = this->bank_size();
 	int max_banks = (rom.file_size() - load_size + bank_size - 1) / bank_size;
@@ -233,11 +233,11 @@
 	//debug_printf( "load_size : $%X\n", load_size );
 	//debug_printf( "bank_size : $%X\n", bank_size );
 	//debug_printf( "bank_count: %d (%d claimed)\n", bank_count, header_.bank_mode & 0x7F );
-	
+
 	ram [idle_addr] = 0xFF;
 	cpu::reset( unmapped_write, unmapped_read );
 	cpu::map_mem( 0, mem_size, ram, ram );
-	
+
 	ay.reset();
 	scc.reset();
 	if ( sn )
@@ -246,24 +246,24 @@
 	ram [--r.sp] = idle_addr >> 8;
 	ram [--r.sp] = idle_addr & 0xFF;
 	r.b.a = track;
-	r.pc = get_le16( header_.init_addr );
+	r.pc = GET_LE16( header_.init_addr );
 	next_play = play_period;
 	scc_accessed = false;
 	gain_updated = false;
 	update_gain();
 	ay_latch = 0;
-	
+
 	return 0;
 }
 
 void Kss_Emu::set_bank( int logical, int physical )
 {
 	unsigned const bank_size = this->bank_size();
-	
+
 	unsigned addr = 0x8000;
 	if ( logical && bank_size == 8 * 1024 )
 		addr = 0xA000;
-	
+
 	physical -= header_.first_bank;
 	if ( (unsigned) physical >= (unsigned) bank_count )
 	{
@@ -287,12 +287,12 @@
 	case 0x9000:
 		set_bank( 0, data );
 		return;
-	
+
 	case 0xB000:
 		set_bank( 1, data );
 		return;
 	}
-	
+
 	int scc_addr = (addr & 0xDFFF) ^ 0x9800;
 	if ( scc_addr < scc.reg_count )
 	{
@@ -300,7 +300,7 @@
 		scc.write( time(), scc_addr, data );
 		return;
 	}
-	
+
 	debug_printf( "LD ($%04X),$%02X\n", addr, data );
 }
 
@@ -320,12 +320,12 @@
 	case 0xA0:
 		emu.ay_latch = data & 0x0F;
 		return;
-	
+
 	case 0xA1:
 		GME_APU_HOOK( &emu, emu.ay_latch, data );
 		emu.ay.write( time, emu.ay_latch, data );
 		return;
-	
+
 	case 0x06:
 		if ( emu.sn && (emu.header_.device_flags & 0x04) )
 		{
@@ -333,7 +333,7 @@
 			return;
 		}
 		break;
-	
+
 	case 0x7E:
 	case 0x7F:
 		if ( emu.sn )
@@ -343,11 +343,11 @@
 			return;
 		}
 		break;
-	
+
 	case 0xFE:
 		emu.set_bank( 0, data );
 		return;
-	
+
 	#ifndef NDEBUG
 	case 0xF1: // FM data
 		if ( data )
@@ -357,7 +357,7 @@
 		return;
 	#endif
 	}
-	
+
 	debug_printf( "OUT $%04X,$%02X\n", addr, data );
 }
 
@@ -367,7 +367,7 @@
 	//switch ( addr & 0xFF )
 	//{
 	//}
-	
+
 	debug_printf( "IN $%04X\n", addr );
 	return 0;
 }
@@ -382,7 +382,7 @@
 		cpu::run( min( duration, next_play ) );
 		if ( r.pc == idle_addr )
 			set_time( end );
-		
+
 		if ( time() >= next_play )
 		{
 			next_play += play_period;
@@ -394,15 +394,15 @@
 					if ( scc_accessed )
 						update_gain();
 				}
-				
+
 				ram [--r.sp] = idle_addr >> 8;
 				ram [--r.sp] = idle_addr & 0xFF;
-				r.pc = get_le16( header_.play_addr );
+				r.pc = GET_LE16( header_.play_addr );
 				GME_FRAME_HOOK( this );
 			}
 		}
 	}
-	
+
 	duration = time();
 	next_play -= duration;
 	check( next_play >= 0 );
@@ -411,6 +411,6 @@
 	scc.end_frame( duration );
 	if ( sn )
 		sn->end_frame( duration );
-	
+
 	return 0;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Kss_Emu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Kss_Emu.h Changed

@@ -27,7 +27,7 @@
 		byte extra_header;
 		byte device_flags;
 	};
-	
+
 	enum { ext_header_size = 0x10 };
 	struct ext_header_t
 	{
@@ -40,12 +40,12 @@
 		byte msx_music_vol;
 		byte msx_audio_vol;
 	};
-	
+
 	struct composite_header_t : header_t, ext_header_t { };
-	
+
 	// Header for currently loaded file
 	composite_header_t const& header() const { return header_; }
-	
+
 	static gme_type_t static_type() { return gme_kss_type; }
 public:
 	Kss_Emu();
@@ -62,30 +62,30 @@
 private:
 	Rom_Data<page_size> rom;
 	composite_header_t header_;
-	
+
 	bool scc_accessed;
 	bool gain_updated;
 	void update_gain();
-	
+
 	unsigned scc_enabled; // 0 or 0xC000
 	byte const* bank_data;
 	int bank_count;
 	void set_bank( int logical, int physical );
 	blargg_long bank_size() const { return (16 * 1024L) >> (header_.bank_mode >> 7 & 1); }
-	
+
 	blip_time_t play_period;
 	blip_time_t next_play;
 	int ay_latch;
-	
+
 	friend void kss_cpu_out( class Kss_Cpu*, cpu_time_t, unsigned addr, int data );
 	friend int kss_cpu_in( class Kss_Cpu*, cpu_time_t, unsigned addr );
 	void cpu_write( unsigned addr, int data );
 	friend void kss_cpu_write( class Kss_Cpu*, unsigned addr, int data );
-	
+
 	// large items
 	enum { mem_size = 0x10000 };
 	byte ram [mem_size + cpu_padding];
-	
+
 	Ay_Apu ay;
 	Scc_Apu scc;
 	Sms_Apu* sn;

audacious-plugins-3.3.4.tar.bz2/src/console/Kss_Scc_Apu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Kss_Scc_Apu.cxx Changed

@@ -26,12 +26,12 @@
 	for ( int index = 0; index < osc_count; index++ )
 	{
 		osc_t& osc = oscs [index];
-		
+
 		Blip_Buffer* const output = osc.output;
 		if ( !output )
 			continue;
 		output->set_modified();
-		
+
 		blip_time_t period = (regs [0x80 + index * 2 + 1] & 0x0F) * 0x100 +
 				regs [0x80 + index * 2] + 1;
 		int volume = 0;
@@ -42,8 +42,8 @@
 			if ( period > inaudible_period )
 				volume = (regs [0x8A + index] & 0x0F) * (amp_range / 256 / 15);
 		}
-		
-		BOOST::int8_t const* wave = (BOOST::int8_t*) regs + index * wave_size;
+
+		int8_t const* wave = (int8_t*) regs + index * wave_size;
 		if ( index == osc_count - 1 )
 			wave -= wave_size; // last two oscs share wave
 		{
@@ -55,7 +55,7 @@
 				synth.offset( last_time, delta, output );
 			}
 		}
-		
+
 		blip_time_t time = last_time + osc.delay;
 		if ( time < end_time )
 		{
@@ -68,11 +68,11 @@
 			}
 			else
 			{
-				
+
 				int phase = osc.phase;
 				int last_wave = wave [phase];
 				phase = (phase + 1) & (wave_size - 1); // pre-advance for optimal inner loop
-				
+
 				do
 				{
 					int amp = wave [phase];
@@ -86,7 +86,7 @@
 					time += period;
 				}
 				while ( time < end_time );
-				
+
 				osc.phase = phase = (phase - 1) & (wave_size - 1); // undo pre-advance
 				osc.last_amp = wave [phase] * volume;
 			}

audacious-plugins-3.3.4.tar.bz2/src/console/Kss_Scc_Apu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Kss_Scc_Apu.h Changed

@@ -12,32 +12,32 @@
 public:
 	// Set buffer to generate all sound into, or disable sound if NULL
 	void output( Blip_Buffer* );
-	
+
 	// Reset sound chip
 	void reset();
-	
+
 	// Write to register at specified time
 	enum { reg_count = 0x90 };
 	void write( blip_time_t time, int reg, int data );
-	
+
 	// Run sound to specified time, end current time frame, then start a new
 	// time frame at time 0. Time frames have no effect on emulation and each
 	// can be whatever length is convenient.
 	void end_frame( blip_time_t length );
 
 // Additional features
-	
+
 	// Set sound output of specific oscillator to buffer, where index is
 	// 0 to 4. If buffer is NULL, the specified oscillator is muted.
 	enum { osc_count = 5 };
 	void osc_output( int index, Blip_Buffer* );
-	
+
 	// Set overall volume (default is 1.0)
 	void volume( double );
-	
+
 	// Set treble equalization (see documentation)
 	void treble_eq( blip_eq_t const& );
-	
+
 public:
 	Scc_Apu();
 private:
@@ -53,7 +53,7 @@
 	blip_time_t last_time;
 	unsigned char regs [reg_count];
 	Blip_Synth<blip_med_quality,1> synth;
-	
+
 	void run_until( blip_time_t );
 };
 
@@ -96,10 +96,10 @@
 inline void Scc_Apu::reset()
 {
 	last_time = 0;
-	
+
 	for ( int i = 0; i < osc_count; i++ )
 		memset( &oscs [i], 0, offsetof (osc_t,output) );
-	
+
 	memset( regs, 0, sizeof regs );
 }

audacious-plugins-3.3.4.tar.bz2/src/console/M3u_Playlist.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/M3u_Playlist.cxx Changed

@@ -23,12 +23,12 @@
 blargg_err_t Gme_File::load_m3u_( blargg_err_t err )
 {
 	require( raw_track_count_ ); // file must be loaded first
-	
+
 	if ( !err )
 	{
 		if ( playlist.size() )
 			track_count_ = playlist.size();
-		
+
 		int line = playlist.first_error();
 		if ( line )
 		{
@@ -38,7 +38,7 @@
 			do {
 				*--out = line % 10 + '0';
 			} while ( (line /= 10) > 0 );
-			
+
 			static const char str [] = "Problem in m3u at line ";
 			out -= sizeof str - 1;
 			memcpy( out, str, sizeof str - 1 );
@@ -81,7 +81,7 @@
 		int c = *in;
 		if ( !c ) break;
 		in++;
-		
+
 		if ( c == ',' ) // commas in filename
 		{
 			char* p = skip_white( in );
@@ -91,7 +91,7 @@
 				break;
 			}
 		}
-		
+
 		if ( c == ':' && in [0] == ':' && in [1] && in [2] != ',' ) // ::type suffix
 		{
 			entry.type = ++in;
@@ -104,7 +104,7 @@
 			}
 			break;
 		}
-		
+
 		if ( c == '\\' ) // \ prefix for special characters
 		{
 			c = *in;
@@ -122,16 +122,16 @@
 	while ( 1 )
 	{
 		in = skip_white( in );
-		
+
 		if ( !*in )
 			break;
-		
+
 		if ( *in == ',' )
 		{
 			in++;
 			break;
 		}
-		
+
 		*result = 1;
 		in++;
 	}
@@ -224,7 +224,7 @@
 		int c = *in;
 		if ( !c ) break;
 		in++;
-		
+
 		if ( c == ',' ) // commas in string
 		{
 			char* p = skip_white( in );
@@ -234,7 +234,7 @@
 				break;
 			}
 		}
-		
+
 		if ( c == '\\' ) // \ prefix for special characters
 		{
 			c = *in;
@@ -250,25 +250,25 @@
 static int parse_line( char* in, M3u_Playlist::entry_t& entry )
 {
 	int result = 0;
-	
+
 	// file
 	entry.file = in;
 	entry.type = "";
 	in = parse_filename( in, entry );
-	
+
 	// track
 	entry.track = -1;
 	entry.decimal_track = 0;
 	in = parse_track( in, entry, &result );
-	
+
 	// name
 	entry.name = in;
 	in = parse_name( in );
-	
+
 	// time
 	entry.length = -1;
 	in = parse_time( in, &entry.length, &result );
-	
+
 	// loop
 	entry.intro = -1;
 	entry.loop = -1;
@@ -283,7 +283,7 @@
 		if ( entry.loop >= 0 )
 		{
 			entry.intro = 0;
-			if ( *in == '-' ) // trailing '-' means that intro length was specified 
+			if ( *in == '-' ) // trailing '-' means that intro length was specified
 			{
 				in++;
 				entry.intro = entry.loop;
@@ -292,15 +292,15 @@
 		}
 	}
 	in = next_field( in, &result );
-	
+
 	// fade
 	entry.fade = -1;
 	in = parse_time( in, &entry.fade, &result );
-	
+
 	// repeat
 	entry.repeat = -1;
 	in = parse_int( in, &entry.repeat, &result );
-	
+
 	return result;
 }
 
@@ -310,7 +310,7 @@
 	const char* field = in;
 	while ( *in && *in != ':' )
 		in++;
-	
+
 	if ( *in == ':' )
 	{
 		const char* text = skip_white( in + 1 );
@@ -328,7 +328,7 @@
 			*in = ':';
 		}
 	}
-	
+
 	if ( first )
 		info.title = field;
 }
@@ -340,12 +340,12 @@
 	info_.engineer = "";
 	info_.ripping = "";
 	info_.tagging = "";
-	
+
 	int const CR = 13;
 	int const LF = 10;
-	
+
 	data.end() [-1] = LF; // terminate input
-	
+
 	first_error_ = 0;
 	bool first_comment = true;
 	int line = 0;
@@ -365,7 +365,7 @@
 		if ( in [0] == CR && in [1] == LF ) // treat CR,LF as a single line
 			*in++ = 0;
 		*in++ = 0;
-		
+
 		// parse line
 		if ( *begin == '#' )
 		{
@@ -376,7 +376,7 @@
 		{
 			if ( (int) entries.size() <= count )
 				RETURN_ERR( entries.resize( count * 2 + 64 ) );
-			
+
 			if ( !parse_line( begin, entries [count] ) )
 				count++;
 			else if ( !first_error_ )
@@ -386,10 +386,10 @@
 	}
 	if ( count <= 0 )
 		return "Not an m3u playlist";
-	
+
 	if ( !(info_.composer [0] | info_.engineer [0] | info_.ripping [0] | info_.tagging [0]) )
 		info_.title = "";
-	
+
 	return entries.resize( count );
 }

audacious-plugins-3.3.4.tar.bz2/src/console/M3u_Playlist.h -> audacious-plugins-3.4.2.tar.bz2/src/console/M3u_Playlist.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Multi_Buffer.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Multi_Buffer.cxx Changed

@@ -107,7 +107,7 @@
 {
 	require( !(count & 1) ); // count must be even
 	count = (unsigned) count / 2;
-	
+
 	long avail = bufs [0].samples_avail();
 	if ( count > avail )
 		count = avail;
@@ -136,7 +136,7 @@
 			bufs [1].remove_samples( count );
 			bufs [2].remove_samples( count );
 		}
-		
+
 		// to do: this might miss opportunities for optimization
 		if ( !bufs [0].samples_avail() )
 		{
@@ -144,7 +144,7 @@
 			stereo_added = 0;
 		}
 	}
-	
+
 	return count * 2;
 }
 
@@ -155,27 +155,27 @@
 	BLIP_READER_BEGIN( left, bufs [1] );
 	BLIP_READER_BEGIN( right, bufs [2] );
 	BLIP_READER_BEGIN( center, bufs [0] );
-	
+
 	for ( ; count; --count )
 	{
 		int c = BLIP_READER_READ( center );
 		blargg_long l = c + BLIP_READER_READ( left );
 		blargg_long r = c + BLIP_READER_READ( right );
-		if ( (BOOST::int16_t) l != l )
+		if ( (int16_t) l != l )
 			l = 0x7FFF - (l >> 24);
-		
+
 		BLIP_READER_NEXT( center, bass );
-		if ( (BOOST::int16_t) r != r )
+		if ( (int16_t) r != r )
 			r = 0x7FFF - (r >> 24);
-		
+
 		BLIP_READER_NEXT( left, bass );
 		BLIP_READER_NEXT( right, bass );
-		
+
 		out [0] = l;
 		out [1] = r;
 		out += 2;
 	}
-	
+
 	BLIP_READER_END( center, bufs [0] );
 	BLIP_READER_END( right, bufs [2] );
 	BLIP_READER_END( left, bufs [1] );
@@ -187,25 +187,25 @@
 	int const bass = BLIP_READER_BASS( bufs [1] );
 	BLIP_READER_BEGIN( left, bufs [1] );
 	BLIP_READER_BEGIN( right, bufs [2] );
-	
+
 	for ( ; count; --count )
 	{
 		blargg_long l = BLIP_READER_READ( left );
-		if ( (BOOST::int16_t) l != l )
+		if ( (int16_t) l != l )
 			l = 0x7FFF - (l >> 24);
-		
+
 		blargg_long r = BLIP_READER_READ( right );
-		if ( (BOOST::int16_t) r != r )
+		if ( (int16_t) r != r )
 			r = 0x7FFF - (r >> 24);
-		
+
 		BLIP_READER_NEXT( left, bass );
 		BLIP_READER_NEXT( right, bass );
-		
+
 		out [0] = l;
 		out [1] = r;
 		out += 2;
 	}
-	
+
 	BLIP_READER_END( right, bufs [2] );
 	BLIP_READER_END( left, bufs [1] );
 }
@@ -215,18 +215,18 @@
 	blip_sample_t* BLIP_RESTRICT out = out_;
 	int const bass = BLIP_READER_BASS( bufs [0] );
 	BLIP_READER_BEGIN( center, bufs [0] );
-	
+
 	for ( ; count; --count )
 	{
 		blargg_long s = BLIP_READER_READ( center );
-		if ( (BOOST::int16_t) s != s )
+		if ( (int16_t) s != s )
 			s = 0x7FFF - (s >> 24);
-		
+
 		BLIP_READER_NEXT( center, bass );
 		out [0] = s;
 		out [1] = s;
 		out += 2;
 	}
-	
+
 	BLIP_READER_END( center, bufs [0] );
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Multi_Buffer.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Multi_Buffer.h Changed

@@ -13,10 +13,10 @@
 public:
 	Multi_Buffer( int samples_per_frame );
 	virtual ~Multi_Buffer() { }
-	
+
 	// Set the number of channels available
 	virtual blargg_err_t set_channel_count( int );
-	
+
 	// Get indexed channel, from 0 to channel count - 1
 	struct channel_t {
 		Blip_Buffer* center;
@@ -26,40 +26,38 @@
 	enum { type_index_mask = 0xFF };
 	enum { wave_type = 0x100, noise_type = 0x200, mixed_type = wave_type | noise_type };
 	virtual channel_t channel( int index, int type ) = 0;
-	
+
 	// See Blip_Buffer.h
 	virtual blargg_err_t set_sample_rate( long rate, int msec = blip_default_length ) = 0;
 	virtual void clock_rate( long ) = 0;
 	virtual void bass_freq( int ) = 0;
 	virtual void clear() = 0;
 	long sample_rate() const;
-	
+
 	// Length of buffer, in milliseconds
 	int length() const;
-	
+
 	// See Blip_Buffer.h
 	virtual void end_frame( blip_time_t ) = 0;
-	
+
 	// Number of samples per output frame (1 = mono, 2 = stereo)
 	int samples_per_frame() const;
-	
+
 	// Count of changes to channel configuration. Incremented whenever
 	// a change is made to any of the Blip_Buffers for any channel.
 	unsigned channels_changed_count() { return channels_changed_count_; }
-	
+
 	// See Blip_Buffer.h
 	virtual long read_samples( blip_sample_t*, long ) = 0;
 	virtual long samples_avail() const = 0;
-	
-public:
-	BLARGG_DISABLE_NOTHROW
+
 protected:
 	void channels_changed() { channels_changed_count_++; }
 private:
 	// noncopyable
 	Multi_Buffer( const Multi_Buffer& );
 	Multi_Buffer& operator = ( const Multi_Buffer& );
-	
+
 	unsigned channels_changed_count_;
 	long sample_rate_;
 	int length_;
@@ -73,7 +71,7 @@
 public:
 	// Buffer used for all channels
 	Blip_Buffer* center() { return &buf; }
-	
+
 public:
 	Mono_Buffer();
 	~Mono_Buffer();
@@ -90,12 +88,12 @@
 // Uses three buffers (one for center) and outputs stereo sample pairs.
 class Stereo_Buffer : public Multi_Buffer {
 public:
-	
+
 	// Buffers used for all channels
 	Blip_Buffer* center()       { return &bufs [0]; }
 	Blip_Buffer* left()         { return &bufs [1]; }
 	Blip_Buffer* right()        { return &bufs [2]; }
-	
+
 public:
 	Stereo_Buffer();
 	~Stereo_Buffer();
@@ -105,17 +103,17 @@
 	void clear();
 	channel_t channel( int, int ) { return chan; }
 	void end_frame( blip_time_t );
-	
+
 	long samples_avail() const { return bufs [0].samples_avail() * 2; }
 	long read_samples( blip_sample_t*, long );
-	
+
 private:
 	enum { buf_count = 3 };
 	Blip_Buffer bufs [buf_count];
 	channel_t chan;
 	int stereo_added;
 	int was_stereo;
-	
+
 	void mix_stereo_no_center( blip_sample_t*, blargg_long );
 	void mix_stereo( blip_sample_t*, blargg_long );
 	void mix_mono( blip_sample_t*, blargg_long );

audacious-plugins-3.3.4.tar.bz2/src/console/Music_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Music_Emu.cxx Changed

@@ -51,19 +51,19 @@
 Music_Emu::Music_Emu()
 {
 	effects_buffer = 0;
-	
+
 	sample_rate_ = 0;
 	mute_mask_ = 0;
 	tempo_ = 1.0;
 	gain_ = 1.0;
-	
+
 	// defaults
 	max_initial_silence = 2;
 	silence_lookahead = 3;
 	ignore_silence_ = false;
 	equalizer_.treble = -1.0;
 	equalizer_.bass = 60;
-	
+
 	static const char* const names [] = {
 		"Voice 1", "Voice 2", "Voice 3", "Voice 4",
 		"Voice 5", "Voice 6", "Voice 7", "Voice 8"
@@ -132,15 +132,15 @@
 blargg_err_t Music_Emu::start_track( int track )
 {
 	clear_track_vars();
-	
+
 	int remapped = track;
 	RETURN_ERR( remap_track_( &remapped ) );
 	current_track_ = track;
 	RETURN_ERR( start_track_( remapped ) );
-	
+
 	emu_track_ended_ = false;
 	track_ended_ = false;
-	
+
 	if ( !ignore_silence_ )
 	{
 		// play until non-silence or end of track
@@ -150,7 +150,7 @@
 			if ( buf_remain | (int) emu_track_ended_ )
 				break;
 		}
-		
+
 		emu_time = buf_remain;
 		out_time = 0;
 		silence_time = 0;
@@ -196,27 +196,27 @@
 {
 	require( current_track() >= 0 ); // start_track() must have been called already
 	out_time += count;
-	
+
 	// remove from silence and buf first
 	{
 		long n = min( count, silence_count );
 		silence_count -= n;
 		count -= n;
-		
+
 		n = min( count, buf_remain );
 		buf_remain -= n;
 		count -= n;
 	}
-		
+
 	if ( count && !emu_track_ended_ )
 	{
 		emu_time += count;
 		end_track_if_error( skip_( count ) );
 	}
-	
+
 	if ( !(silence_count | buf_remain) ) // caught up to emulator, so update track ended
 		track_ended_ |= emu_track_ended_;
-	
+
 	return 0;
 }
 
@@ -228,16 +228,16 @@
 	{
 		int saved_mute = mute_mask_;
 		mute_voices( ~0 );
-		
+
 		while ( count > threshold / 2 && !emu_track_ended_ )
 		{
 			RETURN_ERR( play_( buf_size, buf.begin() ) );
 			count -= buf_size;
 		}
-		
+
 		mute_voices( saved_mute );
 	}
-	
+
 	while ( count && !emu_track_ended_ )
 	{
 		long n = buf_size;
@@ -275,7 +275,7 @@
 				fade_step, unit );
 		if ( gain < (unit >> fade_shift) )
 			track_ended_ = emu_track_ended_ = true;
-		
+
 		sample_t* io = &out [i];
 		for ( int count = min( fade_block_size, out_count - i ); count; --count )
 		{
@@ -336,12 +336,12 @@
 	{
 		require( current_track() >= 0 );
 		require( out_count % stereo == 0 );
-		
+
 		assert( emu_time >= out_time );
-		
+
 		// prints nifty graph of how far ahead we are when searching for silence
 		//debug_printf( "%*s \n", int ((emu_time - out_time) * 7 / sample_rate()), "*" );
-		
+
 		long pos = 0;
 		if ( silence_count )
 		{
@@ -349,12 +349,12 @@
 			long ahead_time = silence_lookahead * (out_time + out_count - silence_time) + silence_time;
 			while ( emu_time < ahead_time && !(buf_remain | emu_track_ended_) )
 				fill_buf();
-			
+
 			// fill with silence
 			pos = min( silence_count, out_count );
 			memset( out, 0, pos * sizeof *out );
 			silence_count -= pos;
-			
+
 			if ( emu_time - silence_time > silence_max * stereo * sample_rate() )
 			{
 				track_ended_ = emu_track_ended_ = true;
@@ -362,7 +362,7 @@
 				buf_remain = 0;
 			}
 		}
-		
+
 		if ( buf_remain )
 		{
 			// empty silence buf
@@ -371,26 +371,26 @@
 			buf_remain -= n;
 			pos += n;
 		}
-		
+
 		// generate remaining samples normally
 		long remain = out_count - pos;
 		if ( remain )
 		{
 			emu_play( remain, out + pos );
 			track_ended_ |= emu_track_ended_;
-			
+
 			if ( !ignore_silence_ || out_time > fade_start )
 			{
 				// check end for a new run of silence
 				long silence = count_silence( out + pos, remain );
 				if ( silence < remain )
 					silence_time = emu_time - silence;
-				
+
 				if ( emu_time - silence_time >= buf_size )
 					fill_buf(); // cause silence detection on next play()
 			}
 		}
-		
+
 		if ( out_time > fade_start )
 			handle_fade( out_count, out );
 	}

audacious-plugins-3.3.4.tar.bz2/src/console/Nes_Apu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Nes_Apu.cxx Changed

@@ -25,13 +25,13 @@
 	dmc.apu = this;
 	dmc.prg_reader = NULL;
 	irq_notifier_ = NULL;
-	
+
 	oscs [0] = &square1;
 	oscs [1] = &square2;
 	oscs [2] = &triangle;
 	oscs [3] = &noise;
 	oscs [4] = &dmc;
-	
+
 	output( NULL );
 	volume( 1.0 );
 	reset( false );
@@ -49,12 +49,12 @@
 {
 	dmc.nonlinear = true;
 	square_synth.volume( 1.3 * 0.25751258 / 0.742467605 * 0.25 / amp_range * v );
-	
+
 	const double tnd = 0.48 / 202 * nonlinear_tnd_gain();
 	triangle.synth.volume( 3.0 * tnd );
 	noise.synth.volume( 2.0 * tnd );
 	dmc.synth.volume( tnd );
-	
+
 	square1 .last_amp = 0;
 	square2 .last_amp = 0;
 	triangle.last_amp = 0;
@@ -89,13 +89,13 @@
 {
 	dmc.pal_mode = pal_mode;
 	set_tempo( tempo_ );
-	
+
 	square1.reset();
 	square2.reset();
 	triangle.reset();
 	noise.reset();
 	dmc.reset();
-	
+
 	last_time = 0;
 	last_dmc_time = 0;
 	osc_enables = 0;
@@ -104,10 +104,10 @@
 	frame_delay = 1;
 	write_register( 0, 0x4017, 0x00 );
 	write_register( 0, 0x4015, 0x00 );
-	
+
 	for ( nes_addr_t addr = start_addr; addr <= 0x4013; addr++ )
 		write_register( 0, addr, (addr & 3) ? 0x00 : 0x10 );
-	
+
 	dmc.dac = initial_dmc_dac;
 	if ( !dmc.nonlinear )
 		triangle.last_amp = 15;
@@ -124,7 +124,7 @@
 	else if ( new_irq > next_irq ) {
 		new_irq = next_irq;
 	}
-	
+
 	if ( new_irq != earliest_irq_ ) {
 		earliest_irq_ = new_irq;
 		if ( irq_notifier_ )
@@ -148,17 +148,17 @@
 void Nes_Apu::run_until_( nes_time_t end_time )
 {
 	require( end_time >= last_time );
-	
+
 	if ( end_time == last_time )
 		return;
-	
+
 	if ( last_dmc_time < end_time )
 	{
 		nes_time_t start = last_dmc_time;
 		last_dmc_time = end_time;
 		dmc.run( start, end_time );
 	}
-	
+
 	while ( true )
 	{
 		// earlier of next frame time or end time
@@ -166,17 +166,17 @@
 		if ( time > end_time )
 			time = end_time;
 		frame_delay -= time - last_time;
-		
+
 		// run oscs to present
 		square1.run( last_time, time );
 		square2.run( last_time, time );
 		triangle.run( last_time, time );
 		noise.run( last_time, time );
 		last_time = time;
-		
+
 		if ( time == end_time )
 			break; // no more frames to run
-		
+
 		// take frame-specific actions
 		frame_delay = frame_period;
 		switch ( frame++ )
@@ -193,30 +193,30 @@
 				square2.clock_length( 0x20 );
 				noise.clock_length( 0x20 );
 				triangle.clock_length( 0x80 ); // different bit for halt flag on triangle
-				
+
 				square1.clock_sweep( -1 );
 				square2.clock_sweep( 0 );
-				
+
 				// frame 2 is slightly shorter in mode 1
 				if ( dmc.pal_mode && frame == 3 )
 					frame_delay -= 2;
 		 		break;
-		 	
+
 			case 1:
 				// frame 1 is slightly shorter in mode 0
 				if ( !dmc.pal_mode )
 					frame_delay -= 2;
 				break;
-			
+
 		 	case 3:
 		 		frame = 0;
-		 		
+
 		 		// frame 3 is almost twice as long in mode 1
 		 		if ( frame_mode & 0x80 )
 					frame_delay += frame_period - (dmc.pal_mode ? 2 : 6);
 				break;
 		}
-		
+
 		// clock envelopes and linear counter every frame
 		triangle.clock_linear_counter();
 		square1.clock_envelope();
@@ -239,7 +239,7 @@
 {
 	if ( end_time > last_time )
 		run_until_( end_time );
-	
+
 	if ( dmc.nonlinear )
 	{
 		zero_apu_osc( &square1, last_time );
@@ -248,14 +248,14 @@
 		zero_apu_osc( &noise, last_time );
 		zero_apu_osc( &dmc, last_time );
 	}
-	
+
 	// make times relative to new frame
 	last_time -= end_time;
 	require( last_time >= 0 );
-	
+
 	last_dmc_time -= end_time;
 	require( last_dmc_time >= 0 );
-	
+
 	if ( next_irq != no_irq ) {
 		next_irq -= end_time;
 		check( next_irq >= 0 );
@@ -275,7 +275,7 @@
 
 static const unsigned char length_table [0x20] = {
 	0x0A, 0xFE, 0x14, 0x02, 0x28, 0x04, 0x50, 0x06,
-	0xA0, 0x08, 0x3C, 0x0A, 0x0E, 0x0C, 0x1A, 0x0E, 
+	0xA0, 0x08, 0x3C, 0x0A, 0x0E, 0x0C, 0x1A, 0x0E,
 	0x0C, 0x10, 0x18, 0x12, 0x30, 0x14, 0x60, 0x16,
 	0xC0, 0x18, 0x48, 0x1A, 0x10, 0x1C, 0x20, 0x1E
 };
@@ -284,23 +284,23 @@
 {
 	require( addr > 0x20 ); // addr must be actual address (i.e. 0x40xx)
 	require( (unsigned) data <= 0xFF );
-	
+
 	// Ignore addresses outside range
 	if ( unsigned (addr - start_addr) > end_addr - start_addr )
 		return;
-	
+
 	run_until_( time );
-	
+
 	if ( addr < 0x4014 )
 	{
 		// Write to channel
 		int osc_index = (addr - start_addr) >> 2;
 		Nes_Osc* osc = oscs [osc_index];
-		
+
 		int reg = addr & 3;
 		osc->regs [reg] = data;
 		osc->reg_written [reg] = true;
-		
+
 		if ( osc_index == 4 )
 		{
 			// handle DMC specially
@@ -311,7 +311,7 @@
 			// load length counter
 			if ( (osc_enables >> osc_index) & 1 )
 				osc->length_counter = length_table [(data >> 3) & 0x1F];
-			
+
 			// reset square phase
 			if ( osc_index < 2 )
 				((Nes_Square*) osc)->phase = Nes_Square::phase_range - 1;
@@ -323,10 +323,10 @@
 		for ( int i = osc_count; i--; )
 			if ( !((data >> i) & 1) )
 				oscs [i]->length_counter = 0;
-		
+
 		bool recalc_irq = dmc.irq_flag;
 		dmc.irq_flag = false;
-		
+
 		int old_enables = osc_enables;
 		osc_enables = data;
 		if ( !(data & 0x10) ) {
@@ -336,7 +336,7 @@
 		else if ( !(old_enables & 0x10) ) {
 			dmc.start(); // dmc just enabled
 		}
-		
+
 		if ( recalc_irq )
 			irq_changed();
 	}
@@ -344,15 +344,15 @@
 	{
 		// Frame mode
 		frame_mode = data;
-		
+
 		bool irq_enabled = !(data & 0x40);
 		irq_flag &= irq_enabled;
 		next_irq = no_irq;
-		
+
 		// mode 1
 		frame_delay = (frame_delay & 1);
 		frame = 0;
-		
+
 		if ( !(data & 0x80) )
 		{
 			// mode 0
@@ -361,7 +361,7 @@
 			if ( irq_enabled )
 				next_irq = time + frame_delay + frame_period * 3 + 1;
 		}
-		
+
 		irq_changed();
 	}
 }
@@ -369,23 +369,23 @@
 int Nes_Apu::read_status( nes_time_t time )
 {
 	run_until_( time - 1 );
-	
+
 	int result = (dmc.irq_flag << 7) | (irq_flag << 6);
-	
+
 	for ( int i = 0; i < osc_count; i++ )
 		if ( oscs [i]->length_counter )
 			result |= 1 << i;
-	
+
 	run_until_( time );
-	
+
 	if ( irq_flag )
 	{
 		result |= 0x40;
 		irq_flag = false;
 		irq_changed();
 	}
-	
+
 	//debug_printf( "%6d/%d Read $4015->$%02X\n", frame_delay, frame, result );
-	
+
 	return result;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Nes_Apu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Nes_Apu.h Changed

@@ -18,30 +18,30 @@
 public:
 	// Set buffer to generate all sound into, or disable sound if NULL
 	void output( Blip_Buffer* );
-	
+
 	// Set memory reader callback used by DMC oscillator to fetch samples.
 	// When callback is invoked, 'user_data' is passed unchanged as the
 	// first parameter.
 	void dmc_reader( int (*callback)( void* user_data, nes_addr_t ), void* user_data = NULL );
-	
+
 	// All time values are the number of CPU clock cycles relative to the
 	// beginning of the current time frame. Before resetting the CPU clock
 	// count, call end_frame( last_cpu_time ).
-	
+
 	// Write to register (0x4000-0x4017, except 0x4014 and 0x4016)
 	enum { start_addr = 0x4000 };
 	enum { end_addr   = 0x4017 };
 	void write_register( nes_time_t, nes_addr_t, int data );
-	
+
 	// Read from status register at 0x4015
 	enum { status_addr = 0x4015 };
 	int read_status( nes_time_t );
-	
+
 	// Run all oscillators up to specified time, end current time frame, then
 	// start a new time frame at time 0. Time frames have no effect on emulation
 	// and each can be whatever length is convenient.
 	void end_frame( nes_time_t );
-	
+
 // Additional optional features (can be ignored without any problem)
 
 	// Reset internal frame counter, registers, and all oscillators.
@@ -49,72 +49,71 @@
 	// Set the DMC oscillator's initial DAC value to initial_dmc_dac without
 	// any audible click.
 	void reset( bool pal_mode = false, int initial_dmc_dac = 0 );
-	
+
 	// Adjust frame period
 	void set_tempo( double );
-	
+
 	// Save/load exact emulation state
 	void save_state( apu_state_t* out ) const;
 	void load_state( apu_state_t const& );
-	
+
 	// Set overall volume (default is 1.0)
 	void volume( double );
-	
+
 	// Set treble equalization (see notes.txt)
 	void treble_eq( const blip_eq_t& );
-	
+
 	// Set sound output of specific oscillator to buffer. If buffer is NULL,
 	// the specified oscillator is muted and emulation accuracy is reduced.
 	// The oscillators are indexed as follows: 0) Square 1, 1) Square 2,
 	// 2) Triangle, 3) Noise, 4) DMC.
 	enum { osc_count = 5 };
 	void osc_output( int index, Blip_Buffer* buffer );
-	
+
 	// Set IRQ time callback that is invoked when the time of earliest IRQ
 	// may have changed, or NULL to disable. When callback is invoked,
 	// 'user_data' is passed unchanged as the first parameter.
 	void irq_notifier( void (*callback)( void* user_data ), void* user_data = NULL );
-	
+
 	// Get time that APU-generated IRQ will occur if no further register reads
 	// or writes occur. If IRQ is already pending, returns irq_waiting. If no
 	// IRQ will occur, returns no_irq.
 	enum { no_irq = INT_MAX / 2 + 1 };
 	enum { irq_waiting = 0 };
 	nes_time_t earliest_irq( nes_time_t ) const;
-	
+
 	// Count number of DMC reads that would occur if 'run_until( t )' were executed.
 	// If last_read is not NULL, set *last_read to the earliest time that
 	// 'count_dmc_reads( time )' would result in the same result.
 	int count_dmc_reads( nes_time_t t, nes_time_t* last_read = NULL ) const;
-	
+
 	// Time when next DMC memory read will occur
 	nes_time_t next_dmc_read_time() const;
-	
+
 	// Run DMC until specified time, so that any DMC memory reads can be
 	// accounted for (i.e. inserting CPU wait states).
 	void run_until( nes_time_t );
-	
-public:
+
 	Nes_Apu();
-	BLARGG_DISABLE_NOTHROW
+
 private:
 	friend class Nes_Nonlinearizer;
 	void enable_nonlinear( double volume );
 	static double nonlinear_tnd_gain() { return 0.75; }
 private:
 	friend struct Nes_Dmc;
-	
+
 	// noncopyable
 	Nes_Apu( const Nes_Apu& );
 	Nes_Apu& operator = ( const Nes_Apu& );
-	
+
 	Nes_Osc*            oscs [osc_count];
 	Nes_Square          square1;
 	Nes_Square          square2;
 	Nes_Noise           noise;
 	Nes_Triangle        triangle;
 	Nes_Dmc             dmc;
-	
+
 	double tempo_;
 	nes_time_t last_time; // has been run until this time in current frame
 	nes_time_t last_dmc_time;
@@ -129,11 +128,11 @@
 	void (*irq_notifier_)( void* user_data );
 	void* irq_data;
 	Nes_Square::Synth square_synth; // shared by squares
-	
+
 	void irq_changed();
 	void state_restored();
 	void run_until_( nes_time_t );
-	
+
 	// TODO: remove
 	friend class Nes_Core;
 };
@@ -165,12 +164,12 @@
 {
 	return dmc.count_reads( time, last_read );
 }
-	
+
 inline nes_time_t Nes_Dmc::next_read_time() const
 {
 	if ( length_counter == 0 )
 		return Nes_Apu::no_irq; // not reading
-	
+
 	return apu->last_dmc_time + delay + long (bits_remain - 1) * period;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Nes_Cpu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Nes_Cpu.cxx Changed

@@ -77,13 +77,11 @@
 	irq_time_ = future_nes_time;
 	end_time_ = future_nes_time;
 	error_count_ = 0;
-	
+
 	assert( page_size == 0x800 ); // assumes this
 	set_code_page( page_count, unmapped_page );
 	map_code( 0x2000, 0xE000, unmapped_page, true );
 	map_code( 0x0000, 0x2000, low_mem, true );
-	
-	blargg_verify_byte_order();
 }
 
 void Nes_Cpu::map_code( nes_addr_t start, unsigned size, void const* data, bool mirror )
@@ -92,7 +90,7 @@
 	require( start % page_size == 0 );
 	require( size % page_size == 0 );
 	require( start + size <= 0x10000 );
-	
+
 	unsigned page = start / page_size;
 	for ( unsigned n = size / page_size; n; --n )
 	{
@@ -126,7 +124,7 @@
 	this->state = &s;
 	// even on x86, using s.time in place of s_time was slower
 	fint16 s_time = s.time;
-	
+
 	// registers
 	fuint16 pc = r.pc;
 	fuint8 a = r.a;
@@ -134,10 +132,10 @@
 	fuint8 y = r.y;
 	fuint16 sp;
 	SET_SP( r.sp );
-	
+
 	// status flags
 	#define IS_NEG (nz & 0x8080)
-	
+
 	#define CALC_STATUS( out ) do {\
 		out = status & (st_v | st_d | st_i);\
 		out |= ((nz >> 8) | nz) & st_n;\
@@ -151,7 +149,7 @@
 		c = nz;\
 		nz |= ~in & st_z;\
 	} while ( 0 )
-	
+
 	fuint8 status;
 	fuint16 c; // carry set if (c & 0x100) != 0
 	fuint16 nz; // Z set if (nz & 0xFF) == 0, N set if (nz & 0x8080) != 0
@@ -159,22 +157,22 @@
 		fuint8 temp = r.status;
 		SET_STATUS( temp );
 	}
-	
+
 	goto loop;
 dec_clock_loop:
 	s_time--;
 loop:
-	
+
 	check( (unsigned) GET_SP() < 0x100 );
 	check( (unsigned) pc < 0x10000 );
 	check( (unsigned) a < 0x100 );
 	check( (unsigned) x < 0x100 );
 	check( (unsigned) y < 0x100 );
 	check( -32768 <= s_time && s_time < 32767 );
-	
+
 	uint8_t const* instr = s.code_map [pc >> page_bits];
 	fuint8 opcode;
-	
+
 	// TODO: eliminate this special case
 	#if BLARGG_NONPORTABLE
 		opcode = instr [pc];
@@ -185,7 +183,7 @@
 		opcode = *instr++;
 		pc++;
 	#endif
-	
+
 	static uint8_t const clock_table [256] =
 	{// 0 1 2 3 4 5 6 7 8 9 A B C D E F
 		0,6,2,8,3,3,5,5,3,2,2,2,4,4,6,6,// 0
@@ -205,16 +203,16 @@
 		2,6,2,8,3,3,5,5,2,2,2,2,4,4,6,6,// E
 		3,5,0,8,4,4,6,6,2,4,2,7,4,4,7,7 // F
 	}; // 0x00 was 7 and 0xF2 was 2
-	
+
 	fuint16 data;
-	
+
 #if !BLARGG_CPU_X86
 	if ( s_time >= 0 )
 		goto out_of_time;
 	s_time += clock_table [opcode];
-	
+
 	data = *instr;
-	
+
 	switch ( opcode )
 	{
 #else
@@ -223,9 +221,9 @@
 	if ( (s_time += data) >= 0 )
 		goto possibly_out_of_time;
 almost_out_of_time:
-	
+
 	data = *instr;
-	
+
 	switch ( opcode )
 	{
 possibly_out_of_time:
@@ -251,12 +249,12 @@
 		out = temp + 0x100 * READ_LOW( uint8_t (data + 1) );\
 		cross( temp );\
 	}
-	
+
 #define IND_X( out ) {\
 		fuint16 temp = data + x;\
 		out = 0x100 * READ_LOW( uint8_t (temp + 1) ) + READ_LOW( uint8_t (temp) );\
 	}
-	
+
 #define ARITH_ADDR_MODES( op )\
 case op - 0x04: /* (ind,x) */\
 	IND_X( data )\
@@ -288,10 +286,10 @@
 // TODO: more efficient way to handle negative branch that wraps PC around
 #define BRANCH( cond )\
 {\
-	fint16 offset = (BOOST::int8_t) data;\
+	fint16 offset = (int8_t) data;\
 	fuint16 extra_clock = (++pc & 0xFF) + offset;\
 	if ( !(cond) ) goto dec_clock_loop;\
-	pc = BOOST::uint16_t (pc + offset);\
+	pc = uint16_t (pc + offset);\
 	s_time += extra_clock >> 8 & 1;\
 	goto loop;\
 }
@@ -302,15 +300,15 @@
 		a = nz = READ_LOW( uint8_t (data + x) );
 		pc++;
 		goto loop;
-	
+
 	case 0xA5: // LDA zp
 		a = nz = READ_LOW( data );
 		pc++;
 		goto loop;
-	
+
 	case 0xD0: // BNE
 		BRANCH( (uint8_t) nz );
-	
+
 	case 0x20: { // JSR
 		fuint16 temp = pc + 1;
 		pc = GET_ADDR();
@@ -319,37 +317,37 @@
 		WRITE_LOW( sp, temp );
 		goto loop;
 	}
-	
+
 	case 0x4C: // JMP abs
 		pc = GET_ADDR();
 		goto loop;
-	
+
 	case 0xE8: // INX
 		INC_DEC_XY( x, 1 )
-	
+
 	case 0x10: // BPL
 		BRANCH( !IS_NEG )
-	
+
 	ARITH_ADDR_MODES( 0xC5 ) // CMP
 		nz = a - data;
 		pc++;
 		c = ~nz;
 		nz &= 0xFF;
 		goto loop;
-	
+
 	case 0x30: // BMI
 		BRANCH( IS_NEG )
-	
+
 	case 0xF0: // BEQ
 		BRANCH( !(uint8_t) nz );
-	
+
 	case 0x95: // STA zp,x
 		data = uint8_t (data + x);
 	case 0x85: // STA zp
 		pc++;
 		WRITE_LOW( data, a );
 		goto loop;
-	
+
 	case 0xC8: // INY
 		INC_DEC_XY( y, 1 )
 
@@ -357,12 +355,12 @@
 		y = a;
 		nz = a;
 		goto loop;
-	
+
 	case 0x98: // TYA
 		a = y;
 		nz = y;
 		goto loop;
-	
+
 	case 0xAD:{// LDA abs
 		unsigned addr = GET_ADDR();
 		pc += 2;
@@ -370,16 +368,16 @@
 		a = nz;
 		goto loop;
 	}
-	
+
 	case 0x60: // RTS
 		pc = 1 + READ_LOW( sp );
 		pc += 0x100 * READ_LOW( 0x100 | (sp - 0xFF) );
 		sp = (sp - 0xFE) | 0x100;
 		goto loop;
-	
+
 	{
 		fuint16 addr;
-		
+
 	case 0x99: // STA abs,Y
 		addr = y + GET_ADDR();
 		pc += 2;
@@ -389,7 +387,7 @@
 			goto loop;
 		}
 		goto sta_ptr;
-	
+
 	case 0x8D: // STA abs
 		addr = GET_ADDR();
 		pc += 2;
@@ -399,7 +397,7 @@
 			goto loop;
 		}
 		goto sta_ptr;
-	
+
 	case 0x9D: // STA abs,X (slightly more common than STA abs)
 		addr = x + GET_ADDR();
 		pc += 2;
@@ -413,19 +411,19 @@
 		WRITE( addr, a );
 		CACHE_TIME();
 		goto loop;
-		
+
 	case 0x91: // STA (ind),Y
 		IND_Y( NO_PAGE_CROSSING, addr )
 		pc++;
 		goto sta_ptr;
-	
+
 	case 0x81: // STA (ind,X)
 		IND_X( addr )
 		pc++;
 		goto sta_ptr;
-	
+
 	}
-	
+
 	case 0xA9: // LDA #imm
 		pc++;
 		a = data;
@@ -435,12 +433,12 @@
 	// common read instructions
 	{
 		fuint16 addr;
-		
+
 	case 0xA1: // LDA (ind,X)
 		IND_X( addr )
 		pc++;
 		goto a_nz_read_addr;
-	
+
 	case 0xB1:// LDA (ind),Y
 		addr = READ_LOW( data ) + y;
 		HANDLE_PAGE_CROSSING( addr );
@@ -450,7 +448,7 @@
 		if ( (addr ^ 0x8000) <= 0x9FFF )
 			goto loop;
 		goto a_nz_read_addr;
-	
+
 	case 0xB9: // LDA abs,Y
 		HANDLE_PAGE_CROSSING( data + y );
 		addr = GET_ADDR() + y;
@@ -459,7 +457,7 @@
 		if ( (addr ^ 0x8000) <= 0x9FFF )
 			goto loop;
 		goto a_nz_read_addr;
-	
+
 	case 0xBD: // LDA abs,X
 		HANDLE_PAGE_CROSSING( data + x );
 		addr = GET_ADDR() + x;
@@ -472,39 +470,39 @@
 		a = nz = READ( addr );
 		CACHE_TIME();
 		goto loop;
-	
+
 	}
 
 // Branch
 
 	case 0x50: // BVC
 		BRANCH( !(status & st_v) )
-	
+
 	case 0x70: // BVS
 		BRANCH( status & st_v )
-	
+
 	case 0xB0: // BCS
 		BRANCH( c & 0x100 )
-	
+
 	case 0x90: // BCC
 		BRANCH( !(c & 0x100) )
-	
+
 // Load/store
-	
+
 	case 0x94: // STY zp,x
 		data = uint8_t (data + x);
 	case 0x84: // STY zp
 		pc++;
 		WRITE_LOW( data, y );
 		goto loop;
-	
+
 	case 0x96: // STX zp,y
 		data = uint8_t (data + y);
 	case 0x86: // STX zp
 		pc++;
 		WRITE_LOW( data, x );
 		goto loop;
-	
+
 	case 0xB6: // LDX zp,y
 		data = uint8_t (data + y);
 	case 0xA6: // LDX zp
@@ -514,7 +512,7 @@
 		x = data;
 		nz = data;
 		goto loop;
-	
+
 	case 0xB4: // LDY zp,x
 		data = uint8_t (data + x);
 	case 0xA4: // LDY zp
@@ -524,7 +522,7 @@
 		y = data;
 		nz = data;
 		goto loop;
-	
+
 	case 0xBC: // LDY abs,X
 		data += x;
 		HANDLE_PAGE_CROSSING( data );
@@ -536,7 +534,7 @@
 		CACHE_TIME();
 		goto loop;
 	}
-	
+
 	case 0xBE: // LDX abs,y
 		data += y;
 		HANDLE_PAGE_CROSSING( data );
@@ -548,13 +546,13 @@
 		CACHE_TIME();
 		goto loop;
 	}
-	
+
 	{
 		fuint8 temp;
 	case 0x8C: // STY abs
 		temp = y;
 		goto store_abs;
-	
+
 	case 0x8E: // STX abs
 		temp = x;
 	store_abs:
@@ -581,7 +579,7 @@
 		CACHE_TIME();
 		goto cpx_data;
 	}
-	
+
 	case 0xE4: // CPX zp
 		data = READ_LOW( data );
 	case 0xE0: // CPX #imm
@@ -591,7 +589,7 @@
 		c = ~nz;
 		nz &= 0xFF;
 		goto loop;
-	
+
 	case 0xCC:{// CPY abs
 		unsigned addr = GET_ADDR();
 		pc++;
@@ -600,7 +598,7 @@
 		CACHE_TIME();
 		goto cpy_data;
 	}
-	
+
 	case 0xC4: // CPY zp
 		data = READ_LOW( data );
 	case 0xC0: // CPY #imm
@@ -610,24 +608,24 @@
 		c = ~nz;
 		nz &= 0xFF;
 		goto loop;
-	
+
 // Logical
 
 	ARITH_ADDR_MODES( 0x25 ) // AND
 		nz = (a &= data);
 		pc++;
 		goto loop;
-	
+
 	ARITH_ADDR_MODES( 0x45 ) // EOR
 		nz = (a ^= data);
 		pc++;
 		goto loop;
-	
+
 	ARITH_ADDR_MODES( 0x05 ) // ORA
 		nz = (a |= data);
 		pc++;
 		goto loop;
-	
+
 	case 0x2C:{// BIT abs
 		unsigned addr = GET_ADDR();
 		pc += 2;
@@ -639,7 +637,7 @@
 		nz <<= 8; // result must be zero, even if N bit is set
 		goto loop;
 	}
-	
+
 	case 0x24: // BIT zp
 		nz = READ_LOW( data );
 		pc++;
@@ -649,18 +647,18 @@
 			goto loop;
 		nz <<= 8; // result must be zero, even if N bit is set
 		goto loop;
-		
+
 // Add/subtract
 
 	ARITH_ADDR_MODES( 0xE5 ) // SBC
 	case 0xEB: // unofficial equivalent
 		data ^= 0xFF;
 		goto adc_imm;
-	
+
 	ARITH_ADDR_MODES( 0x65 ) // ADC
 	adc_imm: {
 		fint16 carry = c >> 8 & 1;
-		fint16 ov = (a ^ 0x80) + carry + (BOOST::int8_t) data; // sign-extend
+		fint16 ov = (a ^ 0x80) + carry + (int8_t) data; // sign-extend
 		status &= ~st_v;
 		status |= ov >> 2 & 0x40;
 		c = nz = a + data + carry;
@@ -668,7 +666,7 @@
 		a = (uint8_t) nz;
 		goto loop;
 	}
-	
+
 // Shift/rotate
 
 	case 0x4A: // LSR A
@@ -694,7 +692,7 @@
 		a = (uint8_t) nz;
 		goto loop;
 	}
-	
+
 	case 0x5E: // LSR abs,X
 		data += x;
 	case 0x4E: // LSR abs
@@ -708,11 +706,11 @@
 		c = temp << 8;
 		goto rotate_common;
 	}
-	
+
 	case 0x3E: // ROL abs,X
 		data += x;
 		goto rol_abs;
-	
+
 	case 0x1E: // ASL abs,X
 		data += x;
 	case 0x0E: // ASL abs
@@ -728,15 +726,15 @@
 		WRITE( data, (uint8_t) nz );
 		CACHE_TIME();
 		goto loop;
-	
+
 	case 0x7E: // ROR abs,X
 		data += x;
 		goto ror_abs;
-	
+
 	case 0x76: // ROR zp,x
 		data = uint8_t (data + x);
 		goto ror_zp;
-	
+
 	case 0x56: // LSR zp,x
 		data = uint8_t (data + x);
 	case 0x46: // LSR zp
@@ -748,11 +746,11 @@
 		c = temp << 8;
 		goto write_nz_zp;
 	}
-	
+
 	case 0x36: // ROL zp,x
 		data = uint8_t (data + x);
 		goto rol_zp;
-	
+
 	case 0x16: // ASL zp,x
 		data = uint8_t (data + x);
 	case 0x06: // ASL zp
@@ -762,21 +760,21 @@
 		nz = c >> 8 & 1;
 		nz |= (c = READ_LOW( data ) << 1);
 		goto write_nz_zp;
-	
+
 // Increment/decrement
 
 	case 0xCA: // DEX
 		INC_DEC_XY( x, -1 )
-	
+
 	case 0x88: // DEY
 		INC_DEC_XY( y, -1 )
-	
+
 	case 0xF6: // INC zp,x
 		data = uint8_t (data + x);
 	case 0xE6: // INC zp
 		nz = 1;
 		goto add_nz_zp;
-	
+
 	case 0xD6: // DEC zp,x
 		data = uint8_t (data + x);
 	case 0xC6: // DEC zp
@@ -787,21 +785,21 @@
 		pc++;
 		WRITE_LOW( data, nz );
 		goto loop;
-	
+
 	case 0xFE: // INC abs,x
 		data = x + GET_ADDR();
 		goto inc_ptr;
-	
+
 	case 0xEE: // INC abs
 		data = GET_ADDR();
 	inc_ptr:
 		nz = 1;
 		goto inc_common;
-	
+
 	case 0xDE: // DEC abs,x
 		data = x + GET_ADDR();
 		goto dec_ptr;
-	
+
 	case 0xCE: // DEC abs
 		data = GET_ADDR();
 	dec_ptr:
@@ -813,14 +811,14 @@
 		WRITE( data, (uint8_t) nz );
 		CACHE_TIME();
 		goto loop;
-		
+
 // Transfer
 
 	case 0xAA: // TAX
 		x = a;
 		nz = a;
 		goto loop;
-		
+
 	case 0x8A: // TXA
 		a = x;
 		nz = x;
@@ -829,22 +827,22 @@
 	case 0x9A: // TXS
 		SET_SP( x ); // verified (no flag change)
 		goto loop;
-	
+
 	case 0xBA: // TSX
 		x = nz = GET_SP();
 		goto loop;
-	
+
 // Stack
-	
+
 	case 0x48: // PHA
 		PUSH( a ); // verified
 		goto loop;
-		
+
 	case 0x68: // PLA
 		a = nz = READ_LOW( sp );
 		sp = (sp - 0xFF) | 0x100;
 		goto loop;
-		
+
 	case 0x40:{// RTI
 		fuint8 temp = READ_LOW( sp );
 		pc = READ_LOW( 0x100 | (sp - 0xFF) );
@@ -861,7 +859,7 @@
 		s.base = irq_time_;
 		goto loop;
 	}
-	
+
 	case 0x28:{// PLP
 		fuint8 temp = READ_LOW( sp );
 		sp = (sp - 0xFF) | 0x100;
@@ -873,14 +871,14 @@
 			goto handle_sei;
 		goto handle_cli;
 	}
-	
+
 	case 0x08: { // PHP
 		fuint8 temp;
 		CALC_STATUS( temp );
 		PUSH( temp | (st_b | st_r) );
 		goto loop;
 	}
-	
+
 	case 0x6C:{// JMP (ind)
 		data = GET_ADDR();
 		check( unsigned (data - 0x2000) >= 0x4000 ); // ensure it's outside I/O space
@@ -890,32 +888,32 @@
 		pc |= page [PAGE_OFFSET( data )] << 8;
 		goto loop;
 	}
-	
+
 	case 0x00: // BRK
 		goto handle_brk;
-	
+
 // Flags
 
 	case 0x38: // SEC
 		c = (unsigned) ~0;
 		goto loop;
-	
+
 	case 0x18: // CLC
 		c = 0;
 		goto loop;
-		
+
 	case 0xB8: // CLV
 		status &= ~st_v;
 		goto loop;
-	
+
 	case 0xD8: // CLD
 		status &= ~st_d;
 		goto loop;
-	
+
 	case 0xF8: // SED
 		status |= st_d;
 		goto loop;
-	
+
 	case 0x58: // CLI
 		if ( !(status & st_i) )
 			goto loop;
@@ -934,20 +932,20 @@
 		s_time += delta;
 		if ( s_time < 0 )
 			goto loop;
-		
+
 		if ( delta >= s_time + 1 )
 		{
 			s.base += s_time + 1;
 			s_time = -1;
 			goto loop;
 		}
-		
+
 		// TODO: implement
 	delayed_cli:
 		debug_printf( "Delayed CLI not emulated\n" );
 		goto loop;
 	}
-	
+
 	case 0x78: // SEI
 		if ( status & st_i )
 			goto loop;
@@ -959,13 +957,13 @@
 		s_time += delta;
 		if ( s_time < 0 )
 			goto loop;
-		
+
 		debug_printf( "Delayed SEI not emulated\n" );
 		goto loop;
 	}
-	
+
 // Unofficial
-	
+
 	// SKW - Skip word
 	case 0x1C: case 0x3C: case 0x5C: case 0x7C: case 0xDC: case 0xFC:
 		HANDLE_PAGE_CROSSING( data + x );
@@ -976,7 +974,7 @@
 	case 0x80: case 0x82: case 0x89: case 0xC2: case 0xD4: case 0xE2: case 0xF4:
 		pc++;
 		goto loop;
-	
+
 	// NOP
 	case 0xEA: case 0x1A: case 0x3A: case 0x5A: case 0x7A: case 0xDA: case 0xFA:
 		goto loop;
@@ -992,9 +990,9 @@
 	case 0x02: case 0x12: case 0x22: case 0x32: case 0x42: case 0x52:
 	case 0x62: case 0x72: case 0x92: case 0xB2: case 0xD2:
 		goto stop;
-	
+
 // Unimplemented
-	
+
 	case 0xFF: // force 256-entry jump table for optimization purposes
 		c |= 1;
 	default:
@@ -1009,7 +1007,7 @@
 			len = 2;
 		pc += len;
 		error_count_++;
-		
+
 		if ( (opcode >> 4) == 0x0B )
 		{
 			if ( opcode == 0xB3 )
@@ -1020,20 +1018,20 @@
 		goto loop;
 	}
 	assert( false );
-	
+
 	int result_;
 handle_brk:
 	pc++;
 	result_ = 4;
-	
+
 interrupt:
 	{
 		s_time += 7;
-		
+
 		WRITE_LOW( 0x100 | (sp - 1), pc >> 8 );
 		WRITE_LOW( 0x100 | (sp - 2), pc );
 		pc = GET_LE16( &READ_PROG( 0xFFFA ) + result_ );
-		
+
 		sp = (sp - 3) | 0x100;
 		fuint8 temp;
 		CALC_STATUS( temp );
@@ -1041,7 +1039,7 @@
 		if ( result_ )
 			temp |= st_b; // TODO: incorrectly sets B flag for IRQ
 		WRITE_LOW( sp, temp );
-		
+
 		this->r.status = status |= st_i;
 		blargg_long delta = s.base - end_time_;
 		if ( delta >= 0 ) goto loop;
@@ -1049,7 +1047,7 @@
 		s.base = end_time_;
 		goto loop;
 	}
-	
+
 out_of_time:
 	pc--;
 	FLUSH_TIME();
@@ -1059,26 +1057,26 @@
 		goto interrupt;
 	if ( s_time < 0 )
 		goto loop;
-	
+
 stop:
-	
+
 	s.time = s_time;
-	
+
 	r.pc = pc;
 	r.sp = GET_SP();
 	r.a = a;
 	r.x = x;
 	r.y = y;
-	
+
 	{
 		fuint8 temp;
 		CALC_STATUS( temp );
 		r.status = temp;
 	}
-	
+
 	this->state_ = s;
 	this->state = &this->state_;
-	
+
 	return s_time < 0;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Nes_Cpu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Nes_Cpu.h Changed

@@ -12,57 +12,55 @@
 
 class Nes_Cpu {
 public:
-	typedef BOOST::uint8_t uint8_t;
-	
 	// Clear registers, map low memory and its three mirrors to address 0,
 	// and mirror unmapped_page in remaining memory
 	void reset( void const* unmapped_page = 0 );
-	
+
 	// Map code memory (memory accessed via the program counter). Start and size
 	// must be multiple of page_size. If mirror is true, repeats code page
 	// throughout address range.
 	enum { page_size = 0x800 };
 	void map_code( nes_addr_t start, unsigned size, void const* code, bool mirror = false );
-	
+
 	// Access emulated memory as CPU does
 	uint8_t const* get_code( nes_addr_t );
-	
+
 	// 2KB of RAM at address 0
 	uint8_t low_mem [0x800];
-	
+
 	// NES 6502 registers. Not kept updated during a call to run().
 	struct registers_t {
-		BOOST::uint16_t pc;
-		BOOST::uint8_t a;
-		BOOST::uint8_t x;
-		BOOST::uint8_t y;
-		BOOST::uint8_t status;
-		BOOST::uint8_t sp;
+		uint16_t pc;
+		uint8_t a;
+		uint8_t x;
+		uint8_t y;
+		uint8_t status;
+		uint8_t sp;
 	};
 	registers_t r;
-	
+
 	// Set end_time and run CPU from current time. Returns true if execution
 	// stopped due to encountering bad_opcode.
 	bool run( nes_time_t end_time );
-	
+
 	// Time of beginning of next instruction to be executed
 	nes_time_t time() const             { return state->time + state->base; }
 	void set_time( nes_time_t t )       { state->time = t - state->base; }
 	void adjust_time( int delta )       { state->time += delta; }
-	
+
 	nes_time_t irq_time() const         { return irq_time_; }
 	void set_irq_time( nes_time_t );
-	
+
 	nes_time_t end_time() const         { return end_time_; }
 	void set_end_time( nes_time_t );
-	
+
 	// Number of undefined instructions encountered and skipped
 	void clear_error_count()            { error_count_ = 0; }
 	unsigned long error_count() const   { return error_count_; }
-	
+
 	// CPU invokes bad opcode handler if it encounters this
 	enum { bad_opcode = 0xF2 };
-	
+
 public:
 	Nes_Cpu() { state = &state_; }
 	enum { page_bits = 11 };
@@ -79,12 +77,12 @@
 	nes_time_t irq_time_;
 	nes_time_t end_time_;
 	unsigned long error_count_;
-	
+
 	void set_code_page( int, void const* );
 	inline int update_end_time( nes_time_t end, nes_time_t irq );
 };
 
-inline BOOST::uint8_t const* Nes_Cpu::get_code( nes_addr_t addr )
+inline uint8_t const* Nes_Cpu::get_code( nes_addr_t addr )
 {
 	return state->code_map [addr >> page_bits] + addr
 	#if !BLARGG_NONPORTABLE

audacious-plugins-3.3.4.tar.bz2/src/console/Nes_Fme7_Apu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Nes_Fme7_Apu.cxx Changed

@@ -20,10 +20,10 @@
 void Nes_Fme7_Apu::reset()
 {
 	last_time = 0;
-	
+
 	for ( int i = 0; i < osc_count; i++ )
 		oscs [i].last_amp = 0;
-	
+
 	fme7_apu_state_t* state = this;
 	memset( state, 0, sizeof *state );
 }
@@ -41,28 +41,28 @@
 void Nes_Fme7_Apu::run_until( blip_time_t end_time )
 {
 	require( end_time >= last_time );
-	
+
 	for ( int index = 0; index < osc_count; index++ )
 	{
 		int mode = regs [7] >> index;
 		int vol_mode = regs [010 + index];
 		int volume = amp_table [vol_mode & 0x0F];
-		
+
 		Blip_Buffer* const osc_output = oscs [index].output;
 		if ( !osc_output )
 			continue;
 		osc_output->set_modified();
-		
+
 		// check for unsupported mode
 		#ifndef NDEBUG
 			if ( (mode & 011) <= 001 && vol_mode & 0x1F )
 				debug_printf( "FME7 used unimplemented sound mode: %02X, vol_mode: %02X\n",
 						mode, vol_mode & 0x1F );
 		#endif
-		
+
 		if ( (mode & 001) | (vol_mode & 0x10) )
 			volume = 0; // noise and envelope aren't supported
-		
+
 		// period
 		int const period_factor = 16;
 		unsigned period = (regs [index * 2 + 1] & 0x0F) * 0x100 * period_factor +
@@ -73,7 +73,7 @@
 			if ( !period ) // on my AY-3-8910A, period doesn't have extra one added
 				period = period_factor;
 		}
-		
+
 		// current amplitude
 		int amp = volume;
 		if ( !phases [index] )
@@ -86,7 +86,7 @@
 				synth.offset( last_time, delta, osc_output );
 			}
 		}
-		
+
 		blip_time_t time = last_time + delays [index];
 		if ( time < end_time )
 		{
@@ -100,7 +100,7 @@
 					time += period;
 				}
 				while ( time < end_time );
-				
+
 				oscs [index].last_amp = (delta + volume) >> 1;
 				phases [index] = (delta > 0);
 			}
@@ -112,10 +112,10 @@
 				time += (blargg_long) count * period;
 			}
 		}
-		
+
 		delays [index] = time - end_time;
 	}
-	
+
 	last_time = end_time;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Nes_Fme7_Apu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Nes_Fme7_Apu.h Changed

@@ -10,10 +10,10 @@
 struct fme7_apu_state_t
 {
 	enum { reg_count = 14 };
-	BOOST::uint8_t regs [reg_count];
-	BOOST::uint8_t phases [3]; // 0 or 1
-	BOOST::uint8_t latch;
-	BOOST::uint16_t delays [3]; // a, b, c
+	uint8_t regs [reg_count];
+	uint8_t phases [3]; // 0 or 1
+	uint8_t latch;
+	uint16_t delays [3]; // a, b, c
 };
 
 class Nes_Fme7_Apu : private fme7_apu_state_t {
@@ -28,37 +28,36 @@
 	void end_frame( blip_time_t );
 	void save_state( fme7_apu_state_t* ) const;
 	void load_state( fme7_apu_state_t const& );
-	
+
 	// Mask and addresses of registers
 	enum { addr_mask = 0xE000 };
 	enum { data_addr = 0xE000 };
 	enum { latch_addr = 0xC000 };
-	
+
 	// (addr & addr_mask) == latch_addr
 	void write_latch( int );
-	
+
 	// (addr & addr_mask) == data_addr
 	void write_data( blip_time_t, int data );
-	
-public:
+
 	Nes_Fme7_Apu();
-	BLARGG_DISABLE_NOTHROW
+
 private:
 	// noncopyable
 	Nes_Fme7_Apu( const Nes_Fme7_Apu& );
 	Nes_Fme7_Apu& operator = ( const Nes_Fme7_Apu& );
-	
+
 	static unsigned char const amp_table [16];
-	
+
 	struct {
 		Blip_Buffer* output;
 		int last_amp;
 	} oscs [osc_count];
 	blip_time_t last_time;
-	
+
 	enum { amp_range = 192 }; // can be any value; this gives best error/quality tradeoff
 	Blip_Synth<blip_good_quality,1> synth;
-	
+
 	void run_until( blip_time_t );
 };
 
@@ -102,7 +101,7 @@
 		#endif
 		return;
 	}
-	
+
 	run_until( time );
 	regs [latch] = data;
 }
@@ -111,7 +110,7 @@
 {
 	if ( time > last_time )
 		run_until( time );
-	
+
 	assert( last_time >= time );
 	last_time -= time;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Nes_Namco_Apu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Nes_Namco_Apu.cxx Changed

@@ -26,11 +26,11 @@
 {
 	last_time = 0;
 	addr_reg = 0;
-	
+
 	int i;
 	for ( i = 0; i < reg_count; i++ )
 		reg [i] = 0;
-	
+
 	for ( i = 0; i < osc_count; i++ )
 	{
 		Namco_Osc& osc = oscs [i];
@@ -50,12 +50,12 @@
 void Nes_Namco_Apu::reflect_state( Tagged_Data& data )
 {
 	reflect_int16( data, BLARGG_4CHAR('A','D','D','R'), &addr_reg );
-	
+
 	static const char hex [17] = "0123456789ABCDEF";
 	int i;
 	for ( i = 0; i < reg_count; i++ )
 		reflect_int16( data, 'RG\0\0' + hex [i >> 4] * 0x100 + hex [i & 15], &reg [i] );
-	
+
 	for ( i = 0; i < osc_count; i++ )
 	{
 		reflect_int32( data, BLARGG_4CHAR('D','L','Y','0') + i, &oscs [i].delay );
@@ -68,7 +68,7 @@
 {
 	if ( time > last_time )
 		run_until( time );
-	
+
 	assert( last_time >= time );
 	last_time -= time;
 }
@@ -83,34 +83,34 @@
 		if ( !output )
 			continue;
 		output->set_modified();
-		
+
 		blip_resampled_time_t time =
 				output->resampled_time( last_time ) + osc.delay;
 		blip_resampled_time_t end_time = output->resampled_time( nes_end_time );
 		osc.delay = 0;
 		if ( time < end_time )
 		{
-			const BOOST::uint8_t* osc_reg = &reg [i * 8 + 0x40];
+			const uint8_t* osc_reg = &reg [i * 8 + 0x40];
 			if ( !(osc_reg [4] & 0xE0) )
 				continue;
-			
+
 			int volume = osc_reg [7] & 15;
 			if ( !volume )
 				continue;
-			
+
 			blargg_long freq = (osc_reg [4] & 3) * 0x10000 + osc_reg [2] * 0x100L + osc_reg [0];
 			if ( freq < 64 * active_oscs )
 				continue; // prevent low frequencies from excessively delaying freq changes
 			blip_resampled_time_t period =
 					output->resampled_duration( 983040 ) / freq * active_oscs;
-			
+
 			int wave_size = 32 - (osc_reg [4] >> 2 & 7) * 4;
 			if ( !wave_size )
 				continue;
-			
+
 			int last_amp = osc.last_amp;
 			int wave_pos = osc.wave_pos;
-			
+
 			do
 			{
 				// read wave sample
@@ -118,7 +118,7 @@
 				int sample = reg [addr >> 1] >> (addr << 2 & 4);
 				wave_pos++;
 				sample = (sample & 15) * volume;
-				
+
 				// output impulse if amplitude changed
 				int delta = sample - last_amp;
 				if ( delta )
@@ -126,20 +126,20 @@
 					last_amp = sample;
 					synth.offset_resampled( time, delta, output );
 				}
-				
+
 				// next sample
 				time += period;
 				if ( wave_pos >= wave_size )
 					wave_pos = 0;
 			}
 			while ( time < end_time );
-			
+
 			osc.wave_pos = wave_pos;
 			osc.last_amp = last_amp;
 		}
 		osc.delay = time - end_time;
 	}
-	
+
 	last_time = nes_end_time;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Nes_Namco_Apu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Nes_Namco_Apu.h Changed

@@ -19,59 +19,58 @@
 	void osc_output( int index, Blip_Buffer* );
 	void reset();
 	void end_frame( blip_time_t );
-	
+
 	// Read/write data register is at 0x4800
 	enum { data_reg_addr = 0x4800 };
 	void write_data( blip_time_t, int );
 	int read_data();
-	
+
 	// Write-only address register is at 0xF800
 	enum { addr_reg_addr = 0xF800 };
 	void write_addr( int );
-	
+
 	// to do: implement save/restore
 	void save_state( namco_state_t* out ) const;
 	void load_state( namco_state_t const& );
-	
-public:
+
 	Nes_Namco_Apu();
-	BLARGG_DISABLE_NOTHROW
+
 private:
 	// noncopyable
 	Nes_Namco_Apu( const Nes_Namco_Apu& );
 	Nes_Namco_Apu& operator = ( const Nes_Namco_Apu& );
-	
+
 	struct Namco_Osc {
 		blargg_long delay;
 		Blip_Buffer* output;
 		short last_amp;
 		short wave_pos;
 	};
-	
+
 	Namco_Osc oscs [osc_count];
-	
+
 	blip_time_t last_time;
 	int addr_reg;
-	
+
 	enum { reg_count = 0x80 };
-	BOOST::uint8_t reg [reg_count];
+	uint8_t reg [reg_count];
 	Blip_Synth<blip_good_quality,15> synth;
-	
-	BOOST::uint8_t& access();
+
+	uint8_t& access();
 	void run_until( blip_time_t );
 };
 /*
 struct namco_state_t
 {
-	BOOST::uint8_t regs [0x80];
-	BOOST::uint8_t addr;
-	BOOST::uint8_t unused;
-	BOOST::uint8_t positions [8];
-	BOOST::uint32_t delays [8];
+	uint8_t regs [0x80];
+	uint8_t addr;
+	uint8_t unused;
+	uint8_t positions [8];
+	uint32_t delays [8];
 };
 */
 
-inline BOOST::uint8_t& Nes_Namco_Apu::access()
+inline uint8_t& Nes_Namco_Apu::access()
 {
 	int addr = addr_reg & 0x7F;
 	if ( addr_reg & 0x80 )

audacious-plugins-3.3.4.tar.bz2/src/console/Nes_Oscs.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Nes_Oscs.cxx Changed

@@ -48,20 +48,20 @@
 void Nes_Square::clock_sweep( int negative_adjust )
 {
 	int sweep = regs [1];
-	
+
 	if ( --sweep_delay < 0 )
 	{
 		reg_written [1] = true;
-		
+
 		int period = this->period();
 		int shift = sweep & shift_mask;
 		if ( shift && (sweep & 0x80) && period >= 8 )
 		{
 			int offset = period >> shift;
-			
+
 			if ( sweep & negate_flag )
 				offset = negative_adjust - offset;
-			
+
 			if ( period + offset < 0x800 )
 			{
 				period += offset;
@@ -71,7 +71,7 @@
 			}
 		}
 	}
-	
+
 	if ( reg_written [1] ) {
 		reg_written [1] = false;
 		sweep_delay = (sweep >> 4) & 7;
@@ -96,19 +96,19 @@
 {
 	const int period = this->period();
 	const int timer_period = (period + 1) * 2;
-	
+
 	if ( !output )
 	{
 		delay = maintain_phase( time + delay, end_time, timer_period ) - end_time;
 		return;
 	}
-	
+
 	output->set_modified();
-	
+
 	int offset = period >> (regs [1] & shift_mask);
 	if ( regs [1] & negate_flag )
 		offset = 0;
-	
+
 	const int volume = this->volume();
 	if ( volume == 0 || period < 8 || (period + offset) >= 0x800 )
 	{
@@ -116,7 +116,7 @@
 			synth.offset( time, -last_amp, output );
 			last_amp = 0;
 		}
-		
+
 		time += delay;
 		time = maintain_phase( time, end_time, timer_period );
 	}
@@ -132,13 +132,13 @@
 		}
 		if ( phase < duty )
 			amp ^= volume;
-		
+
 		{
 			int delta = update_amp( amp );
 			if ( delta )
 				synth.offset( time, delta, output );
 		}
-		
+
 		time += delay;
 		if ( time < end_time )
 		{
@@ -146,7 +146,7 @@
 			const Synth& synth = this->synth;
 			int delta = amp * 2 - volume;
 			int phase = this->phase;
-			
+
 			do {
 				phase = (phase + 1) & (phase_range - 1);
 				if ( phase == 0 || phase == duty ) {
@@ -156,12 +156,12 @@
 				time += timer_period;
 			}
 			while ( time < end_time );
-			
+
 			last_amp = (delta + volume) >> 1;
 			this->phase = phase;
 		}
 	}
-	
+
 	delay = time - end_time;
 }
 
@@ -173,7 +173,7 @@
 		linear_counter = regs [0] & 0x7F;
 	else if ( linear_counter )
 		linear_counter--;
-	
+
 	if ( !(regs [0] & 0x80) )
 		reg_written [3] = false;
 }
@@ -212,16 +212,16 @@
 			delay = maintain_phase( time, end_time, timer_period ) - end_time;
 		return;
 	}
-	
+
 	output->set_modified();
-	
+
 	// to do: track phase when period < 3
 	// to do: Output 7.5 on dac when period < 2? More accurate, but results in more clicks.
-	
+
 	int delta = update_amp( calc_amp() );
 	if ( delta )
 		synth.offset( time, delta, output );
-	
+
 	time += delay;
 	if ( length_counter == 0 || linear_counter == 0 || timer_period < 3 )
 	{
@@ -230,14 +230,14 @@
 	else if ( time < end_time )
 	{
 		Blip_Buffer* const output = this->output;
-		
+
 		int phase = this->phase;
 		int volume = 1;
 		if ( phase > phase_range ) {
 			phase -= phase_range;
 			volume = -volume;
 		}
-		
+
 		do {
 			if ( --phase == 0 ) {
 				phase = phase_range;
@@ -246,11 +246,11 @@
 			else {
 				synth.offset_inline( time, volume, output );
 			}
-			
+
 			time += timer_period;
 		}
 		while ( time < end_time );
-		
+
 		if ( volume < 0 )
 			phase += phase_range;
 		this->phase = phase;
@@ -273,7 +273,7 @@
 	next_irq = Nes_Apu::no_irq;
 	irq_flag = false;
 	irq_enabled = false;
-	
+
 	Nes_Osc::reset();
 	period = 0x1AC;
 }
@@ -294,19 +294,19 @@
 {
 	if ( last_read )
 		*last_read = time;
-	
+
 	if ( length_counter == 0 )
 		return 0; // not reading
-	
+
 	nes_time_t first_read = next_read_time();
 	nes_time_t avail = time - first_read;
 	if ( avail <= 0 )
 		return 0;
-	
+
 	int count = (avail - 1) / (period * 8) + 1;
 	if ( !(regs [0] & loop_flag) && count > length_counter )
 		count = length_counter;
-	
+
 	if ( last_read )
 	{
 		*last_read = first_read + (count - 1) * (period * 8) + 1;
@@ -314,7 +314,7 @@
 		check( count == count_reads( *last_read, NULL ) );
 		check( count - 1 == count_reads( *last_read - 1, NULL ) );
 	}
-	
+
 	return count;
 }
 
@@ -357,7 +357,7 @@
 	{
 		int old_dac = dac;
 		dac = data & 0x7F;
-		
+
 		// adjust last_amp so that "pop" amplitude will be properly non-linear
 		// with respect to change in dac
 		int faked_nonlinear = dac - (dac_table [dac] - dac_table [old_dac]);
@@ -409,7 +409,7 @@
 		if ( delta )
 			synth.offset( time, delta, output );
 	}
-	
+
 	time += delay;
 	if ( time < end_time )
 	{
@@ -426,7 +426,7 @@
 			const int period = this->period;
 			int bits = this->bits;
 			int dac = this->dac;
-			
+
 			do
 			{
 				if ( !silence )
@@ -438,9 +438,9 @@
 						synth.offset_inline( time, step, output );
 					}
 				}
-				
+
 				time += period;
-				
+
 				if ( --bits_remain == 0 )
 				{
 					bits_remain = 8;
@@ -458,7 +458,7 @@
 				}
 			}
 			while ( time < end_time );
-			
+
 			this->dac = dac;
 			this->last_amp = dac;
 			this->bits = bits;
@@ -478,7 +478,7 @@
 void Nes_Noise::run( nes_time_t time, nes_time_t end_time )
 {
 	int period = noise_period_table [regs [2] & 15];
-	
+
 	if ( !output )
 	{
 		// TODO: clean up
@@ -486,9 +486,9 @@
 		delay = time + (end_time - time + period - 1) / period * period - end_time;
 		return;
 	}
-	
+
 	output->set_modified();
-	
+
 	const int volume = this->volume();
 	int amp = (noise & 1) ? volume : 0;
 	{
@@ -496,17 +496,17 @@
 		if ( delta )
 			synth.offset( time, delta, output );
 	}
-	
+
 	time += delay;
 	if ( time < end_time )
 	{
 		const int mode_flag = 0x80;
-		
+
 		if ( !volume )
 		{
 			// round to next multiple of period
 			time += (end_time - time + period - 1) / period * period;
-			
+
 			// approximate noise cycling while muted, by shuffling up noise register
 			// to do: precise muted noise cycling?
 			if ( !(regs [2] & mode_flag) ) {
@@ -517,35 +517,35 @@
 		else
 		{
 			Blip_Buffer* const output = this->output;
-			
+
 			// using resampled time avoids conversion in synth.offset()
 			blip_resampled_time_t rperiod = output->resampled_duration( period );
 			blip_resampled_time_t rtime = output->resampled_time( time );
-			
+
 			int noise = this->noise;
 			int delta = amp * 2 - volume;
 			const int tap = (regs [2] & mode_flag ? 8 : 13);
-			
+
 			do {
 				int feedback = (noise << tap) ^ (noise << 14);
 				time += period;
-				
+
 				if ( (noise + 1) & 2 ) {
 					// bits 0 and 1 of noise differ
 					delta = -delta;
 					synth.offset_resampled( rtime, delta, output );
 				}
-				
+
 				rtime += rperiod;
 				noise = (feedback & 0x4000) | (noise >> 1);
 			}
 			while ( time < end_time );
-			
+
 			last_amp = (delta + volume) >> 1;
 			this->noise = noise;
 		}
 	}
-	
+
 	delay = time - end_time;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Nes_Oscs.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Nes_Oscs.h Changed

@@ -17,7 +17,7 @@
 	int length_counter;// length counter (0 if unused by oscillator)
 	int delay; // delay until next (potential) transition
 	int last_amp; // last amplitude oscillator was outputting
-	
+
 	void clock_length( int halt_mask );
 	int period() const {
 		return (regs [3] & 7) * 0x100 + (regs [2] & 0xFF);
@@ -37,7 +37,7 @@
 {
 	int envelope;
 	int env_delay;
-	
+
 	void clock_envelope();
 	int volume() const;
 	void reset() {
@@ -55,12 +55,12 @@
 	enum { phase_range = 8 };
 	int phase;
 	int sweep_delay;
-	
+
 	typedef Blip_Synth<blip_good_quality,1> Synth;
 	Synth const& synth; // shared between squares
-	
+
 	Nes_Square( Synth const* s ) : synth( *s ) { }
-	
+
 	void clock_sweep( int adjust );
 	void run( nes_time_t, nes_time_t );
 	void reset() {
@@ -78,7 +78,7 @@
 	int phase;
 	int linear_counter;
 	Blip_Synth<blip_med_quality,1> synth;
-	
+
 	int calc_amp() const;
 	void run( nes_time_t, nes_time_t );
 	void clock_linear_counter();
@@ -96,7 +96,7 @@
 {
 	int noise;
 	Blip_Synth<blip_med_quality,1> synth;
-	
+
 	void run( nes_time_t, nes_time_t );
 	void reset() {
 		noise = 1 << 14;
@@ -115,24 +115,24 @@
 	int bits;
 	bool buf_full;
 	bool silence;
-	
+
 	enum { loop_flag = 0x40 };
-	
+
 	int dac;
-	
+
 	nes_time_t next_irq;
 	bool irq_enabled;
 	bool irq_flag;
 	bool pal_mode;
 	bool nonlinear;
-	
+
 	int (*prg_reader)( void*, nes_addr_t ); // needs to be initialized to prg read function
 	void* prg_reader_data;
-	
+
 	Nes_Apu* apu;
-	
+
 	Blip_Synth<blip_med_quality,1> synth;
-	
+
 	void start();
 	void write_register( int, int );
 	void run( nes_time_t, nes_time_t );

audacious-plugins-3.3.4.tar.bz2/src/console/Nes_Vrc6_Apu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Nes_Vrc6_Apu.cxx Changed

@@ -56,7 +56,7 @@
 {
 	require( (unsigned) osc_index < osc_count );
 	require( (unsigned) reg < reg_count );
-	
+
 	run_until( time );
 	oscs [osc_index].regs [reg] = data;
 }
@@ -65,7 +65,7 @@
 {
 	if ( time > last_time )
 		run_until( time );
-	
+
 	assert( last_time >= time );
 	last_time -= time;
 }
@@ -79,7 +79,7 @@
 		Vrc6_Osc const& osc = oscs [i];
 		for ( int r = 0; r < reg_count; r++ )
 			out->regs [i] [r] = osc.regs [r];
-		
+
 		out->delays [i] = osc.delay;
 		out->phases [i] = osc.phase;
 	}
@@ -94,7 +94,7 @@
 		Vrc6_Osc& osc = oscs [i];
 		for ( int r = 0; r < reg_count; r++ )
 			osc.regs [r] = in.regs [i] [r];
-		
+
 		osc.delay = in.delays [i];
 		osc.phase = in.phases [i];
 	}
@@ -108,11 +108,11 @@
 	if ( !output )
 		return;
 	output->set_modified();
-	
+
 	int volume = osc.regs [0] & 15;
 	if ( !(osc.regs [2] & 0x80) )
 		volume = 0;
-	
+
 	int gate = osc.regs [0] & 0x80;
 	int duty = ((osc.regs [0] >> 4) & 7) + 1;
 	int delta = ((gate || osc.phase < duty) ? volume : 0) - osc.last_amp;
@@ -122,7 +122,7 @@
 		osc.last_amp += delta;
 		square_synth.offset( time, delta, output );
 	}
-	
+
 	time += osc.delay;
 	osc.delay = 0;
 	int period = osc.period();
@@ -131,7 +131,7 @@
 		if ( time < end_time )
 		{
 			int phase = osc.phase;
-			
+
 			do
 			{
 				phase++;
@@ -149,7 +149,7 @@
 				time += period;
 			}
 			while ( time < end_time );
-			
+
 			osc.phase = phase;
 		}
 		osc.delay = time - end_time;
@@ -163,7 +163,7 @@
 	if ( !output )
 		return;
 	output->set_modified();
-	
+
 	int amp = osc.amp;
 	int amp_step = osc.regs [0] & 0x3F;
 	blip_time_t time = last_time;
@@ -182,7 +182,7 @@
 		{
 			int period = osc.period() * 2;
 			int phase = osc.phase;
-			
+
 			do
 			{
 				if ( --phase == 0 )
@@ -190,26 +190,26 @@
 					phase = 7;
 					amp = 0;
 				}
-				
+
 				int delta = (amp >> 3) - last_amp;
 				if ( delta )
 				{
 					last_amp = amp >> 3;
 					saw_synth.offset( time, delta, output );
 				}
-				
+
 				time += period;
 				amp = (amp + amp_step) & 0xFF;
 			}
 			while ( time < end_time );
-			
+
 			osc.phase = phase;
 			osc.amp = amp;
 		}
-		
+
 		osc.delay = time - end_time;
 	}
-	
+
 	osc.last_amp = last_amp;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Nes_Vrc6_Apu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Nes_Vrc6_Apu.h Changed

@@ -21,7 +21,7 @@
 	void end_frame( blip_time_t );
 	void save_state( vrc6_apu_state_t* ) const;
 	void load_state( vrc6_apu_state_t const& );
-	
+
 	// Oscillator 0 write-only registers are at $9000-$9002
 	// Oscillator 1 write-only registers are at $A000-$A002
 	// Oscillator 2 write-only registers are at $B000-$B002
@@ -29,36 +29,35 @@
 	enum { base_addr = 0x9000 };
 	enum { addr_step = 0x1000 };
 	void write_osc( blip_time_t, int osc, int reg, int data );
-	
-public:
+
 	Nes_Vrc6_Apu();
-	BLARGG_DISABLE_NOTHROW
+
 private:
 	// noncopyable
 	Nes_Vrc6_Apu( const Nes_Vrc6_Apu& );
 	Nes_Vrc6_Apu& operator = ( const Nes_Vrc6_Apu& );
-	
+
 	struct Vrc6_Osc
 	{
-		BOOST::uint8_t regs [3];
+		uint8_t regs [3];
 		Blip_Buffer* output;
 		int delay;
 		int last_amp;
 		int phase;
 		int amp; // only used by saw
-		
+
 		int period() const
 		{
 			return (regs [2] & 0x0F) * 0x100L + regs [1] + 1;
 		}
 	};
-	
+
 	Vrc6_Osc oscs [osc_count];
 	blip_time_t last_time;
-	
+
 	Blip_Synth<blip_med_quality,1> saw_synth;
 	Blip_Synth<blip_good_quality,1> square_synth;
-	
+
 	void run_until( blip_time_t );
 	void run_square( Vrc6_Osc& osc, blip_time_t );
 	void run_saw( blip_time_t );
@@ -66,11 +65,11 @@
 
 struct vrc6_apu_state_t
 {
-	BOOST::uint8_t regs [3] [3];
-	BOOST::uint8_t saw_amp;
-	BOOST::uint16_t delays [3];
-	BOOST::uint8_t phases [3];
-	BOOST::uint8_t unused;
+	uint8_t regs [3] [3];
+	uint8_t saw_amp;
+	uint16_t delays [3];
+	uint8_t phases [3];
+	uint8_t unused;
 };
 
 inline void Nes_Vrc6_Apu::osc_output( int i, Blip_Buffer* buf )

audacious-plugins-3.3.4.tar.bz2/src/console/Nsf_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Nsf_Emu.cxx Changed

@@ -44,7 +44,7 @@
 	vrc6 = 0;
 	namco = 0;
 	fme7 = 0;
-	
+
 	set_type( gme_nsf_type );
 	set_silence_lookahead( 6 );
 	apu.dmc_reader( pcm_read, this );
@@ -61,15 +61,15 @@
 	{
 		delete vrc6;
 		vrc6 = 0;
-		
+
 		delete namco;
 		namco = 0;
-		
+
 		delete fme7;
 		fme7 = 0;
 	}
 	#endif
-	
+
 	rom.clear();
 	Music_Emu::unload();
 }
@@ -101,22 +101,22 @@
 struct Nsf_File : Gme_Info_
 {
 	Nsf_Emu::header_t h;
-	
+
 	Nsf_File() { set_type( gme_nsf_type ); }
-	
+
 	blargg_err_t load_( Data_Reader& in )
 	{
 		blargg_err_t err = in.read( &h, Nsf_Emu::header_size );
 		if ( err )
 			return (err == in.eof_error ? gme_wrong_file_type : err);
-		
+
 		if ( h.chip_flags & ~(namco_flag | vrc6_flag | fme7_flag) )
 			set_warning( "Uses unsupported audio expansion hardware" );
-		
+
 		set_track_count( h.track_count );
 		return check_nsf_header( &h );
 	}
-	
+
 	blargg_err_t track_info_( track_info_t* out, int ) const
 	{
 		copy_nsf_fields( h, out );
@@ -135,22 +135,22 @@
 
 void Nsf_Emu::set_tempo_( double t )
 {
-	unsigned playback_rate = get_le16( header_.ntsc_speed );
+	unsigned playback_rate = GET_LE16( header_.ntsc_speed );
 	unsigned standard_rate = 0x411A;
 	clock_rate_ = 1789772.72727;
 	play_period = 262 * 341L * 4 - 2; // two fewer PPU clocks every four frames
-	
+
 	if ( pal_only )
 	{
 		play_period = 33247 * clock_divisor;
 		clock_rate_ = 1662607.125;
 		standard_rate = 0x4E20;
-		playback_rate = get_le16( header_.pal_speed );
+		playback_rate = GET_LE16( header_.pal_speed );
 	}
-	
+
 	if ( !playback_rate )
 		playback_rate = standard_rate;
-	
+
 	if ( playback_rate != standard_rate || t != 1.0 )
 		play_period = long (playback_rate * clock_rate_ / (1000000.0 / clock_divisor * t));
 
@@ -161,17 +161,17 @@
 {
 	if ( header_.chip_flags & ~(namco_flag | vrc6_flag | fme7_flag) )
 		set_warning( "Uses unsupported audio expansion hardware" );
-	
+
 	{
 		#define APU_NAMES "Square 1", "Square 2", "Triangle", "Noise", "DMC"
-		
+
 		int const count = Nes_Apu::osc_count;
 		static const char* const apu_names [count] = { APU_NAMES };
 		set_voice_count( count );
 		set_voice_names( apu_names );
-		
+
 	}
-	
+
 	static int const types [] = {
 		wave_type | 1, wave_type | 2, wave_type | 0,
 		noise_type | 0, mixed_type | 1,
@@ -180,9 +180,9 @@
 		wave_type |10, wave_type |11, wave_type |12, wave_type |13
 	};
 	set_voice_types( types ); // common to all sound chip configurations
-	
+
 	double adjusted_gain = gain();
-	
+
 	#if NSF_EMU_APU_ONLY
 	{
 		if ( header_.chip_flags )
@@ -192,13 +192,13 @@
 	{
 		if ( header_.chip_flags & (namco_flag | vrc6_flag | fme7_flag) )
 			set_voice_count( Nes_Apu::osc_count + 3 );
-		
+
 		if ( header_.chip_flags & namco_flag )
 		{
 			namco = BLARGG_NEW Nes_Namco_Apu;
 			CHECK_ALLOC( namco );
 			adjusted_gain *= 0.75;
-			
+
 			int const count = Nes_Apu::osc_count + Nes_Namco_Apu::osc_count;
 			static const char* const names [count] = {
 				APU_NAMES,
@@ -208,13 +208,13 @@
 			set_voice_count( count );
 			set_voice_names( names );
 		}
-		
+
 		if ( header_.chip_flags & vrc6_flag )
 		{
 			vrc6 = BLARGG_NEW Nes_Vrc6_Apu;
 			CHECK_ALLOC( vrc6 );
 			adjusted_gain *= 0.75;
-			
+
 			{
 				int const count = Nes_Apu::osc_count + Nes_Vrc6_Apu::osc_count;
 				static const char* const names [count] = {
@@ -224,7 +224,7 @@
 				set_voice_count( count );
 				set_voice_names( names );
 			}
-			
+
 			if ( header_.chip_flags & namco_flag )
 			{
 				int const count = Nes_Apu::osc_count + Nes_Vrc6_Apu::osc_count +
@@ -239,13 +239,13 @@
 				set_voice_names( names );
 			}
 		}
-		
+
 		if ( header_.chip_flags & fme7_flag )
 		{
 			fme7 = BLARGG_NEW Nes_Fme7_Apu;
 			CHECK_ALLOC( fme7 );
 			adjusted_gain *= 0.75;
-			
+
 			int const count = Nes_Apu::osc_count + Nes_Fme7_Apu::osc_count;
 			static const char* const names [count] = {
 				APU_NAMES,
@@ -254,15 +254,15 @@
 			set_voice_count( count );
 			set_voice_names( names );
 		}
-		
+
 		if ( namco ) namco->volume( adjusted_gain );
 		if ( vrc6 ) vrc6 ->volume( adjusted_gain );
 		if ( fme7 ) fme7 ->volume( adjusted_gain );
 	}
 	#endif
-	
+
 	apu.volume( adjusted_gain );
-	
+
 	return 0;
 }
 
@@ -270,22 +270,22 @@
 {
 	assert( offsetof (header_t,unused [4]) == header_size );
 	RETURN_ERR( rom.load( in, header_size, &header_, 0 ) );
-	
+
 	set_track_count( header_.track_count );
 	RETURN_ERR( check_nsf_header( &header_ ) );
-	
+
 	if ( header_.vers != 1 )
 		set_warning( "Unknown file version" );
-	
+
 	// sound and memory
 	blargg_err_t err = init_sound();
 	if ( err )
 		return err;
-	
+
 	// set up data
-	nes_addr_t load_addr = get_le16( header_.load_addr );
-	init_addr = get_le16( header_.init_addr );
-	play_addr = get_le16( header_.play_addr );
+	nes_addr_t load_addr = GET_LE16( header_.load_addr );
+	init_addr = GET_LE16( header_.init_addr );
+	play_addr = GET_LE16( header_.play_addr );
 	if ( !load_addr ) load_addr = rom_begin;
 	if ( !init_addr ) init_addr = rom_begin;
 	if ( !play_addr ) play_addr = rom_begin;
@@ -296,10 +296,10 @@
 			w = "Corrupt file (invalid load/init/play address)";
 		return w;
 	}
-	
+
 	rom.set_addr( load_addr % bank_size );
 	int total_banks = rom.size() / bank_size;
-	
+
 	// bank switching
 	int first_bank = (load_addr - rom_begin) / bank_size;
 	for ( int i = 0; i < bank_count; i++ )
@@ -308,7 +308,7 @@
 		if ( bank >= (unsigned) total_banks )
 			bank = 0;
 		initial_banks [i] = bank;
-		
+
 		if ( header_.banks [i] )
 		{
 			// bank-switched
@@ -316,22 +316,22 @@
 			break;
 		}
 	}
-	
+
 	pal_only = (header_.speed_flags & 3) == 1;
-	
+
 	#if !NSF_EMU_EXTRA_FLAGS
 		header_.speed_flags = 0;
 	#endif
-	
+
 	set_tempo( tempo() );
-	
+
 	return setup_buffer( (long) (clock_rate_ + 0.5) );
 }
 
 void Nsf_Emu::update_eq( blip_eq_t const& eq )
 {
 	apu.treble_eq( eq );
-	
+
 	#if !NSF_EMU_APU_ONLY
 	{
 		if ( namco ) namco->treble_eq( eq );
@@ -349,7 +349,7 @@
 		return;
 	}
 	i -= Nes_Apu::osc_count;
-	
+
 	#if !NSF_EMU_APU_ONLY
 	{
 		if ( fme7 && i < Nes_Fme7_Apu::osc_count )
@@ -357,7 +357,7 @@
 			fme7->osc_output( i, buf );
 			return;
 		}
-		
+
 		if ( vrc6 )
 		{
 			if ( i < Nes_Vrc6_Apu::osc_count )
@@ -370,7 +370,7 @@
 			}
 			i -= Nes_Vrc6_Apu::osc_count;
 		}
-		
+
 		if ( namco && i < Nes_Namco_Apu::osc_count )
 		{
 			namco->osc_output( i, buf );
@@ -395,13 +395,13 @@
 			case Nes_Namco_Apu::data_reg_addr:
 				namco->write_data( time(), data );
 				return;
-			
+
 			case Nes_Namco_Apu::addr_reg_addr:
 				namco->write_addr( data );
 				return;
 			}
 		}
-		
+
 		if ( addr >= Nes_Fme7_Apu::latch_addr && fme7 )
 		{
 			switch ( addr & Nes_Fme7_Apu::addr_mask )
@@ -409,13 +409,13 @@
 			case Nes_Fme7_Apu::latch_addr:
 				fme7->write_latch( data );
 				return;
-			
+
 			case Nes_Fme7_Apu::data_addr:
 				fme7->write_data( time(), data );
 				return;
 			}
 		}
-		
+
 		if ( vrc6 )
 		{
 			unsigned reg = addr & (Nes_Vrc6_Apu::addr_step - 1);
@@ -428,20 +428,20 @@
 		}
 	}
 	#endif
-	
+
 	// unmapped write
-	
+
 	#ifndef NDEBUG
 	{
 		// some games write to $8000 and $8001 repeatedly
 		if ( addr == 0x8000 || addr == 0x8001 ) return;
-		
+
 		// probably namco sound mistakenly turned on in mck
 		if ( addr == 0x4800 || addr == 0xF800 ) return;
-		
+
 		// memory mapper?
 		if ( addr == 0xFFF8 ) return;
-		
+
 		debug_printf( "write_unmapped( 0x%04X, 0x%02X )\n", (unsigned) addr, (unsigned) data );
 	}
 	#endif
@@ -450,15 +450,15 @@
 blargg_err_t Nsf_Emu::start_track_( int track )
 {
 	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	
+
 	memset( low_mem, 0, sizeof low_mem );
 	memset( sram, 0, sizeof sram );
-	
+
 	cpu::reset( unmapped_code ); // also maps low_mem
 	cpu::map_code( sram_addr, sizeof sram, sram );
 	for ( int i = 0; i < bank_count; ++i )
 		cpu_write( bank_select_addr + i, initial_banks [i] );
-	
+
 	apu.reset( pal_only, (header_.speed_flags & 0x20) ? 0x3F : 0 );
 	apu.write_register( 0, 0x4015, 0x0F );
 	apu.write_register( 0, 0x4017, (header_.speed_flags & 0x10) ? 0x80 : 0 );
@@ -469,11 +469,11 @@
 		if ( fme7 ) fme7 ->reset();
 	}
 	#endif
-	
+
 	play_ready = 4;
 	play_extra = 0;
 	next_play = play_period / clock_divisor;
-	
+
 	saved_state.pc = badop_addr;
 	low_mem [0x1FF] = (badop_addr - 1) >> 8;
 	low_mem [0x1FE] = (badop_addr - 1) & 0xFF;
@@ -481,7 +481,7 @@
 	r.pc = init_addr;
 	r.a = track;
 	r.x = pal_only;
-	
+
 	return 0;
 }
 
@@ -513,7 +513,7 @@
 				}
 			}
 		}
-		
+
 		if ( time() >= next_play )
 		{
 			nes_time_t period = (play_period + play_extra) / clock_divisor;
@@ -524,7 +524,7 @@
 				check( saved_state.pc == badop_addr );
 				if ( r.pc != badop_addr )
 					saved_state = cpu::r;
-				
+
 				r.pc = play_addr;
 				low_mem [0x100 + r.sp--] = (badop_addr - 1) >> 8;
 				low_mem [0x100 + r.sp--] = (badop_addr - 1) & 0xFF;
@@ -532,21 +532,21 @@
 			}
 		}
 	}
-	
+
 	if ( cpu::error_count() )
 	{
 		cpu::clear_error_count();
 		set_warning( "Emulation error (illegal instruction)" );
 	}
-	
+
 	duration = time();
 	next_play -= duration;
 	check( next_play >= 0 );
 	if ( next_play < 0 )
 		next_play = 0;
-	
+
 	apu.end_frame( duration );
-	
+
 	#if !NSF_EMU_APU_ONLY
 	{
 		if ( namco ) namco->end_frame( duration );
@@ -554,6 +554,6 @@
 		if ( fme7 ) fme7 ->end_frame( duration );
 	}
 	#endif
-	
+
 	return 0;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Nsfe_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Nsfe_Emu.cxx Changed

@@ -54,7 +54,7 @@
 	RETURN_ERR( chars.resize( size + 1 ) );
 	chars [size] = 0; // in case last string doesn't have terminator
 	RETURN_ERR( in.read( &chars [0], size ) );
-	
+
 	RETURN_ERR( strs.resize( 128 ) );
 	int count = 0;
 	for ( int i = 0; i < size; i++ )
@@ -65,7 +65,7 @@
 		while ( i < size && chars [i] )
 			i++;
 	}
-	
+
 	return strs.resize( count );
 }
 
@@ -93,7 +93,7 @@
 {
 	int const nsfe_info_size = 16;
 	assert( offsetof (nsfe_info_t,unused [6]) == nsfe_info_size );
-	
+
 	// check header
 	byte signature [4];
 	blargg_err_t err = in.read( signature, sizeof signature );
@@ -101,13 +101,13 @@
 		return (err == in.eof_error ? gme_wrong_file_type : err);
 	if ( memcmp( signature, "NSFE", 4 ) )
 		return gme_wrong_file_type;
-	
+
 	// free previous info
 	track_name_data.clear();
 	track_names.clear();
 	playlist.clear();
 	track_times.clear();
-	
+
 	// default nsf header
 	static const Nsf_Emu::header_t base_header =
 	{
@@ -124,7 +124,7 @@
 	};
 	Nsf_Emu::header_t& header = info;
 	header = base_header;
-	
+
 	// parse tags
 	int phase = 0;
 	while ( phase != 3 )
@@ -132,22 +132,22 @@
 		// read size and tag
 		byte block_header [2] [4];
 		RETURN_ERR( in.read( block_header, sizeof block_header ) );
-		blargg_long size = get_le32( block_header [0] );
-		blargg_long tag = get_le32( block_header [1] );
-		
+		blargg_long size = GET_LE32( block_header [0] );
+		blargg_long tag = GET_LE32( block_header [1] );
+
 		//debug_printf( "tag: %c%c%c%c\n", char(tag), char(tag>>8), char(tag>>16), char(tag>>24) );
-		
+
 		switch ( tag )
 		{
 			case BLARGG_4CHAR('O','F','N','I'): {
 				check( phase == 0 );
 				if ( size < 8 )
 					return "Corrupt file";
-				
+
 				nsfe_info_t finfo;
 				finfo.track_count = 1;
 				finfo.first_track = 0;
-				
+
 				RETURN_ERR( in.read( &finfo, min( size, (blargg_long) nsfe_info_size ) ) );
 				if ( size > nsfe_info_size )
 					RETURN_ERR( in.skip( size - nsfe_info_size ) );
@@ -160,48 +160,48 @@
 				memcpy( info.load_addr, finfo.load_addr, 2 * 3 );
 				break;
 			}
-			
+
 			case BLARGG_4CHAR('K','N','A','B'):
 				if ( size > (int) sizeof info.banks )
 					return "Corrupt file";
 				RETURN_ERR( in.read( info.banks, size ) );
 				break;
-			
+
 			case BLARGG_4CHAR('h','t','u','a'): {
 				blargg_vector<char> chars;
 				blargg_vector<const char*> strs;
 				RETURN_ERR( read_strs( in, size, chars, strs ) );
 				int n = strs.size();
-				
+
 				if ( n > 3 )
 					copy_str( strs [3], info.dumper, sizeof info.dumper );
-				
+
 				if ( n > 2 )
 					copy_str( strs [2], info.copyright, sizeof info.copyright );
-				
+
 				if ( n > 1 )
 					copy_str( strs [1], info.author, sizeof info.author );
-				
+
 				if ( n > 0 )
 					copy_str( strs [0], info.game, sizeof info.game );
-				
+
 				break;
 			}
-			
+
 			case BLARGG_4CHAR('e','m','i','t'):
 				RETURN_ERR( track_times.resize( size / 4 ) );
 				RETURN_ERR( in.read( track_times.begin(), track_times.size() * 4 ) );
 				break;
-			
+
 			case BLARGG_4CHAR('l','b','l','t'):
 				RETURN_ERR( read_strs( in, size, track_name_data, track_names ) );
 				break;
-			
+
 			case BLARGG_4CHAR('t','s','l','p'):
 				RETURN_ERR( playlist.resize( size ) );
 				RETURN_ERR( in.read( &playlist [0], size ) );
 				break;
-			
+
 			case BLARGG_4CHAR('A','T','A','D'): {
 				check( phase == 1 );
 				phase = 2;
@@ -218,12 +218,12 @@
 				}
 				break;
 			}
-			
+
 			case BLARGG_4CHAR('D','N','E','N'):
 				check( phase == 2 );
 				phase = 3;
 				break;
-			
+
 			default:
 				// tags that can be skipped start with a lowercase character
 				check( islower( (tag >> 24) & 0xFF ) );
@@ -231,7 +231,7 @@
 				break;
 		}
 	}
-	
+
 	return 0;
 }
 
@@ -240,13 +240,13 @@
 	int remapped = remap_track( track );
 	if ( (unsigned) remapped < track_times.size() )
 	{
-		long length = (BOOST::int32_t) get_le32( track_times [remapped] );
+		long length = (int32_t) GET_LE32( track_times [remapped] );
 		if ( length > 0 )
 			out->length = length;
 	}
 	if ( (unsigned) remapped < track_names.size() )
 		Gme_File::copy_field_( out->song, track_names [remapped] );
-	
+
 	GME_COPY_FIELD( info, out, game );
 	GME_COPY_FIELD( info, out, author );
 	GME_COPY_FIELD( info, out, copyright );
@@ -277,9 +277,9 @@
 struct Nsfe_File : Gme_Info_
 {
 	Nsfe_Info info;
-	
+
 	Nsfe_File() { set_type( gme_nsfe_type ); }
-	
+
 	blargg_err_t load_( Data_Reader& in )
 	{
 		RETURN_ERR( info.load( in, 0 ) );
@@ -287,7 +287,7 @@
 		set_track_count( info.info.track_count );
 		return 0;
 	}
-	
+
 	blargg_err_t track_info_( track_info_t* out, int track ) const
 	{
 		return info.track_info_( out, track );
@@ -305,7 +305,7 @@
 {
 	if ( loading )
 		return Nsf_Emu::load_( in );
-	
+
 	// TODO: this hacky recursion-avoidance could have subtle problems
 	loading = true;
 	blargg_err_t err = info.load( in, this );

audacious-plugins-3.3.4.tar.bz2/src/console/Sap_Apu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Sap_Apu.cxx Changed

@@ -56,12 +56,12 @@
 	gen_poly( POLY_MASK( 4, 1, 0 ), sizeof poly4, poly4 );
 	gen_poly( POLY_MASK( 9, 5, 0 ), sizeof poly9, poly9 );
 	gen_poly( POLY_MASK( 17, 5, 0 ), sizeof poly17, poly17 );
-	
+
 	if ( 0 ) // comment out to recauculate poly5 constant
 	{
 		byte poly5 [4];
 		gen_poly( POLY_MASK( 5, 2, 0 ), sizeof poly5, poly5 );
-		blargg_ulong n = poly5 [3] * 0x1000000L + poly5 [2] * 0x10000L + 
+		blargg_ulong n = poly5 [3] * 0x1000000L + poly5 [2] * 0x10000L +
 				poly5 [1] * 0x100L + poly5 [0];
 		blargg_ulong rev = n & 1;
 		for ( int i = 1; i < poly5_len; i++ )
@@ -85,7 +85,7 @@
 	poly4_pos = 0;
 	polym_pos = 0;
 	control = 0;
-	
+
 	for ( int i = 0; i < osc_count; i++ )
 		memset( &oscs [i], 0, offsetof (osc_t,output) );
 }
@@ -96,11 +96,11 @@
 	int divider = 28;
 	if ( this->control & 1 )
 		divider = 114;
-	
+
 	for ( int i = 0; i < osc_count; i++ )
 	{
 		osc_t* const osc = &oscs [i];
-		
+
 		int const osc_reload = osc->regs [0]; // cache
 		blargg_long period = (osc_reload + 1) * divider;
 		static byte const fast_bits [osc_count] = { 1 << 6, 1 << 4, 1 << 5, 1 << 3 };
@@ -112,7 +112,7 @@
 				period = osc_reload * 0x100L + osc [-1].regs [0] + 7;
 				if ( !(this->control & fast_bits [i - 1]) )
 					period = (period - 6) * divider;
-				
+
 				if ( (osc [-1].regs [1] & 0x1F) > 0x10 )
 					debug_printf( "Use of slave channel in 16-bit mode not supported\n" );
 			}
@@ -125,7 +125,7 @@
 {
 	calc_periods();
 	Sap_Apu_Impl* const impl = this->impl; // cache
-	
+
 	// 17/9-bit poly selection
 	byte const* polym = impl->poly17;
 	int polym_len = poly17_len;
@@ -135,19 +135,19 @@
 		polym = impl->poly9;
 	}
 	polym_pos %= polym_len;
-	
+
 	for ( int i = 0; i < osc_count; i++ )
 	{
 		osc_t* const osc = &oscs [i];
 		blip_time_t time = last_time + osc->delay;
 		blip_time_t const period = osc->period;
-		
+
 		// output
 		Blip_Buffer* output = osc->output;
 		if ( output )
 		{
 			output->set_modified();
-			
+
 			int const osc_control = osc->regs [1]; // cache
 			int volume = (osc_control & 0x0F) * 2;
 			if ( !volume || osc_control & 0x10 || // silent, DAC mode, or inaudible frequency
@@ -155,14 +155,14 @@
 			{
 				if ( !(osc_control & 0x10) )
 					volume >>= 1; // inaudible frequency = half volume
-				
+
 				int delta = volume - osc->last_amp;
 				if ( delta )
 				{
 					osc->last_amp = volume;
 					impl->synth.offset( last_time, delta, output );
 				}
-				
+
 				// TODO: doesn't maintain high pass flip-flop (very minor issue)
 			}
 			else
@@ -182,7 +182,7 @@
 						volume = -volume;
 					}
 				}
-				
+
 				if ( time < end_time || time2 < end_time )
 				{
 					// poly source
@@ -206,7 +206,7 @@
 						poly_pos = (poly_pos + osc->delay) % poly_len;
 					}
 					poly_inc -= poly_len; // allows more optimized inner loop below
-					
+
 					// square/poly5 wave
 					blargg_ulong wave = poly5;
 					check( poly5 & 1 ); // low bit is set for pure wave
@@ -216,7 +216,7 @@
 						wave = run_poly5( wave, (osc->delay + poly5_pos) % poly5_len );
 						poly5_inc = period % poly5_len;
 					}
-					
+
 					// Run wave and high pass interleved with each catching up to the other.
 					// Disabled high pass has no performance effect since inner wave loop
 					// makes no compromise for high pass, and only runs once in that case.
@@ -238,7 +238,7 @@
 						}
 						while ( time2 <= time ) // must advance *past* time to avoid hang
 							time2 += period2;
-						
+
 						// run wave
 						blip_time_t end = end_time;
 						if ( end > time2 )
@@ -262,11 +262,11 @@
 						}
 					}
 					while ( time < end_time || time2 < end_time );
-					
+
 					osc->phase = poly_pos;
 					osc->last_amp = osc_last_amp;
 				}
-				
+
 				osc->invert = 0;
 				if ( volume < 0 )
 				{
@@ -276,7 +276,7 @@
 				}
 			}
 		}
-		
+
 		// maintain divider
 		blip_time_t remain = end_time - time;
 		if ( remain > 0 )
@@ -287,7 +287,7 @@
 		}
 		osc->delay = time - end_time;
 	}
-	
+
 	// advance polies
 	blip_time_t duration = end_time - last_time;
 	last_time = end_time;
@@ -329,6 +329,6 @@
 {
 	if ( end_time > last_time )
 		run_until( end_time );
-	
+
 	last_time -= end_time;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Sap_Apu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Sap_Apu.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Sap_Cpu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Sap_Cpu.cxx Changed

@@ -53,8 +53,6 @@
 	state_.base = 0;
 	irq_time_ = future_sap_time;
 	end_time_ = future_sap_time;
-	
-	blargg_verify_byte_order();
 }
 
 #define TIME (s_time + s.base)
@@ -82,7 +80,7 @@
 	this->state = &s;
 	fint32 s_time = s.time;
 	uint8_t* const mem = this->mem; // cache
-	
+
 	// registers
 	fuint16 pc = r.pc;
 	fuint8 a = r.a;
@@ -90,10 +88,10 @@
 	fuint8 y = r.y;
 	fuint16 sp;
 	SET_SP( r.sp );
-	
+
 	// status flags
 	#define IS_NEG (nz & 0x8080)
-	
+
 	#define CALC_STATUS( out ) do {\
 		out = status & (st_v | st_d | st_i);\
 		out |= ((nz >> 8) | nz) & st_n;\
@@ -107,7 +105,7 @@
 		c = nz;\
 		nz |= ~in & st_z;\
 	} while ( 0 )
-	
+
 	fuint8 status;
 	fuint16 c; // carry set if (c & 0x100) != 0
 	fuint16 nz; // Z set if (nz & 0xFF) == 0, N set if (nz & 0x8080) != 0
@@ -115,12 +113,12 @@
 		fuint8 temp = r.status;
 		SET_STATUS( temp );
 	}
-	
+
 	goto loop;
 dec_clock_loop:
 	s_time--;
 loop:
-	
+
 	#ifndef NDEBUG
 	{
 		sap_time_t correct = end_time_;
@@ -129,16 +127,16 @@
 		check( s.base == correct );
 	}
 	#endif
-	
+
 	check( (unsigned) GET_SP() < 0x100 );
 	check( (unsigned) a < 0x100 );
 	check( (unsigned) x < 0x100 );
 	check( (unsigned) y < 0x100 );
-	
+
 	fuint8 opcode = mem [pc];
 	pc++;
 	uint8_t const* instr = mem + pc;
-	
+
 	static uint8_t const clock_table [256] =
 	{// 0 1 2 3 4 5 6 7 8 9 A B C D E F
 		0,6,2,8,3,3,5,5,3,2,2,2,4,4,6,6,// 0
@@ -158,19 +156,19 @@
 		2,6,2,8,3,3,5,5,2,2,2,2,4,4,6,6,// E
 		3,5,2,8,4,4,6,6,2,4,2,7,4,4,7,7 // F
 	}; // 0x00 was 7
-	
+
 	fuint16 data;
 	data = clock_table [opcode];
 	if ( (s_time += data) >= 0 )
 		goto possibly_out_of_time;
 almost_out_of_time:
-	
+
 	data = *instr;
-	
+
 	#ifdef NES_CPU_LOG_H
 		nes_cpu_log( "cpu_log", pc - 1, opcode, instr [0], instr [1] );
 	#endif
-	
+
 	switch ( opcode )
 	{
 possibly_out_of_time:
@@ -195,12 +193,12 @@
 		out = temp + 0x100 * READ_LOW( uint8_t (data + 1) );\
 		cross( temp );\
 	}
-	
+
 #define IND_X( out ) {\
 		fuint16 temp = data + x;\
 		out = 0x100 * READ_LOW( uint8_t (temp + 1) ) + READ_LOW( uint8_t (temp) );\
 	}
-	
+
 #define ARITH_ADDR_MODES( op )\
 case op - 0x04: /* (ind,x) */\
 	IND_X( data )\
@@ -232,7 +230,7 @@
 // TODO: more efficient way to handle negative branch that wraps PC around
 #define BRANCH( cond )\
 {\
-	fint16 offset = (BOOST::int8_t) data;\
+	fint16 offset = (int8_t) data;\
 	fuint16 extra_clock = (++pc & 0xFF) + offset;\
 	if ( !(cond) ) goto dec_clock_loop;\
 	pc += offset;\
@@ -246,15 +244,15 @@
 		a = nz = READ_LOW( uint8_t (data + x) );
 		pc++;
 		goto loop;
-	
+
 	case 0xA5: // LDA zp
 		a = nz = READ_LOW( data );
 		pc++;
 		goto loop;
-	
+
 	case 0xD0: // BNE
 		BRANCH( (uint8_t) nz );
-	
+
 	case 0x20: { // JSR
 		fuint16 temp = pc + 1;
 		pc = GET_ADDR();
@@ -263,37 +261,37 @@
 		WRITE_LOW( sp, temp );
 		goto loop;
 	}
-	
+
 	case 0x4C: // JMP abs
 		pc = GET_ADDR();
 		goto loop;
-	
+
 	case 0xE8: // INX
 		INC_DEC_XY( x, 1 )
-	
+
 	case 0x10: // BPL
 		BRANCH( !IS_NEG )
-	
+
 	ARITH_ADDR_MODES( 0xC5 ) // CMP
 		nz = a - data;
 		pc++;
 		c = ~nz;
 		nz &= 0xFF;
 		goto loop;
-	
+
 	case 0x30: // BMI
 		BRANCH( IS_NEG )
-	
+
 	case 0xF0: // BEQ
 		BRANCH( !(uint8_t) nz );
-	
+
 	case 0x95: // STA zp,x
 		data = uint8_t (data + x);
 	case 0x85: // STA zp
 		pc++;
 		WRITE_LOW( data, a );
 		goto loop;
-	
+
 	case 0xC8: // INY
 		INC_DEC_XY( y, 1 )
 
@@ -301,12 +299,12 @@
 		y = a;
 		nz = a;
 		goto loop;
-	
+
 	case 0x98: // TYA
 		a = y;
 		nz = y;
 		goto loop;
-	
+
 	case 0xAD:{// LDA abs
 		unsigned addr = GET_ADDR();
 		pc += 2;
@@ -314,16 +312,16 @@
 		a = nz;
 		goto loop;
 	}
-	
+
 	case 0x60: // RTS
 		pc = 1 + READ_LOW( sp );
 		pc += 0x100 * READ_LOW( 0x100 | (sp - 0xFF) );
 		sp = (sp - 0xFE) | 0x100;
 		goto loop;
-	
+
 	{
 		fuint16 addr;
-		
+
 	case 0x99: // STA abs,Y
 		addr = y + GET_ADDR();
 		pc += 2;
@@ -333,7 +331,7 @@
 			goto loop;
 		}
 		goto sta_ptr;
-	
+
 	case 0x8D: // STA abs
 		addr = GET_ADDR();
 		pc += 2;
@@ -343,7 +341,7 @@
 			goto loop;
 		}
 		goto sta_ptr;
-	
+
 	case 0x9D: // STA abs,X (slightly more common than STA abs)
 		addr = x + GET_ADDR();
 		pc += 2;
@@ -357,19 +355,19 @@
 		WRITE( addr, a );
 		CACHE_TIME();
 		goto loop;
-		
+
 	case 0x91: // STA (ind),Y
 		IND_Y( NO_PAGE_CROSSING, addr )
 		pc++;
 		goto sta_ptr;
-	
+
 	case 0x81: // STA (ind,X)
 		IND_X( addr )
 		pc++;
 		goto sta_ptr;
-	
+
 	}
-	
+
 	case 0xA9: // LDA #imm
 		pc++;
 		a = data;
@@ -379,12 +377,12 @@
 	// common read instructions
 	{
 		fuint16 addr;
-		
+
 	case 0xA1: // LDA (ind,X)
 		IND_X( addr )
 		pc++;
 		goto a_nz_read_addr;
-	
+
 	case 0xB1:// LDA (ind),Y
 		addr = READ_LOW( data ) + y;
 		HANDLE_PAGE_CROSSING( addr );
@@ -394,7 +392,7 @@
 		if ( (addr ^ 0x8000) <= 0x9FFF )
 			goto loop;
 		goto a_nz_read_addr;
-	
+
 	case 0xB9: // LDA abs,Y
 		HANDLE_PAGE_CROSSING( data + y );
 		addr = GET_ADDR() + y;
@@ -403,7 +401,7 @@
 		if ( (addr ^ 0x8000) <= 0x9FFF )
 			goto loop;
 		goto a_nz_read_addr;
-	
+
 	case 0xBD: // LDA abs,X
 		HANDLE_PAGE_CROSSING( data + x );
 		addr = GET_ADDR() + x;
@@ -416,39 +414,39 @@
 		a = nz = READ( addr );
 		CACHE_TIME();
 		goto loop;
-	
+
 	}
 
 // Branch
 
 	case 0x50: // BVC
 		BRANCH( !(status & st_v) )
-	
+
 	case 0x70: // BVS
 		BRANCH( status & st_v )
-	
+
 	case 0xB0: // BCS
 		BRANCH( c & 0x100 )
-	
+
 	case 0x90: // BCC
 		BRANCH( !(c & 0x100) )
-	
+
 // Load/store
-	
+
 	case 0x94: // STY zp,x
 		data = uint8_t (data + x);
 	case 0x84: // STY zp
 		pc++;
 		WRITE_LOW( data, y );
 		goto loop;
-	
+
 	case 0x96: // STX zp,y
 		data = uint8_t (data + y);
 	case 0x86: // STX zp
 		pc++;
 		WRITE_LOW( data, x );
 		goto loop;
-	
+
 	case 0xB6: // LDX zp,y
 		data = uint8_t (data + y);
 	case 0xA6: // LDX zp
@@ -458,7 +456,7 @@
 		x = data;
 		nz = data;
 		goto loop;
-	
+
 	case 0xB4: // LDY zp,x
 		data = uint8_t (data + x);
 	case 0xA4: // LDY zp
@@ -468,7 +466,7 @@
 		y = data;
 		nz = data;
 		goto loop;
-	
+
 	case 0xBC: // LDY abs,X
 		data += x;
 		HANDLE_PAGE_CROSSING( data );
@@ -480,7 +478,7 @@
 		CACHE_TIME();
 		goto loop;
 	}
-	
+
 	case 0xBE: // LDX abs,y
 		data += y;
 		HANDLE_PAGE_CROSSING( data );
@@ -492,13 +490,13 @@
 		CACHE_TIME();
 		goto loop;
 	}
-	
+
 	{
 		fuint8 temp;
 	case 0x8C: // STY abs
 		temp = y;
 		goto store_abs;
-	
+
 	case 0x8E: // STX abs
 		temp = x;
 	store_abs:
@@ -525,7 +523,7 @@
 		CACHE_TIME();
 		goto cpx_data;
 	}
-	
+
 	case 0xE4: // CPX zp
 		data = READ_LOW( data );
 	case 0xE0: // CPX #imm
@@ -535,7 +533,7 @@
 		c = ~nz;
 		nz &= 0xFF;
 		goto loop;
-	
+
 	case 0xCC:{// CPY abs
 		unsigned addr = GET_ADDR();
 		pc++;
@@ -544,7 +542,7 @@
 		CACHE_TIME();
 		goto cpy_data;
 	}
-	
+
 	case 0xC4: // CPY zp
 		data = READ_LOW( data );
 	case 0xC0: // CPY #imm
@@ -554,24 +552,24 @@
 		c = ~nz;
 		nz &= 0xFF;
 		goto loop;
-	
+
 // Logical
 
 	ARITH_ADDR_MODES( 0x25 ) // AND
 		nz = (a &= data);
 		pc++;
 		goto loop;
-	
+
 	ARITH_ADDR_MODES( 0x45 ) // EOR
 		nz = (a ^= data);
 		pc++;
 		goto loop;
-	
+
 	ARITH_ADDR_MODES( 0x05 ) // ORA
 		nz = (a |= data);
 		pc++;
 		goto loop;
-	
+
 	case 0x2C:{// BIT abs
 		unsigned addr = GET_ADDR();
 		pc += 2;
@@ -583,7 +581,7 @@
 		nz <<= 8; // result must be zero, even if N bit is set
 		goto loop;
 	}
-	
+
 	case 0x24: // BIT zp
 		nz = READ_LOW( data );
 		pc++;
@@ -593,19 +591,19 @@
 			goto loop;
 		nz <<= 8; // result must be zero, even if N bit is set
 		goto loop;
-		
+
 // Add/subtract
 
 	ARITH_ADDR_MODES( 0xE5 ) // SBC
 	case 0xEB: // unofficial equivalent
 		data ^= 0xFF;
 		goto adc_imm;
-	
+
 	ARITH_ADDR_MODES( 0x65 ) // ADC
 	adc_imm: {
 		check( !(status & st_d) );
 		fint16 carry = c >> 8 & 1;
-		fint16 ov = (a ^ 0x80) + carry + (BOOST::int8_t) data; // sign-extend
+		fint16 ov = (a ^ 0x80) + carry + (int8_t) data; // sign-extend
 		status &= ~st_v;
 		status |= ov >> 2 & 0x40;
 		c = nz = a + data + carry;
@@ -613,7 +611,7 @@
 		a = (uint8_t) nz;
 		goto loop;
 	}
-	
+
 // Shift/rotate
 
 	case 0x4A: // LSR A
@@ -639,7 +637,7 @@
 		a = (uint8_t) nz;
 		goto loop;
 	}
-	
+
 	case 0x5E: // LSR abs,X
 		data += x;
 	case 0x4E: // LSR abs
@@ -653,11 +651,11 @@
 		c = temp << 8;
 		goto rotate_common;
 	}
-	
+
 	case 0x3E: // ROL abs,X
 		data += x;
 		goto rol_abs;
-	
+
 	case 0x1E: // ASL abs,X
 		data += x;
 	case 0x0E: // ASL abs
@@ -673,15 +671,15 @@
 		WRITE( data, (uint8_t) nz );
 		CACHE_TIME();
 		goto loop;
-	
+
 	case 0x7E: // ROR abs,X
 		data += x;
 		goto ror_abs;
-	
+
 	case 0x76: // ROR zp,x
 		data = uint8_t (data + x);
 		goto ror_zp;
-	
+
 	case 0x56: // LSR zp,x
 		data = uint8_t (data + x);
 	case 0x46: // LSR zp
@@ -693,11 +691,11 @@
 		c = temp << 8;
 		goto write_nz_zp;
 	}
-	
+
 	case 0x36: // ROL zp,x
 		data = uint8_t (data + x);
 		goto rol_zp;
-	
+
 	case 0x16: // ASL zp,x
 		data = uint8_t (data + x);
 	case 0x06: // ASL zp
@@ -707,21 +705,21 @@
 		nz = c >> 8 & 1;
 		nz |= (c = READ_LOW( data ) << 1);
 		goto write_nz_zp;
-	
+
 // Increment/decrement
 
 	case 0xCA: // DEX
 		INC_DEC_XY( x, -1 )
-	
+
 	case 0x88: // DEY
 		INC_DEC_XY( y, -1 )
-	
+
 	case 0xF6: // INC zp,x
 		data = uint8_t (data + x);
 	case 0xE6: // INC zp
 		nz = 1;
 		goto add_nz_zp;
-	
+
 	case 0xD6: // DEC zp,x
 		data = uint8_t (data + x);
 	case 0xC6: // DEC zp
@@ -732,21 +730,21 @@
 		pc++;
 		WRITE_LOW( data, nz );
 		goto loop;
-	
+
 	case 0xFE: // INC abs,x
 		data = x + GET_ADDR();
 		goto inc_ptr;
-	
+
 	case 0xEE: // INC abs
 		data = GET_ADDR();
 	inc_ptr:
 		nz = 1;
 		goto inc_common;
-	
+
 	case 0xDE: // DEC abs,x
 		data = x + GET_ADDR();
 		goto dec_ptr;
-	
+
 	case 0xCE: // DEC abs
 		data = GET_ADDR();
 	dec_ptr:
@@ -758,14 +756,14 @@
 		WRITE( data, (uint8_t) nz );
 		CACHE_TIME();
 		goto loop;
-		
+
 // Transfer
 
 	case 0xAA: // TAX
 		x = a;
 		nz = a;
 		goto loop;
-		
+
 	case 0x8A: // TXA
 		a = x;
 		nz = x;
@@ -774,22 +772,22 @@
 	case 0x9A: // TXS
 		SET_SP( x ); // verified (no flag change)
 		goto loop;
-	
+
 	case 0xBA: // TSX
 		x = nz = GET_SP();
 		goto loop;
-	
+
 // Stack
-	
+
 	case 0x48: // PHA
 		PUSH( a ); // verified
 		goto loop;
-		
+
 	case 0x68: // PLA
 		a = nz = READ_LOW( sp );
 		sp = (sp - 0xFF) | 0x100;
 		goto loop;
-		
+
 	case 0x40:{// RTI
 		fuint8 temp = READ_LOW( sp );
 		pc = READ_LOW( 0x100 | (sp - 0xFF) );
@@ -809,7 +807,7 @@
 		}
 		goto loop;
 	}
-	
+
 	case 0x28:{// PLP
 		fuint8 temp = READ_LOW( sp );
 		sp = (sp - 0xFF) | 0x100;
@@ -821,14 +819,14 @@
 			goto handle_sei;
 		goto handle_cli;
 	}
-	
+
 	case 0x08: { // PHP
 		fuint8 temp;
 		CALC_STATUS( temp );
 		PUSH( temp | (st_b | st_r) );
 		goto loop;
 	}
-	
+
 	case 0x6C:{// JMP (ind)
 		data = GET_ADDR();
 		pc = READ_PROG( data );
@@ -836,32 +834,32 @@
 		pc |= 0x100 * READ_PROG( data );
 		goto loop;
 	}
-	
+
 	case 0x00: // BRK
 		goto handle_brk;
-	
+
 // Flags
 
 	case 0x38: // SEC
 		c = (unsigned) ~0;
 		goto loop;
-	
+
 	case 0x18: // CLC
 		c = 0;
 		goto loop;
-		
+
 	case 0xB8: // CLV
 		status &= ~st_v;
 		goto loop;
-	
+
 	case 0xD8: // CLD
 		status &= ~st_d;
 		goto loop;
-	
+
 	case 0xF8: // SED
 		status |= st_d;
 		goto loop;
-	
+
 	case 0x58: // CLI
 		if ( !(status & st_i) )
 			goto loop;
@@ -879,7 +877,7 @@
 		s_time += delta;
 		if ( s_time < 0 )
 			goto loop;
-		
+
 		if ( delta >= s_time + 1 )
 		{
 			// delayed irq until after next instruction
@@ -892,7 +890,7 @@
 		debug_printf( "Delayed CLI not emulated\n" );
 		goto loop;
 	}
-	
+
 	case 0x78: // SEI
 		if ( status & st_i )
 			goto loop;
@@ -907,9 +905,9 @@
 		debug_printf( "Delayed SEI not emulated\n" );
 		goto loop;
 	}
-	
+
 // Unofficial
-	
+
 	// SKW - Skip word
 	case 0x1C: case 0x3C: case 0x5C: case 0x7C: case 0xDC: case 0xFC:
 		HANDLE_PAGE_CROSSING( data + x );
@@ -920,17 +918,17 @@
 	case 0x80: case 0x82: case 0x89: case 0xC2: case 0xD4: case 0xE2: case 0xF4:
 		pc++;
 		goto loop;
-	
+
 	// NOP
 	case 0xEA: case 0x1A: case 0x3A: case 0x5A: case 0x7A: case 0xDA: case 0xFA:
 		goto loop;
-	
+
 // Unimplemented
-	
+
 	// halt
 	//case 0x02: case 0x12: case 0x22: case 0x32: case 0x42: case 0x52:
 	//case 0x62: case 0x72: case 0x92: case 0xB2: case 0xD2: case 0xF2:
-	
+
 	default:
 		assert( (unsigned) opcode <= 0xFF );
 		illegal_encountered = true;
@@ -938,7 +936,7 @@
 		goto stop;
 	}
 	assert( false );
-	
+
 	int result_;
 handle_brk:
 	if ( (pc - 1) >= idle_addr )
@@ -946,15 +944,15 @@
 	pc++;
 	result_ = 4;
 	debug_printf( "BRK executed\n" );
-	
+
 interrupt:
 	{
 		s_time += 7;
-		
+
 		WRITE_LOW( 0x100 | (sp - 1), pc >> 8 );
 		WRITE_LOW( 0x100 | (sp - 2), pc );
 		pc = GET_LE16( &READ_PROG( 0xFFFA ) + result_ );
-		
+
 		sp = (sp - 3) | 0x100;
 		fuint8 temp;
 		CALC_STATUS( temp );
@@ -962,17 +960,17 @@
 		if ( result_ )
 			temp |= st_b; // TODO: incorrectly sets B flag for IRQ
 		WRITE_LOW( sp, temp );
-		
+
 		status &= ~st_d;
 		status |= st_i;
 		this->r.status = status; // update externally-visible I flag
-		
+
 		blargg_long delta = s.base - end_time_;
 		s.base = end_time_;
 		s_time += delta;
 		goto loop;
 	}
-	
+
 idle_done:
 	//s_time = 0;
 	pc--;
@@ -986,26 +984,26 @@
 		goto interrupt;
 	if ( s_time < 0 )
 		goto loop;
-	
+
 stop:
-	
+
 	s.time = s_time;
-	
+
 	r.pc = pc;
 	r.sp = GET_SP();
 	r.a = a;
 	r.x = x;
 	r.y = y;
-	
+
 	{
 		fuint8 temp;
 		CALC_STATUS( temp );
 		r.status = temp;
 	}
-	
+
 	this->state_ = s;
 	this->state = &this->state_;
-	
+
 	return illegal_encountered;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Sap_Cpu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Sap_Cpu.h Changed

@@ -12,39 +12,37 @@
 
 class Sap_Cpu {
 public:
-	typedef BOOST::uint8_t uint8_t;
-	
 	// Clear all registers and keep pointer to 64K memory passed in
 	void reset( void* mem_64k );
-	
+
 	// Run until specified time is reached. Returns true if suspicious/unsupported
 	// instruction was encountered at any point during run.
 	bool run( sap_time_t end_time );
-	
+
 	// Registers are not updated until run() returns (except I flag in status)
 	struct registers_t {
-		BOOST::uint16_t pc;
-		BOOST::uint8_t a;
-		BOOST::uint8_t x;
-		BOOST::uint8_t y;
-		BOOST::uint8_t status;
-		BOOST::uint8_t sp;
+		uint16_t pc;
+		uint8_t a;
+		uint8_t x;
+		uint8_t y;
+		uint8_t status;
+		uint8_t sp;
 	};
 	registers_t r;
-	
+
 	enum { idle_addr = 0xFEFF };
-	
+
 	// Time of beginning of next instruction to be executed
 	sap_time_t time() const             { return state->time + state->base; }
 	void set_time( sap_time_t t )       { state->time = t - state->base; }
 	void adjust_time( int delta )       { state->time += delta; }
-	
+
 	sap_time_t irq_time() const         { return irq_time_; }
 	void set_irq_time( sap_time_t );
-	
+
 	sap_time_t end_time() const         { return end_time_; }
 	void set_end_time( sap_time_t );
-	
+
 public:
 	Sap_Cpu() { state = &state_; }
 	enum { irq_inhibit = 0x04 };
@@ -58,7 +56,7 @@
 	sap_time_t irq_time_;
 	sap_time_t end_time_;
 	uint8_t* mem;
-	
+
 	inline sap_time_t update_end_time( sap_time_t end, sap_time_t irq );
 };

audacious-plugins-3.3.4.tar.bz2/src/console/Sap_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Sap_Emu.cxx Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Sap_Emu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Sap_Emu.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Sms_Apu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Sms_Apu.cxx Changed

@@ -78,7 +78,7 @@
 				synth->offset( time, delta, output );
 			}
 		}
-		
+
 		time += delay;
 		if ( time < end_time )
 		{
@@ -115,7 +115,7 @@
 	int amp = volume;
 	if ( shifter & 1 )
 		amp = -amp;
-	
+
 	{
 		int delta = amp - last_amp;
 		if ( delta )
@@ -124,11 +124,11 @@
 			synth.offset( time, delta, output );
 		}
 	}
-	
+
 	time += delay;
 	if ( !volume )
 		time = end_time;
-	
+
 	if ( time < end_time )
 	{
 		Blip_Buffer* const output = this->output;
@@ -137,7 +137,7 @@
 		int period = *this->period * 2;
 		if ( !period )
 			period = 16;
-		
+
 		do
 		{
 			int changed = shifter + 1;
@@ -150,7 +150,7 @@
 			time += period;
 		}
 		while ( time < end_time );
-		
+
 		this->shifter = shifter;
 		this->last_amp = delta >> 1;
 	}
@@ -167,7 +167,7 @@
 		oscs [i] = &squares [i];
 	}
 	oscs [3] = &noise;
-	
+
 	volume( 1.0 );
 	reset();
 }
@@ -210,7 +210,7 @@
 {
 	last_time = 0;
 	latch = 0;
-	
+
 	if ( !feedback || !noise_width )
 	{
 		feedback = 0x0009;
@@ -224,7 +224,7 @@
 		noise_feedback = (noise_feedback << 1) | (feedback & 1);
 		feedback >>= 1;
 	}
-	
+
 	squares [0].reset();
 	squares [1].reset();
 	squares [2].reset();
@@ -234,7 +234,7 @@
 void Sms_Apu::run_until( blip_time_t end_time )
 {
 	require( end_time >= last_time ); // end_time must not be before previous time
-	
+
 	if ( end_time > last_time )
 	{
 		// run oscillators
@@ -250,7 +250,7 @@
 					noise.run( last_time, end_time );
 			}
 		}
-		
+
 		last_time = end_time;
 	}
 }
@@ -259,7 +259,7 @@
 {
 	if ( end_time > last_time )
 		run_until( end_time );
-	
+
 	assert( last_time >= end_time );
 	last_time -= end_time;
 }
@@ -267,9 +267,9 @@
 void Sms_Apu::write_ggstereo( blip_time_t time, int data )
 {
 	require( (unsigned) data <= 0xFF );
-	
+
 	run_until( time );
-	
+
 	for ( int i = 0; i < osc_count; i++ )
 	{
 		Sms_Osc& osc = *oscs [i];
@@ -297,12 +297,12 @@
 void Sms_Apu::write_data( blip_time_t time, int data )
 {
 	require( (unsigned) data <= 0xFF );
-	
+
 	run_until( time );
-	
+
 	if ( data & 0x80 )
 		latch = data;
-	
+
 	int index = (latch >> 5) & 3;
 	if ( latch & 0x10 )
 	{
@@ -323,7 +323,7 @@
 			noise.period = &noise_periods [select];
 		else
 			noise.period = &squares [2].period;
-		
+
 		noise.feedback = (data & 0x04) ? noise_feedback : looped_feedback;
 		noise.shifter = 0x8000;
 	}

audacious-plugins-3.3.4.tar.bz2/src/console/Sms_Apu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Sms_Apu.h Changed

@@ -10,34 +10,34 @@
 public:
 	// Set overall volume of all oscillators, where 1.0 is full volume
 	void volume( double );
-	
+
 	// Set treble equalization
 	void treble_eq( const blip_eq_t& );
-	
+
 	// Outputs can be assigned to a single buffer for mono output, or to three
 	// buffers for stereo output (using Stereo_Buffer to do the mixing).
-	
+
 	// Assign all oscillator outputs to specified buffer(s). If buffer
 	// is NULL, silences all oscillators.
 	void output( Blip_Buffer* mono );
 	void output( Blip_Buffer* center, Blip_Buffer* left, Blip_Buffer* right );
-	
+
 	// Assign single oscillator output to buffer(s). Valid indicies are 0 to 3,
 	// which refer to Square 1, Square 2, Square 3, and Noise. If buffer is NULL,
 	// silences oscillator.
 	enum { osc_count = 4 };
 	void osc_output( int index, Blip_Buffer* mono );
 	void osc_output( int index, Blip_Buffer* center, Blip_Buffer* left, Blip_Buffer* right );
-	
+
 	// Reset oscillators and internal state
 	void reset( unsigned noise_feedback = 0, int noise_width = 0 );
-	
+
 	// Write GameGear left/right assignment byte
 	void write_ggstereo( blip_time_t, int );
-	
+
 	// Write to data port
 	void write_data( blip_time_t, int );
-	
+
 	// Run all oscillators up to specified time, end current frame, then
 	// start a new frame at time 0.
 	void end_frame( blip_time_t );
@@ -49,7 +49,7 @@
 	// noncopyable
 	Sms_Apu( const Sms_Apu& );
 	Sms_Apu& operator = ( const Sms_Apu& );
-	
+
 	Sms_Osc*    oscs [osc_count];
 	Sms_Square  squares [3];
 	Sms_Square::Synth square_synth; // used by squares
@@ -58,7 +58,7 @@
 	Sms_Noise   noise;
 	unsigned    noise_feedback;
 	unsigned    looped_feedback;
-	
+
 	void run_until( blip_time_t );
 };

audacious-plugins-3.3.4.tar.bz2/src/console/Sms_Oscs.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Sms_Oscs.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Snes_Spc.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Snes_Spc.cxx Changed

@@ -33,14 +33,14 @@
 {
 	memset( &m, 0, sizeof m );
 	dsp.init( RAM );
-	
+
 	m.tempo = tempo_unit;
-	
+
 	// Most SPC music doesn't need ROM, and almost all the rest only rely
 	// on these two bytes
 	m.rom [0x3E] = 0xFF;
 	m.rom [0x3F] = 0xC0;
-	
+
 	static unsigned char const cycle_table [128] =
 	{// 01 23 45 67 89 AB CD EF
 	 0x28,0x47,0x34,0x36,0x26,0x54,0x54,0x68, // 0
@@ -60,7 +60,7 @@
 	 0x28,0x47,0x34,0x36,0x24,0x53,0x43,0x40, // E
 	 0x48,0x47,0x45,0x56,0x34,0x54,0x22,0x60, // F
 	};
-	
+
 	// unpack cycle table
 	for ( int i = 0; i < 128; i++ )
 	{
@@ -68,11 +68,11 @@
 		m.cycle_table [i * 2 + 0] = n >> 4;
 		m.cycle_table [i * 2 + 1] = n & 0x0F;
 	}
-	
+
 	#if SPC_LESS_ACCURATE
 		memcpy( reg_times, reg_times_, sizeof reg_times );
 	#endif
-	
+
 	reset();
 	return 0;
 }
@@ -87,7 +87,7 @@
 	m.tempo = t;
 	int const timer2_shift = 4; // 64 kHz
 	int const other_shift = 3; // 8 kHz
-	
+
 	#if SPC_DISABLE_TEMPO
 		m.timers [2].prescaler = timer2_shift;
 		m.timers [1].prescaler = timer2_shift + other_shift;
@@ -117,7 +117,7 @@
 		t->enabled = REGS [r_control] >> i & 1;
 		t->counter = REGS_IN [r_t0out + i] & 0x0F;
 	}
-	
+
 	set_tempo( m.tempo );
 }
 
@@ -126,7 +126,7 @@
 {
 	memcpy( REGS, in, reg_count );
 	memcpy( REGS_IN, REGS, reg_count );
-	
+
 	// These always read back as 0
 	REGS_IN [r_test ] = 0;
 	REGS_IN [r_control ] = 0;
@@ -141,7 +141,7 @@
 {
 	m.rom_enabled = 0;
 	load_regs( &RAM [0xF0] );
-	
+
 	// Put STOP instruction around memory to catch PC underflow/overflow
 	memset( m.ram.padding1, cpu_pad_fill, sizeof m.ram.padding1 );
 	memset( m.ram.padding2, cpu_pad_fill, sizeof m.ram.padding2 );
@@ -163,16 +163,16 @@
 	#if SPC_LESS_ACCURATE
 		m.dsp_time = clocks_per_sample + 1;
 	#endif
-	
+
 	for ( int i = 0; i < timer_count; i++ )
 	{
 		Timer* t = &m.timers [i];
 		t->next_time = 1;
 		t->divider = 0;
 	}
-	
+
 	regs_loaded();
-	
+
 	m.extra_clocks = 0;
 	reset_buf();
 }
@@ -182,16 +182,16 @@
 	int i;
 	for ( i = 0; i < timer_count; i++ )
 		REGS_IN [r_t0out + i] = timer_counter_init;
-	
+
 	// Run IPL ROM
 	memset( &m.cpu_regs, 0, sizeof m.cpu_regs );
 	m.cpu_regs.pc = rom_addr;
-	
+
 	REGS [r_test ] = 0x0A;
 	REGS [r_control] = 0xB0; // ROM enabled, clear ports
 	for ( i = 0; i < port_count; i++ )
 		REGS_IN [r_cpuio0 + i] = 0;
-	
+
 	reset_time_regs();
 }
 
@@ -215,17 +215,17 @@
 blargg_err_t Snes_Spc::load_spc( void const* data, long size )
 {
 	spc_file_t const* const spc = (spc_file_t const*) data;
-	
+
 	// be sure compiler didn't insert any padding into fle_t
 	assert( sizeof (spc_file_t) == spc_min_file_size + 0x80 );
-	
+
 	// Check signature and file size
 	if ( size < signature_size || memcmp( spc, signature, 27 ) )
 		return "Not an SPC file";
-	
+
 	if ( size < spc_min_file_size )
 		return "Corrupt SPC file";
-	
+
 	// CPU registers
 	m.cpu_regs.pc = spc->pch * 0x100 + spc->pcl;
 	m.cpu_regs.a = spc->a;
@@ -233,16 +233,16 @@
 	m.cpu_regs.y = spc->y;
 	m.cpu_regs.psw = spc->psw;
 	m.cpu_regs.sp = spc->sp;
-	
+
 	// RAM and registers
 	memcpy( RAM, spc->ram, 0x10000 );
 	ram_loaded();
-	
+
 	// DSP registers
 	dsp.load( spc->dsp );
-	
+
 	reset_time_regs();
-	
+
 	return 0;
 }
 
@@ -267,42 +267,42 @@
 	sample_t* out = m.extra_buf;
 	while ( out < &m.extra_buf [extra_size / 2] )
 		*out++ = 0;
-	
+
 	m.extra_pos = out;
 	m.buf_begin = 0;
-	
+
 	dsp.set_output( 0, 0 );
 }
 
 void Snes_Spc::set_output( sample_t* out, int size )
 {
 	require( (size & 1) == 0 ); // size must be even
-	
+
 	m.extra_clocks &= clocks_per_sample - 1;
 	if ( out )
 	{
 		sample_t const* out_end = out + size;
 		m.buf_begin = out;
 		m.buf_end = out_end;
-		
+
 		// Copy extra to output
 		sample_t const* in = m.extra_buf;
 		while ( in < m.extra_pos && out < out_end )
 			*out++ = *in++;
-		
+
 		// Handle output being full already
 		if ( out >= out_end )
 		{
 			// Have DSP write to remaining extra space
 			out = dsp.extra();
 			out_end = &dsp.extra() [extra_size];
-			
+
 			// Copy any remaining extra samples as if DSP wrote them
 			while ( in < m.extra_pos )
 				*out++ = *in++;
 			assert( out <= out_end );
 		}
-		
+
 		dsp.set_output( out, out_end - out );
 	}
 	else
@@ -321,7 +321,7 @@
 		main_end = dsp_end;
 		dsp_end = dsp.extra(); // nothing in DSP's extra
 	}
-	
+
 	// Copy any extra samples at these ends into extra_buf
 	sample_t* out = m.extra_buf;
 	sample_t const* in;
@@ -329,7 +329,7 @@
 		*out++ = *in;
 	for ( in = dsp.extra(); in < dsp_end ; in++ )
 		*out++ = *in;
-	
+
 	m.extra_pos = out;
 	assert( out <= &m.extra_buf [extra_size] );
 }
@@ -342,7 +342,7 @@
 		set_output( out, count );
 		end_frame( count * (clocks_per_sample / 2) );
 	}
-	
+
 	const char* err = m.cpu_error;
 	m.cpu_error = 0;
 	return err;
@@ -354,27 +354,27 @@
 	if ( count > 2 * sample_rate * 2 )
 	{
 		set_output( 0, 0 );
-		
+
 		// Skip a multiple of 4 samples
 		time_t end = count;
 		count = (count & 3) + 1 * sample_rate * 2;
 		end = (end - count) * (clocks_per_sample / 2);
-		
+
 		m.skipped_kon = 0;
 		m.skipped_koff = 0;
-		
+
 		// Preserve DSP and timer synchronization
 		// TODO: verify that this really preserves it
 		int old_dsp_time = m.dsp_time + m.spc_time;
 		m.dsp_time = end - m.spc_time + skipping_time;
 		end_frame( end );
 		m.dsp_time = m.dsp_time - skipping_time + old_dsp_time;
-		
+
 		dsp.write( Spc_Dsp::r_koff, m.skipped_koff & ~m.skipped_kon );
 		dsp.write( Spc_Dsp::r_kon , m.skipped_kon );
 		clear_echo();
 	}
 	#endif
-	
+
 	return play( count, 0 );
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Snes_Spc.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Snes_Spc.h Changed

@@ -9,16 +9,14 @@
 
 struct Snes_Spc {
 public:
-	typedef BOOST::uint8_t uint8_t;
-	
 	// Must be called once before using
 	blargg_err_t init();
-	
+
 	// Sample pairs generated per second
 	enum { sample_rate = 32000 };
-	
+
 // Emulator use
-	
+
 	// Sets IPL ROM data. Library does not include ROM data. Most SPC music files
 	// don't need ROM, but a full emulator must provide this.
 	enum { rom_size = 0x40 };
@@ -43,7 +41,7 @@
 	typedef int time_t;
 	enum { clock_rate = 1024000 };
 	enum { clocks_per_sample = 32 };
-	
+
 	// Emulated port read/write at specified time
 	enum { port_count = 4 };
 	int  read_port ( time_t, int port );
@@ -51,18 +49,18 @@
 
 	// Runs SPC to end_time and starts a new time frame at 0
 	void end_frame( time_t end_time );
-	
+
 // Sound control
-	
+
 	// Mutes voices corresponding to non-zero bits in mask (issues repeated KOFF events).
 	// Reduces emulation accuracy.
 	enum { voice_count = 8 };
 	void mute_voices( int mask );
-	
+
 	// If true, prevents channels and global volumes from being phase-negated.
 	// Only supported by fast DSP.
 	void disable_surround( bool disable = true );
-	
+
 	// Sets tempo, where tempo_unit = normal, tempo_unit / 2 = half speed, etc.
 	enum { tempo_unit = 0x100 };
 	void set_tempo( int );
@@ -73,17 +71,17 @@
 	enum { spc_min_file_size = 0x10180 };
 	enum { spc_file_size     = 0x10200 };
 	blargg_err_t load_spc( void const* in, long size );
-	
+
 	// Clears echo region. Useful after loading an SPC as many have garbage in echo.
 	void clear_echo();
 
 	// Plays for count samples and write samples to out. Discards samples if out
 	// is NULL. Count must be a multiple of 2 since output is stereo.
 	blargg_err_t play( int count, sample_t* out );
-	
+
 	// Skips count samples. Several times faster than play() when using fast DSP.
 	blargg_err_t skip( int count );
-	
+
 // State save/load (only available with accurate DSP)
 
 #if !SPC_NO_COPY_STATE_FUNCS
@@ -91,7 +89,7 @@
 	enum { state_size = 67 * 1024L }; // maximum space needed when saving
 	typedef Spc_Dsp::copy_func_t copy_func_t;
 	void copy_state( unsigned char** io, copy_func_t );
-	
+
 	// Writes minimal header to spc_out
 	static void init_header( void* spc_out );
 
@@ -116,20 +114,16 @@
 		int sp;
 	};
 	regs_t& smp_regs() { return m.cpu_regs; }
-	
+
 	uint8_t* smp_ram() { return m.ram.ram; }
-	
+
 	void run_until( time_t t ) { run_until_( t ); }
-public:
-	BLARGG_DISABLE_NOTHROW
-	
-	typedef BOOST::uint16_t uint16_t;
-	
+
 	// Time relative to m_spc_time. Speeds up code a bit by eliminating need to
 	// constantly add m_spc_time to time from CPU. CPU uses time that ends at
 	// 0 to eliminate reloading end time every instruction. It pays off.
 	typedef int rel_time_t;
-	
+
 	struct Timer
 	{
 		rel_time_t next_time; // time of next event
@@ -142,46 +136,46 @@
 	enum { reg_count = 0x10 };
 	enum { timer_count = 3 };
 	enum { extra_size = Spc_Dsp::extra_size };
-	
+
 	enum { signature_size = 35 };
-	
+
 private:
 	Spc_Dsp dsp;
-	
+
 	#if SPC_LESS_ACCURATE
 		static signed char const reg_times_ [256];
 		signed char reg_times [256];
 	#endif
-	
+
 	struct state_t
 	{
 		Timer timers [timer_count];
-		
+
 		uint8_t smp_regs [2] [reg_count];
-		
+
 		regs_t cpu_regs;
-		
+
 		rel_time_t  dsp_time;
 		time_t      spc_time;
 		bool        echo_accessed;
-		
+
 		int         tempo;
 		int         skipped_kon;
 		int         skipped_koff;
 		const char* cpu_error;
-		
+
 		int         extra_clocks;
 		sample_t*   buf_begin;
 		sample_t const* buf_end;
 		sample_t*   extra_pos;
 		sample_t    extra_buf [extra_size];
-		
+
 		int         rom_enabled;
 		uint8_t     rom    [rom_size];
 		uint8_t     hi_ram [rom_size];
-		
+
 		unsigned char cycle_table [256];
-		
+
 		struct
 		{
 			// padding to neutralize address overflow
@@ -194,14 +188,14 @@
 		} ram;
 	};
 	state_t m;
-	
+
 	enum { rom_addr = 0xFFC0 };
-	
+
 	enum { skipping_time = 127 };
-	
+
 	// Value that padding should be filled with
 	enum { cpu_pad_fill = 0xFF };
-	
+
 	enum {
         r_test     = 0x0, r_control  = 0x1,
         r_dspaddr  = 0x2, r_dspdata  = 0x3,
@@ -211,7 +205,7 @@
         r_t0target = 0xA, r_t1target = 0xB, r_t2target = 0xC,
         r_t0out    = 0xD, r_t1out    = 0xE, r_t2out    = 0xF
 	};
-	
+
 	void timers_loaded();
 	void enable_rom( int enable );
 	void reset_buf();
@@ -221,7 +215,7 @@
 	void regs_loaded();
 	void reset_time_regs();
 	void reset_common( int timer_counter_init );
-	
+
 	Timer* run_timer_      ( Timer* t, rel_time_t );
 	Timer* run_timer       ( Timer* t, rel_time_t );
 	int dsp_read           ( rel_time_t );
@@ -233,10 +227,10 @@
 	int cpu_read_smp_reg   ( int i, rel_time_t );
 	int cpu_read           ( int addr, rel_time_t );
 	unsigned CPU_mem_bit   ( uint8_t const* pc, rel_time_t );
-	
+
 	bool check_echo_access ( int addr );
 	uint8_t* run_until_( time_t end_time );
-	
+
 	struct spc_file_t
 	{
 		char    signature [signature_size];
@@ -256,7 +250,7 @@
 	};
 
 	static char const signature [signature_size + 1];
-	
+
 	void save_regs( uint8_t out [reg_count] );
 };
 
@@ -277,7 +271,7 @@
 }
 
 inline void Snes_Spc::mute_voices( int mask ) { dsp.mute_voices( mask ); }
-	
+
 inline void Snes_Spc::disable_surround( bool disable ) { dsp.disable_surround( disable ); }
 
 #if !SPC_NO_COPY_STATE_FUNCS

audacious-plugins-3.3.4.tar.bz2/src/console/Spc_Cpu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Spc_Cpu.cxx Changed

@@ -51,7 +51,7 @@
 {
 	int elapsed = TIMER_DIV( t, time - t->next_time ) + 1;
 	t->next_time += TIMER_MUL( t, elapsed );
-	
+
 	if ( t->enabled )
 	{
 		int remain = IF_0_THEN_256( t->period - t->divider );
@@ -95,7 +95,7 @@
 
 #if SPC_LESS_ACCURATE
 	int const max_reg_time = 29;
-	
+
 	signed char const Snes_Spc::reg_times_ [256] =
 	{
 		 -1, 0,-11,-10,-15,-11, -2, -2, 4, 3, 14, 14, 26, 26, 14, 22,
@@ -106,7 +106,7 @@
 		 14, 15, 12, 13, 8, 12, 13, 13, 19, 18, 14, 14, -2,-36, 14, 24,
 		 17, 18, 15, 16, 11, 15, 16, 16, 22, 21, 14, 14, 28, -3, 14, 25,
 		 20, 21, 18, 19, 14, 18, 19, 19, 25, 24, 14, 14, 14, 29, 14, 25,
-		 
+
 		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
 		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
 		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
@@ -116,7 +116,7 @@
 		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
 		 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29,
 	};
-	
+
 	#define RUN_DSP( time, offset ) \
 		int count = (time) - (offset) - m.dsp_time;\
 		if ( count >= 0 )\
@@ -141,13 +141,13 @@
 int Snes_Spc::dsp_read( rel_time_t time )
 {
 	RUN_DSP( time, reg_times [REGS [r_dspaddr] & 0x7F] );
-	
+
 	int result = dsp.read( REGS [r_dspaddr] & 0x7F );
-	
+
 	#ifdef SPC_DSP_READ_HOOK
 		SPC_DSP_READ_HOOK( spc_time + time, (REGS [r_dspaddr] & 0x7F), result );
 	#endif
-	
+
 	return result;
 }
 
@@ -160,7 +160,7 @@
 			int r = REGS [r_dspaddr];
 			if ( r == Spc_Dsp::r_kon )
 				m.skipped_kon |= data & ~dsp.read( Spc_Dsp::r_koff );
-			
+
 			if ( r == Spc_Dsp::r_koff )
 			{
 				m.skipped_koff |= data;
@@ -168,11 +168,11 @@
 			}
 		}
 	#endif
-	
+
 	#ifdef SPC_DSP_WRITE_HOOK
 		SPC_DSP_WRITE_HOOK( m.spc_time + time, REGS [r_dspaddr], (uint8_t) data );
 	#endif
-	
+
 	if ( REGS [r_dspaddr] <= 0x7F )
 		dsp.write( REGS [r_dspaddr], data );
 	else if ( !SPC_MORE_ACCURACY )
@@ -193,7 +193,7 @@
 #elif !defined (NDEBUG)
 	// Debug-only check for read/write within echo buffer, since this might result in
 	// inaccurate emulation due to the DSP not being caught up to the present.
-	
+
 	bool Snes_Spc::check_echo_access( int addr )
 	{
 		if ( !(dsp.read( Spc_Dsp::r_flg ) & 0x20) )
@@ -212,7 +212,7 @@
 		}
 		return false;
 	}
-	
+
 	#define MEM_ACCESS( time, addr ) check( !check_echo_access( (uint16_t) addr ) );
 #else
 	#define MEM_ACCESS( time, addr )
@@ -240,7 +240,7 @@
 	0xA6,0x3F,0x26,0x07,0x7C,0x24,0x14,0x07,0x78,0x22,0x16,0x04,0x46,0x12,0x0A,0x02,
 	0xA6,0x41,0x2C,0x0A,0x7E,0x28,0x11,0x05,0x73,0x1B,0x14,0x05,0x3D,0x11,0x0A,0x02,
 	0x70,0x22,0x17,0x05,0x48,0x13,0x08,0x03,0x3C,0x07,0x0D,0x07,0x26,0x07,0x06,0x01,
-	
+
 	0xE0,0x9F,0xDA,0x7C,0x4F,0x18,0x28,0x0D,0xE9,0x9F,0xDA,0x7C,0x4F,0x18,0x1F,0x07,
 	0xE6,0x97,0xD8,0x72,0x64,0x13,0x26,0x09,0xDC,0x67,0xA9,0x38,0x21,0x07,0x15,0x06,
 	0xE9,0x91,0xD2,0x6B,0x63,0x14,0x2B,0x0E,0xD6,0x61,0xB7,0x41,0x2B,0x0E,0x10,0x09,
@@ -257,7 +257,7 @@
 	0xA6,0x35,0x82,0x1A,0x20,0x0C,0x0E,0x04,0x80,0x1F,0x53,0x0F,0x0B,0x02,0x06,0x01,
 	0xA6,0x31,0x81,0x1B,0x1D,0x01,0x08,0x08,0x7B,0x20,0x4D,0x19,0x0E,0x05,0x07,0x03,
 	0x6B,0x17,0x49,0x07,0x0E,0x03,0x0A,0x05,0x37,0x0B,0x1F,0x06,0x04,0x02,0x07,0x01,
-	
+
 	0xF0,0xD6,0xED,0xAD,0xEC,0xB1,0xEB,0x79,0xAC,0x22,0x47,0x1E,0x6E,0x1B,0x32,0x0A,
 	0xF0,0xD6,0xEA,0xA4,0xED,0xC4,0xDE,0x82,0x98,0x1F,0x50,0x13,0x52,0x15,0x2A,0x0A,
 	0xF1,0xD1,0xEB,0xA2,0xEB,0xB7,0xD8,0x69,0xA2,0x1F,0x5B,0x18,0x55,0x18,0x2C,0x0A,
@@ -304,7 +304,7 @@
 						((period - 1) | ~0x0F) & period )
 				{
 					//debug_printf( "SPC pathological timer target write\n" );
-					
+
 					// If the period is 3, 5, or 9, there's a probability this behavior won't occur,
 					// based on the previous period
 					int prob = 0xFF;
@@ -312,13 +312,13 @@
 					if ( period == 3 ) prob = glitch_probs [0] [old_period];
 					if ( period == 5 ) prob = glitch_probs [1] [old_period];
 					if ( period == 9 ) prob = glitch_probs [2] [old_period];
-					
+
 					// The glitch suppresses incrementing of one of the counter bits, based on
 					// the lowest set bit in the new period
 					int b = 1;
 					while ( !(period & b) )
 						b <<= 1;
-					
+
 					if ( (rand() >> 4 & 0xFF) <= prob )
 						t->divider = (t->divider - b) & 0xFF;
 				}
@@ -327,28 +327,28 @@
 		}
 		break;
 	}
-	
+
 	case r_t0out:
 	case r_t1out:
 	case r_t2out:
 		if ( !SPC_MORE_ACCURACY )
 			debug_printf( "SPC wrote to counter %d\n", (int) addr - r_t0out );
-		
+
 		if ( data < no_read_before_write / 2 )
 			run_timer( &m.timers [addr - r_t0out], time - 1 )->counter = 0;
 		break;
-	
+
 	// Registers that act like RAM
 	case 0x8:
 	case 0x9:
 		REGS_IN [addr] = (uint8_t) data;
 		break;
-	
+
 	case r_test:
 		if ( (uint8_t) data != 0x0A )
 			debug_printf( "SPC wrote to test register\n" );
 		break;
-	
+
 	case r_control:
 		// port clears
 		if ( data & 0x10 )
@@ -361,7 +361,7 @@
 			REGS_IN [r_cpuio2] = 0;
 			REGS_IN [r_cpuio3] = 0;
 		}
-		
+
 		// timers
 		{
 			for ( int i = 0; i < timer_count; i++ )
@@ -414,7 +414,7 @@
 void Snes_Spc::cpu_write( int data, int addr, rel_time_t time )
 {
 	MEM_ACCESS( time, addr )
-	
+
 	// RAM
 	RAM [addr] = (uint8_t) data;
 	int reg = addr - 0xF0;
@@ -424,14 +424,14 @@
 		if ( reg < reg_count ) // 87%
 		{
 			REGS [reg] = (uint8_t) data;
-			
+
 			// Ports
 			#ifdef SPC_PORT_WRITE_HOOK
 				if ( (unsigned) (reg - r_cpuio0) < port_count )
 					SPC_PORT_WRITE_HOOK( m.spc_time + time, (reg - r_cpuio0),
 							(uint8_t) data, &REGS [r_cpuio0] );
 			#endif
-			
+
 			// Registers other than $F2 and $F4-$F7
 			//if ( reg != 2 && reg != 4 && reg != 5 && reg != 6 && reg != 7 )
 			// TODO: this is a bit on the fragile side
@@ -468,7 +468,7 @@
 int Snes_Spc::cpu_read( int addr, rel_time_t time )
 {
 	MEM_ACCESS( time, addr )
-	
+
 	// RAM
 	int result = RAM [addr];
 	int reg = addr - 0xF0;
@@ -478,7 +478,7 @@
 		if ( (unsigned) reg >= 0xFF00 ) // 21%
 		{
 			reg += 0x10 - r_t0out;
-			
+
 			// Timers
 			if ( (unsigned) reg < timer_count ) // 90%
 			{
@@ -500,7 +500,7 @@
 			}
 		}
 	}
-	
+
 	return result;
 }
 
@@ -509,7 +509,7 @@
 
 // Prefix and suffix for CPU emulator function
 #define SPC_CPU_RUN_FUNC \
-BOOST::uint8_t* Snes_Spc::run_until_( time_t end_time )\
+uint8_t* Snes_Spc::run_until_( time_t end_time )\
 {\
 	rel_time_t rel_time = m.spc_time - end_time;\
 	assert( rel_time <= 0 );\
@@ -537,25 +537,25 @@
 	// would exceed end, does NOT execute it and leaves m.spc_time < end.
 	if ( end_time > m.spc_time )
 		run_until_( end_time );
-	
+
 	m.spc_time -= end_time;
 	m.extra_clocks += end_time;
-	
+
 	// Greatest number of clocks early that emulation can stop early due to
 	// not being able to execute current instruction without going over
 	// allowed time.
 	assert( -cpu_lag_max <= m.spc_time && m.spc_time <= 0 );
-	
+
 	// Catch timers up to CPU
 	for ( int i = 0; i < timer_count; i++ )
 		run_timer( &m.timers [i], 0 );
-	
+
 	// Catch DSP up to CPU
 	if ( m.dsp_time < 0 )
 	{
 		RUN_DSP( 0, max_reg_time );
 	}
-	
+
 	// Save any extra samples beyond what should be generated
 	if ( m.buf_begin )
 		save_extra();

audacious-plugins-3.3.4.tar.bz2/src/console/Spc_Cpu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Spc_Cpu.h Changed

@@ -172,33 +172,33 @@
 	int c;
 	int nz;
 	int dp;
-	
+
 	SET_PC( m.cpu_regs.pc );
 	SET_SP( m.cpu_regs.sp );
 	SET_PSW( m.cpu_regs.psw );
-	
+
 	goto loop;
-	
-	
+
+
 	// Main loop
-	
+
 cbranch_taken_loop:
-	pc += *(BOOST::int8_t const*) pc;
+	pc += *(int8_t const*) pc;
 inc_pc_loop:
 	pc++;
 loop:
 {
 	unsigned opcode;
 	unsigned data;
-	
+
 	check( (unsigned) a < 0x100 );
 	check( (unsigned) x < 0x100 );
 	check( (unsigned) y < 0x100 );
-	
+
 	opcode = *pc;
 	if ( (rel_time += m.cycle_table [opcode]) > 0 )
 		goto out_of_time;
-	
+
 	#ifdef SPC_CPU_OPCODE_HOOK
 		SPC_CPU_OPCODE_HOOK( GET_PC(), opcode );
 	#endif
@@ -211,43 +211,43 @@
 				pc [len] == 0xF0 && pc [len+1] == 0xFE - len;\
 		SUB_CASE_COUNTER( op && cond );\
 	}
-	
+
 	PROFILE_TIMER_LOOP( 0xEC, GET_LE16( pc + 1 ), 3 );
 	PROFILE_TIMER_LOOP( 0xEB, pc [1], 2 );
 	PROFILE_TIMER_LOOP( 0xE4, pc [1], 2 );
 	*/
-	
+
 	// TODO: if PC is at end of memory, this will get wrong operand (very obscure)
 	data = *++pc;
 	switch ( opcode )
 	{
-	
+
 // Common instructions
 
 #define BRANCH( cond )\
 {\
 	pc++;\
-	pc += (BOOST::int8_t) data;\
+	pc += (int8_t) data;\
 	if ( cond )\
 		goto loop;\
-	pc -= (BOOST::int8_t) data;\
+	pc -= (int8_t) data;\
 	rel_time -= 2;\
 	goto loop;\
 }
 
 	case 0xF0: // BEQ
 		BRANCH( !(uint8_t) nz ) // 89% taken
-	
+
 	case 0xD0: // BNE
 		BRANCH( (uint8_t) nz )
-	
+
 	case 0x3F:{// CALL
 		int old_addr = GET_PC() + 2;
 		SET_PC( READ_PC16( pc ) );
 		PUSH16( old_addr );
 		goto loop;
 	}
-	
+
 	case 0x6F:// RET
 		#if SPC_NO_SP_WRAPAROUND
 		{
@@ -261,19 +261,19 @@
 			sp += 2;
 			if ( addr < 0x1FF )
 				goto loop;
-			
+
 			SET_PC( sp [-0x101] * 0x100 + ram [(uint8_t) addr + 0x100] );
 			sp -= 0x100;
 		}
 		#endif
 		goto loop;
-	
+
 	case 0xE4: // MOV a,dp
 		++pc;
 		// 80% from timer
 		READ_DP_TIMER( 0, data, a = nz );
 		goto loop;
-	
+
 	case 0xFA:{// MOV dp,dp
 		int temp;
 		READ_DP_TIMER( -2, data, temp );
@@ -283,7 +283,7 @@
 	case 0x8F:{// MOV dp,#imm
 		int temp = READ_PC( pc + 1 );
 		pc += 2;
-		
+
 		#if !SPC_MORE_ACCURACY
 		{
 			int i = dp + temp;
@@ -292,7 +292,7 @@
 			if ( (unsigned) i < 0x10 ) // 76%
 			{
 				REGS [i] = (uint8_t) data;
-				
+
 				// Registers other than $F2 and $F4-$F7
 				//if ( i != 2 && i != 4 && i != 5 && i != 6 && i != 7 )
 				if ( ((~0x2F00 << (bits_in_int - 16)) << i) < 0 ) // 12%
@@ -304,7 +304,7 @@
 		#endif
 		goto loop;
 	}
-	
+
 	case 0xC4: // MOV dp,a
 		++pc;
 		#if !SPC_MORE_ACCURACY
@@ -316,7 +316,7 @@
 			{
 				unsigned sel = i - 2;
 				REGS [i] = (uint8_t) a;
-				
+
 				if ( sel == 1 ) // 51% $F3
 					dsp_write( a, rel_time );
 				else if ( sel > 1 ) // 1% not $F2 or $F3
@@ -327,7 +327,7 @@
 			WRITE_DP( 0, data, a );
 		#endif
 		goto loop;
-	
+
 #define CASE( n ) case n:
 
 // Define common address modes based on opcode for immediate mode. Execution
@@ -371,25 +371,25 @@
 	ADDR_MODES_NO_DP( 0xE8 ) // MOV A,addr
 		a = nz = READ( 0, data );
 		goto inc_pc_loop;
-	
+
 	case 0xBF:{// MOV A,(X)+
 		int temp = x + dp;
 		x = (uint8_t) (x + 1);
 		a = nz = READ( -1, temp );
 		goto loop;
 	}
-	
+
 	case 0xE8: // MOV A,imm
 		a = data;
 		nz = data;
 		goto inc_pc_loop;
-	
+
 	case 0xF9: // MOV X,dp+Y
 		data = (uint8_t) (data + y);
 	case 0xF8: // MOV X,dp
 		READ_DP_TIMER( 0, data, x = nz );
 		goto inc_pc_loop;
-	
+
 	case 0xE9: // MOV X,abs
 		data = READ_PC16( pc );
 		++pc;
@@ -398,7 +398,7 @@
 		x = data;
 		nz = data;
 		goto inc_pc_loop;
-	
+
 	case 0xFB: // MOV Y,dp+X
 		data = (uint8_t) (data + x);
 	case 0xEB: // MOV Y,dp
@@ -406,7 +406,7 @@
 		pc++;
 		READ_DP_TIMER( 0, data, y = nz );
 		goto loop;
-	
+
 	case 0xEC:{// MOV Y,abs
 		int temp = READ_PC16( pc );
 		pc += 2;
@@ -414,18 +414,18 @@
 		//y = nz = READ( 0, temp );
 		goto loop;
 	}
-	
+
 	case 0x8D: // MOV Y,imm
 		y = data;
 		nz = data;
 		goto inc_pc_loop;
-	
+
 // 2. 8-BIT DATA TRANSMISSION COMMANDS, GROUP 2
 
 	ADDR_MODES_NO_DP( 0xC8 ) // MOV addr,A
 		WRITE( 0, data, a );
 		goto inc_pc_loop;
-	
+
 	{
 		int temp;
 	case 0xCC: // MOV abs,Y
@@ -438,13 +438,13 @@
 		pc += 2;
 		goto loop;
 	}
-	
+
 	case 0xD9: // MOV dp+Y,X
 		data = (uint8_t) (data + y);
 	case 0xD8: // MOV dp,X
 		WRITE( 0, data + dp, x );
 		goto inc_pc_loop;
-	
+
 	case 0xDB: // MOV dp+X,Y
 		data = (uint8_t) (data + x);
 	case 0xCB: // MOV dp,Y
@@ -452,44 +452,44 @@
 		goto inc_pc_loop;
 
 // 3. 8-BIT DATA TRANSMISSIN COMMANDS, GROUP 3.
-	
+
 	case 0x7D: // MOV A,X
 		a = x;
 		nz = x;
 		goto loop;
-	
+
 	case 0xDD: // MOV A,Y
 		a = y;
 		nz = y;
 		goto loop;
-	
+
 	case 0x5D: // MOV X,A
 		x = a;
 		nz = a;
 		goto loop;
-	
+
 	case 0xFD: // MOV Y,A
 		y = a;
 		nz = a;
 		goto loop;
-	
+
 	case 0x9D: // MOV X,SP
 		x = nz = GET_SP();
 		goto loop;
-	
+
 	case 0xBD: // MOV SP,X
 		SET_SP( x );
 		goto loop;
-	
+
 	//case 0xC6: // MOV (X),A (handled by MOV addr,A in group 2)
-	
+
 	case 0xAF: // MOV (X)+,A
 		WRITE_DP( 0, x, a + no_read_before_write );
 		x++;
 		goto loop;
-	
+
 // 5. 8-BIT LOGIC OPERATION COMMANDS
-	
+
 #define LOGICAL_OP( op, func )\
 	ADDR_MODES( op ) /* addr */\
 		data = READ( 0, data );\
@@ -513,13 +513,13 @@
 		WRITE( 0, addr, nz );\
 		goto loop;\
 	}
-	
+
 	LOGICAL_OP( 0x28, & ); // AND
-	
+
 	LOGICAL_OP( 0x08, | ); // OR
-	
+
 	LOGICAL_OP( 0x48, ^ ); // EOR
-	
+
 // 4. 8-BIT ARITHMETIC OPERATION COMMANDS
 
 	ADDR_MODES( 0x68 ) // CMP addr
@@ -529,14 +529,14 @@
 		c = ~nz;
 		nz &= 0xFF;
 		goto inc_pc_loop;
-	
+
 	case 0x79: // CMP (X),(Y)
 		data = READ_DP( -2, y );
 		nz = READ_DP( -1, x ) - data;
 		c = ~nz;
 		nz &= 0xFF;
 		goto loop;
-	
+
 	case 0x69: // CMP dp,dp
 		data = READ_DP( -3, data );
 	case 0x78: // CMP dp,imm
@@ -544,7 +544,7 @@
 		c = ~nz;
 		nz &= 0xFF;
 		goto inc_pc_loop;
-	
+
 	case 0x3E: // CMP X,dp
 		data += dp;
 		goto cmp_x_addr;
@@ -558,7 +558,7 @@
 		c = ~nz;
 		nz &= 0xFF;
 		goto inc_pc_loop;
-	
+
 	case 0x7E: // CMP Y,dp
 		data += dp;
 		goto cmp_y_addr;
@@ -572,7 +572,7 @@
 		c = ~nz;
 		nz &= 0xFF;
 		goto inc_pc_loop;
-	
+
 	{
 		int addr;
 	case 0xB9: // SBC (x),(y)
@@ -590,7 +590,7 @@
 	adc_addr:
 		nz = READ( -1, addr );
 		goto adc_data;
-		
+
 // catch ADC and SBC together, then decode later based on operand
 #undef CASE
 #define CASE( n ) case n: case (n) + 0x20:
@@ -604,11 +604,11 @@
 		int flags;
 		if ( opcode >= 0xA0 ) // SBC
 			data ^= 0xFF;
-		
+
 		flags = data ^ nz;
 		nz += data + (c >> 8 & 1);
 		flags ^= nz;
-		
+
 		psw = (psw & ~(v40 | h08)) |
 				(flags >> 1 & h08) |
 				((flags + 0x80) >> 2 & v40);
@@ -621,9 +621,9 @@
 		WRITE( 0, addr, /*(uint8_t)*/ nz );
 		goto inc_pc_loop;
 	}
-	
+
 	}
-	
+
 // 6. ADDITION & SUBTRACTION COMMANDS
 
 #define INC_DEC_REG( reg, op )\
@@ -634,7 +634,7 @@
 	case 0xBC: INC_DEC_REG( a, + 1 ) // INC A
 	case 0x3D: INC_DEC_REG( x, + 1 ) // INC X
 	case 0xFC: INC_DEC_REG( y, + 1 ) // INC Y
-	
+
 	case 0x9C: INC_DEC_REG( a, - 1 ) // DEC A
 	case 0x1D: INC_DEC_REG( x, - 1 ) // DEC X
 	case 0xDC: INC_DEC_REG( y, - 1 ) // DEC Y
@@ -655,7 +655,7 @@
 		nz += READ( -1, data );
 		WRITE( 0, data, /*(uint8_t)*/ nz );
 		goto inc_pc_loop;
-	
+
 // 7. SHIFT, ROTATION COMMANDS
 
 	case 0x5C: // LSR A
@@ -666,7 +666,7 @@
 		a = nz;
 		goto loop;
 	}
-	
+
 	case 0x1C: // ASL A
 		c = 0;
 	case 0x3C:{// ROL A
@@ -676,7 +676,7 @@
 		a = (uint8_t) nz;
 		goto loop;
 	}
-	
+
 	case 0x0B: // ASL dp
 		c = 0;
 		data += dp;
@@ -698,7 +698,7 @@
 		nz |= (c = READ( -1, data ) << 1);
 		WRITE( 0, data, /*(uint8_t)*/ nz );
 		goto inc_pc_loop;
-	
+
 	case 0x4B: // LSR dp
 		c = 0;
 		data += dp;
@@ -735,12 +735,12 @@
 		y = READ_DP( 0, (uint8_t) (data + 1) );
 		nz |= y;
 		goto inc_pc_loop;
-	
+
 	case 0xDA: // MOVW dp,YA
 		WRITE_DP( -1, data, a );
 		WRITE_DP( 0, (uint8_t) (data + 1), y + no_read_before_write );
 		goto inc_pc_loop;
-	
+
 // 9. 16-BIT OPERATION COMMANDS
 
 	case 0x3A: // INCW dp
@@ -752,33 +752,33 @@
 		temp += (opcode >> 4 & 2) - 1; // +1 for INCW, -1 for DECW
 		nz = ((temp >> 1) | temp) & 0x7F;
 		WRITE( -2, data, /*(uint8_t)*/ temp );
-		
+
 		// high byte
 		data = (uint8_t) (data + 1) + dp;
 		temp = (uint8_t) ((temp >> 8) + READ( -1, data ));
 		nz |= temp;
 		WRITE( 0, data, temp );
-		
+
 		goto inc_pc_loop;
 	}
-		
+
 	case 0x7A: // ADDW YA,dp
 	case 0x9A:{// SUBW YA,dp
 		int lo = READ_DP( -2, data );
 		int hi = READ_DP( 0, (uint8_t) (data + 1) );
 		int result;
 		int flags;
-		
+
 		if ( opcode == 0x9A ) // SUBW
 		{
 			lo = (lo ^ 0xFF) + 1;
 			hi ^= 0xFF;
 		}
-		
+
 		lo += a;
 		result = y + hi + (lo >> 8);
 		flags = hi ^ y ^ result;
-		
+
 		psw = (psw & ~(v40 | h08)) |
 				(flags >> 1 & h08) |
 				((flags + 0x80) >> 2 & v40);
@@ -787,10 +787,10 @@
 		result = (uint8_t) result;
 		y = result;
 		nz = (((lo >> 1) | lo) & 0x7F) | result;
-		
+
 		goto inc_pc_loop;
 	}
-	
+
 	case 0x5A: { // CMPW YA,dp
 		int temp = a - READ_DP( -1, data );
 		nz = ((temp >> 1) | temp) & 0x7F;
@@ -801,7 +801,7 @@
 		nz &= 0xFF;
 		goto inc_pc_loop;
 	}
-	
+
 // 10. MULTIPLICATION & DIVISON COMMANDS
 
 	case 0xCF: { // MUL YA
@@ -812,19 +812,19 @@
 		nz |= y;
 		goto loop;
 	}
-	
+
 	case 0x9E: // DIV YA,X
 	{
 		unsigned ya = y * 0x100 + a;
-		
+
 		psw &= ~(h08 | v40);
-		
+
 		if ( y >= x )
 			psw |= v40;
-		
+
 		if ( (y & 15) >= (x & 15) )
 			psw |= h08;
-		
+
 		if ( y < x * 2 )
 		{
 			a = ya / x;
@@ -835,15 +835,15 @@
 			a = 255 - (ya - x * 0x200) / (256 - x);
 			y = x + (ya - x * 0x200) % (256 - x);
 		}
-		
+
 		nz = (uint8_t) a;
 		a = (uint8_t) a;
-		
+
 		goto loop;
 	}
-	
+
 // 11. DECIMAL COMPENSATION COMMANDS
-	
+
 	case 0xDF: // DAA
 		SUSPICIOUS_OPCODE( "DAA" );
 		if ( a > 0x99 || c & 0x100 )
@@ -851,14 +851,14 @@
 			a += 0x60;
 			c = 0x100;
 		}
-		
+
 		if ( (a & 0x0F) > 9 || psw & h08 )
 			a += 0x06;
-		
+
 		nz = a;
 		a = (uint8_t) a;
 		goto loop;
-	
+
 	case 0xBE: // DAS
 		SUSPICIOUS_OPCODE( "DAS" );
 		if ( a > 0x99 || !(c & 0x100) )
@@ -866,38 +866,38 @@
 			a -= 0x60;
 			c = 0;
 		}
-		
+
 		if ( (a & 0x0F) > 9 || !(psw & h08) )
 			a -= 0x06;
-		
+
 		nz = a;
 		a = (uint8_t) a;
 		goto loop;
-	
+
 // 12. BRANCHING COMMANDS
 
 	case 0x2F: // BRA rel
-		pc += (BOOST::int8_t) data;
+		pc += (int8_t) data;
 		goto inc_pc_loop;
-	
+
 	case 0x30: // BMI
 		BRANCH( (nz & nz_neg_mask) )
-	
+
 	case 0x10: // BPL
 		BRANCH( !(nz & nz_neg_mask) )
-	
+
 	case 0xB0: // BCS
 		BRANCH( c & 0x100 )
-	
+
 	case 0x90: // BCC
 		BRANCH( !(c & 0x100) )
-	
+
 	case 0x70: // BVS
 		BRANCH( psw & v40 )
-	
+
 	case 0x50: // BVC
 		BRANCH( !(psw & v40) )
-	
+
 	#define CBRANCH( cond )\
 	{\
 		pc++;\
@@ -906,7 +906,7 @@
 		rel_time -= 2;\
 		goto inc_pc_loop;\
 	}
-	
+
 	case 0x03: // BBS dp.bit,rel
 	case 0x23:
 	case 0x43:
@@ -916,7 +916,7 @@
 	case 0xC3:
 	case 0xE3:
 		CBRANCH( READ_DP( -4, data ) >> (opcode >> 5) & 1 )
-	
+
 	case 0x13: // BBC dp.bit,rel
 	case 0x33:
 	case 0x53:
@@ -926,7 +926,7 @@
 	case 0xD3:
 	case 0xF3:
 		CBRANCH( !(READ_DP( -4, data ) >> (opcode >> 5) & 1) )
-	
+
 	case 0xDE: // CBNE dp+X,rel
 		data = (uint8_t) (data + x);
 		// fall through
@@ -936,26 +936,26 @@
 		READ_DP_TIMER( -4, data, temp );
 		CBRANCH( temp != a )
 	}
-	
+
 	case 0x6E: { // DBNZ dp,rel
 		unsigned temp = READ_DP( -4, data ) - 1;
 		WRITE_DP( -3, (uint8_t) data, /*(uint8_t)*/ temp + no_read_before_write );
 		CBRANCH( temp )
 	}
-	
+
 	case 0xFE: // DBNZ Y,rel
 		y = (uint8_t) (y - 1);
 		BRANCH( y )
-	
+
 	case 0x1F: // JMP [abs+X]
 		SET_PC( READ_PC16( pc ) + x );
 		// fall through
 	case 0x5F: // JMP abs
 		SET_PC( READ_PC16( pc ) );
 		goto loop;
-	
+
 // 13. SUB-ROUTINE CALL RETURN COMMANDS
-	
+
 	case 0x0F:{// BRK
 		int temp;
 		int ret_addr = GET_PC();
@@ -967,14 +967,14 @@
 		PUSH( temp );
 		goto loop;
 	}
-	
+
 	case 0x4F:{// PCALL offset
 		int ret_addr = GET_PC() + 1;
 		SET_PC( 0xFF00 | data );
 		PUSH16( ret_addr );
 		goto loop;
 	}
-	
+
 	case 0x01: // TCALL n
 	case 0x11:
 	case 0x21:
@@ -996,7 +996,7 @@
 		PUSH16( ret_addr );
 		goto loop;
 	}
-	
+
 // 14. STACK OPERATION COMMANDS
 
 	{
@@ -1012,7 +1012,7 @@
 		SET_PSW( temp );
 		goto loop;
 	}
-	
+
 	case 0x0D: { // PUSH PSW
 		int temp;
 		GET_PSW( temp );
@@ -1023,27 +1023,27 @@
 	case 0x2D: // PUSH A
 		PUSH( a );
 		goto loop;
-	
+
 	case 0x4D: // PUSH X
 		PUSH( x );
 		goto loop;
-	
+
 	case 0x6D: // PUSH Y
 		PUSH( y );
 		goto loop;
-	
+
 	case 0xAE: // POP A
 		POP( a );
 		goto loop;
-	
+
 	case 0xCE: // POP X
 		POP( x );
 		goto loop;
-	
+
 	case 0xEE: // POP Y
 		POP( y );
 		goto loop;
-	
+
 // 15. BIT OPERATION COMMANDS
 
 	case 0x02: // SET1
@@ -1070,7 +1070,7 @@
 		WRITE( 0, data, (READ( -1, data ) & mask) | bit );
 		goto inc_pc_loop;
 	}
-		
+
 	case 0x0E: // TSET1 abs
 	case 0x4E: // TCLR1 abs
 		data = READ_PC16( pc );
@@ -1084,32 +1084,32 @@
 			WRITE( 0, data, temp );
 		}
 		goto loop;
-	
+
 	case 0x4A: // AND1 C,mem.bit
 		c &= MEM_BIT( 0 );
 		pc += 2;
 		goto loop;
-	
+
 	case 0x6A: // AND1 C,/mem.bit
 		c &= ~MEM_BIT( 0 );
 		pc += 2;
 		goto loop;
-	
+
 	case 0x0A: // OR1 C,mem.bit
 		c |= MEM_BIT( -1 );
 		pc += 2;
 		goto loop;
-	
+
 	case 0x2A: // OR1 C,/mem.bit
 		c |= ~MEM_BIT( -1 );
 		pc += 2;
 		goto loop;
-	
+
 	case 0x8A: // EOR1 C,mem.bit
 		c ^= MEM_BIT( -1 );
 		pc += 2;
 		goto loop;
-	
+
 	case 0xEA: // NOT1 mem.bit
 		data = READ_PC16( pc );
 		pc += 2;
@@ -1119,7 +1119,7 @@
 			WRITE( 0, data & 0x1FFF, temp );
 		}
 		goto loop;
-	
+
 	case 0xCA: // MOV1 mem.bit,C
 		data = READ_PC16( pc );
 		pc += 2;
@@ -1130,53 +1130,53 @@
 			WRITE( 0, data & 0x1FFF, temp + no_read_before_write );
 		}
 		goto loop;
-	
+
 	case 0xAA: // MOV1 C,mem.bit
 		c = MEM_BIT( 0 );
 		pc += 2;
 		goto loop;
-	
+
 // 16. PROGRAM PSW FLAG OPERATION COMMANDS
 
 	case 0x60: // CLRC
 		c = 0;
 		goto loop;
-		
+
 	case 0x80: // SETC
 		c = ~0;
 		goto loop;
-	
+
 	case 0xED: // NOTC
 		c ^= 0x100;
 		goto loop;
-		
+
 	case 0xE0: // CLRV
 		psw &= ~(v40 | h08);
 		goto loop;
-	
+
 	case 0x20: // CLRP
 		dp = 0;
 		goto loop;
-	
+
 	case 0x40: // SETP
 		dp = 0x100;
 		goto loop;
-	
+
 	case 0xA0: // EI
 		SUSPICIOUS_OPCODE( "EI" );
 		psw |= i04;
 		goto loop;
-	
+
 	case 0xC0: // DI
 		SUSPICIOUS_OPCODE( "DI" );
 		psw &= ~i04;
 		goto loop;
-	
+
 // 17. OTHER COMMANDS
 
 	case 0x00: // NOP
 		goto loop;
-	
+
 	case 0xFF:{// STOP
 		// handle PC wrap-around
 		unsigned addr = GET_PC() - 1;
@@ -1196,13 +1196,13 @@
 		m.cpu_error = "SPC emulation error";
 		goto stop;
 	} // switch
-	
+
 	assert( 0 ); // catch any unhandled instructions
-} 
+}
 out_of_time:
 	rel_time -= m.cycle_table [*pc]; // undo partial execution of opcode
 stop:
-	
+
 	// Uncache registers
 	if ( GET_PC() >= 0x10000 )
 		debug_printf( "SPC: PC wrapped around\n" );

audacious-plugins-3.3.4.tar.bz2/src/console/Spc_Dsp.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Spc_Dsp.cxx Changed

@@ -28,11 +28,11 @@
 
 
 // TODO: add to blargg_endian.h
-#define GET_LE16SA( addr ) ((BOOST::int16_t) GET_LE16( addr ))
+#define GET_LE16SA( addr ) ((int16_t) GET_LE16( addr ))
 #define GET_LE16A( addr ) GET_LE16( addr )
 #define SET_LE16A( addr, data ) SET_LE16( addr, data )
 
-static BOOST::uint8_t const initial_regs [Spc_Dsp::register_count] =
+static uint8_t const initial_regs [Spc_Dsp::register_count] =
 {
 	0x45,0x8B,0x5A,0x9A,0xE4,0x82,0x1B,0x78,0x00,0x00,0xAA,0x96,0x89,0x0E,0xE0,0x80,
 	0x2A,0x49,0x3D,0xBA,0x14,0xA0,0xAC,0xC5,0x00,0x00,0x51,0xBB,0x9C,0x4E,0x7B,0xFF,
@@ -157,7 +157,7 @@
 	m.counters [1] = 0;
 	m.counters [2] = -0x20u;
 	m.counters [3] = 0x0B;
-	
+
 	int n = 2;
 	for ( int i = 1; i < 32; i++ )
 	{
@@ -190,18 +190,18 @@
 	m.phase = new_phase & 31;
 	if ( !count )
 		return;
-	
+
 	uint8_t* const ram = m.ram;
 	uint8_t const* const dir = &ram [REG(dir) * 0x100];
 	int const slow_gaussian = (REG(pmon) >> 1) | REG(non);
 	int const noise_rate = REG(flg) & 0x1F;
-	
+
 	// Global volume
 	int mvoll = (int8_t) REG(mvoll);
 	int mvolr = (int8_t) REG(mvolr);
 	if ( mvoll * mvolr < m.surround_threshold )
 		mvoll = -mvoll; // eliminate surround
-	
+
 	do
 	{
 		// KON/KOFF reading
@@ -209,20 +209,20 @@
 		{
 			m.new_kon &= ~m.kon;
 			m.kon = m.new_kon;
-			m.t_koff = REG(koff); 
+			m.t_koff = REG(koff);
 		}
-		
+
 		run_counter( 1 );
 		run_counter( 2 );
 		run_counter( 3 );
-		
+
 		// Noise
 		if ( !READ_COUNTER( noise_rate ) )
 		{
 			int feedback = (m.noise << 13) ^ (m.noise << 14);
 			m.noise = (feedback & 0x4000) ^ (m.noise >> 1);
 		}
-		
+
 		// Voices
 		int pmon_input = 0;
 		int main_out_l = 0;
@@ -235,20 +235,20 @@
 		do
 		{
 			#define SAMPLE_PTR(i) GET_LE16A( &dir [VREG(v_regs,srcn) * 4 + i * 2] )
-			
+
 			int brr_header = ram [v->brr_addr];
 			int kon_delay = v->kon_delay;
-			
+
 			// Pitch
 			int pitch = GET_LE16A( &VREG(v_regs,pitchl) ) & 0x3FFF;
 			if ( REG(pmon) & vbit )
 				pitch += ((pmon_input >> 5) * pitch) >> 10;
-			
+
 			// KON phases
 			if ( --kon_delay >= 0 )
 			{
 				v->kon_delay = kon_delay;
-				
+
 				// Get ready to start BRR decoding on next sample
 				if ( kon_delay == 4 )
 				{
@@ -257,20 +257,20 @@
 					v->buf_pos = v->buf;
 					brr_header = 0; // header is ignored on this sample
 				}
-				
+
 				// Envelope is never run during KON
 				v->env = 0;
 				v->hidden_env = 0;
-				
+
 				// Disable BRR decoding until last three samples
 				v->interp_pos = (kon_delay & 3 ? 0x4000 : 0);
-				
+
 				// Pitch is never added during KON
 				pitch = 0;
 			}
-			
+
 			int env = v->env;
-			
+
 			// Gaussian interpolation
 			{
 				int output = 0;
@@ -281,9 +281,9 @@
 					int offset = (unsigned) v->interp_pos >> 3 & 0x1FE;
 					short const* fwd = interleved_gauss + offset;
 					short const* rev = interleved_gauss + 510 - offset; // mirror left half of gaussian
-					
+
 					int const* in = &v->buf_pos [(unsigned) v->interp_pos >> 12];
-					
+
 					if ( !(slow_gaussian & vbit) ) // 99%
 					{
 						// Faster approximation when exact sample value isn't necessary for pitch mod
@@ -303,44 +303,44 @@
 							output += (rev [1] * in [2]) >> 11;
 							output = (int16_t) output;
 							output += (rev [0] * in [3]) >> 11;
-							
+
 							CLAMP16( output );
 							output &= ~1;
 						}
 						output = (output * env) >> 11 & ~1;
 					}
-					
+
 					// Output
 					int l = output * v->volume [0];
 					int r = output * v->volume [1];
-					
+
 					main_out_l += l;
 					main_out_r += r;
-					
+
 					if ( REG(eon) & vbit )
 					{
 						echo_out_l += l;
 						echo_out_r += r;
 					}
 				}
-				
+
 				pmon_input = output;
 				VREG(v_regs,outx) = (uint8_t) (output >> 8);
 			}
-			
+
 			// Soft reset or end of sample
 			if ( REG(flg) & 0x80 || (brr_header & 3) == 1 )
 			{
 				v->env_mode = env_release;
 				env = 0;
 			}
-			
+
 			if ( m.every_other_sample )
 			{
 				// KOFF
 				if ( m.t_koff & vbit )
 					v->env_mode = env_release;
-				
+
 				// KON
 				if ( m.kon & vbit )
 				{
@@ -349,7 +349,7 @@
 					REG(endx) &= ~vbit;
 				}
 			}
-			
+
 			// Envelope
 			if ( !v->kon_delay )
 			{
@@ -375,7 +375,7 @@
 							env--;
 							env -= env >> 8;
 							rate = env_data & 0x1F;
-							
+
 							// optimized handling
 							v->hidden_env = env;
 							if ( READ_COUNTER( rate ) )
@@ -425,13 +425,13 @@
 							}
 						}
 					}
-					
+
 					// Sustain level
 					if ( (env >> 8) == (env_data >> 5) && v->env_mode == env_decay )
 						v->env_mode = env_sustain;
-					
+
 					v->hidden_env = env;
-					
+
 					// unsigned cast because linear decrease going negative also triggers this
 					if ( (unsigned) env > 0x7FF )
 					{
@@ -439,13 +439,13 @@
 						if ( v->env_mode == env_attack )
 							v->env_mode = env_decay;
 					}
-					
+
 					if ( !READ_COUNTER( rate ) )
 						v->env = env; // nothing else is controlled by the counter
 				}
 			}
 		exit_env:
-			
+
 			{
 				// Apply pitch
 				int old_pos = v->interp_pos;
@@ -453,14 +453,14 @@
 				if ( interp_pos > 0x7FFF )
 					interp_pos = 0x7FFF;
 				v->interp_pos = interp_pos;
-				
+
 				// BRR decode if necessary
 				if ( old_pos >= 0x4000 )
 				{
 					// Arrange the four input nybbles in 0xABCD order for easy decoding
 					int nybbles = ram [(v->brr_addr + v->brr_offset) & 0xFFFF] * 0x100 +
 							ram [(v->brr_addr + v->brr_offset + 1) & 0xFFFF];
-					
+
 					// Advance read position
 					int const brr_block_size = 9;
 					int brr_offset = v->brr_offset;
@@ -479,9 +479,9 @@
 						brr_offset = 1;
 					}
 					v->brr_offset = brr_offset;
-					
+
 					// Decode
-					
+
 					// 0: >>1 1: <<0 2: <<1 ... 12: <<11 13-15: >>4 <<11
 					static unsigned char const shifts [16 * 2] = {
 						13,12,12,12,12,12,12,12,12,12,12, 12, 12, 16, 16, 16,
@@ -490,17 +490,17 @@
 					int const scale = brr_header >> 4;
 					int const right_shift = shifts [scale];
 					int const left_shift = shifts [scale + 16];
-					
+
 					// Write to next four samples in circular buffer
 					int* pos = v->buf_pos;
 					int* end;
-					
+
 					// Decode four samples
 					for ( end = pos + 4; pos < end; pos++, nybbles <<= 4 )
 					{
 						// Extract upper nybble and scale appropriately
 						int s = ((int16_t) nybbles >> right_shift) << left_shift;
-						
+
 						// Apply IIR filter (8 is the most commonly used)
 						int const filter = brr_header & 0x0C;
 						int const p1 = pos [brr_buf_size - 1];
@@ -525,13 +525,13 @@
 							s += p1 >> 1;
 							s += (-p1) >> 5;
 						}
-						
+
 						// Adjust and write sample
 						CLAMP16( s );
 						s = (int16_t) (s * 2);
 						pos [brr_buf_size] = pos [0] = s; // second copy simplifies wrap-around
 					}
-					
+
 					if ( pos >= &v->buf [brr_buf_size] )
 						pos = v->buf;
 					v->buf_pos = pos;
@@ -544,7 +544,7 @@
 			v++;
 		}
 		while ( vbit < 0x100 );
-		
+
 		// Echo position
 		int echo_offset = m.echo_offset;
 		uint8_t* const echo_ptr = &ram [(REG(esa) * 0x100 + echo_offset) & 0xFFFF];
@@ -554,23 +554,23 @@
 		if ( echo_offset >= m.echo_length )
 			echo_offset = 0;
 		m.echo_offset = echo_offset;
-		
+
 		// FIR
 		int echo_in_l = GET_LE16SA( echo_ptr + 0 );
 		int echo_in_r = GET_LE16SA( echo_ptr + 2 );
-		
+
 		int (*echo_hist_pos) [2] = m.echo_hist_pos;
 		if ( ++echo_hist_pos >= &m.echo_hist [echo_hist_size] )
 			echo_hist_pos = m.echo_hist;
 		m.echo_hist_pos = echo_hist_pos;
-		
+
 		echo_hist_pos [0] [0] = echo_hist_pos [8] [0] = echo_in_l;
 		echo_hist_pos [0] [1] = echo_hist_pos [8] [1] = echo_in_r;
-		
+
 		#define CALC_FIR_( i, in ) ((in) * (int8_t) REG(fir + i * 0x10))
 		echo_in_l = CALC_FIR_( 7, echo_in_l );
 		echo_in_r = CALC_FIR_( 7, echo_in_r );
-		
+
 		#define CALC_FIR( i, ch ) CALC_FIR_( i, echo_hist_pos [i + 1] [ch] )
 		#define DO_FIR( i )\
 			echo_in_l += CALC_FIR( i, 0 );\
@@ -585,39 +585,39 @@
 		DO_FIR( 4 );
 		DO_FIR( 5 );
 		DO_FIR( 6 );
-		
+
 		// Echo out
 		if ( !(REG(flg) & 0x20) )
 		{
 			int l = (echo_out_l >> 7) + ((echo_in_l * (int8_t) REG(efb)) >> 14);
 			int r = (echo_out_r >> 7) + ((echo_in_r * (int8_t) REG(efb)) >> 14);
-			
+
 			// just to help pass more validation tests
 			#if SPC_MORE_ACCURACY
 				l &= ~1;
 				r &= ~1;
 			#endif
-			
+
 			CLAMP16( l );
 			CLAMP16( r );
-			
+
 			SET_LE16A( echo_ptr + 0, l );
 			SET_LE16A( echo_ptr + 2, r );
 		}
-		
+
 		// Sound out
 		int l = (main_out_l * mvoll + echo_in_l * (int8_t) REG(evoll)) >> 14;
 		int r = (main_out_r * mvolr + echo_in_r * (int8_t) REG(evolr)) >> 14;
-		
+
 		CLAMP16( l );
 		CLAMP16( r );
-		
+
 		if ( (REG(flg) & 0x40) )
 		{
 			l = 0;
 			r = 0;
 		}
-		
+
 		sample_t* out = m.out;
 		WRITE_SAMPLES( l, r, out );
 		m.out = out;
@@ -645,33 +645,31 @@
 	disable_surround( false );
 	set_output( 0, 0 );
 	reset();
-	
+
 	#ifndef NDEBUG
 		// be sure this sign-extends
 		assert( (int16_t) 0x8000 == -0x8000 );
-		
+
 		// be sure right shift preserves sign
 		assert( (-1 >> 1) == -1 );
-		
+
 		// check clamp macro
 		int i;
 		i = +0x8000; CLAMP16( i ); assert( i == +0x7FFF );
 		i = -0x8001; CLAMP16( i ); assert( i == -0x8000 );
-		
-		blargg_verify_byte_order();
 	#endif
 }
 
 void Spc_Dsp::soft_reset_common()
 {
 	require( m.ram ); // init() must have been called already
-	
+
 	m.noise = 0x4000;
 	m.echo_hist_pos = m.echo_hist;
 	m.every_other_sample = 1;
 	m.echo_offset = 0;
 	m.phase = 0;
-	
+
 	init_counter();
 }
 
@@ -685,7 +683,7 @@
 {
 	memcpy( m.regs, regs, sizeof m.regs );
 	memset( &m.regs [register_count], 0, offsetof (state_t,ram) - register_count );
-	
+
 	// Internal state
 	int i;
 	for ( i = voice_count; --i >= 0; )
@@ -695,7 +693,7 @@
 		v.buf_pos = v.buf;
 	}
 	m.new_kon = REG(kon);
-	
+
 	mute_voices( m.mute_mask );
 	soft_reset_common();
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Spc_Dsp.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Spc_Dsp.h Changed

@@ -8,10 +8,8 @@
 
 struct Spc_Dsp {
 public:
-	typedef BOOST::uint8_t uint8_t;
-	
 // Setup
-	
+
 	// Initializes DSP and has it use the 64K RAM provided
 	void init( void* ram_64k );
 
@@ -26,13 +24,13 @@
 	int sample_count() const;
 
 // Emulation
-	
+
 	// Resets DSP to power-on state
 	void reset();
 
 	// Emulates pressing reset switch on SNES
 	void soft_reset();
-	
+
 	// Reads/writes DSP registers. For accuracy, you must first call spc_run_dsp()
 	// to catch the DSP up to present.
 	int read ( int addr ) const;
@@ -53,7 +51,7 @@
 	void disable_surround( bool disable = true );
 
 // State
-	
+
 	// Resets DSP and uses supplied values to initialize registers
 	enum { register_count = 128 };
 	void load( uint8_t const regs [register_count] );
@@ -86,14 +84,9 @@
 	enum { extra_size = 16 };
 	sample_t* extra() { return m.extra; }
 	sample_t const* out_pos() const { return m.out; }
-public:
-	BLARGG_DISABLE_NOTHROW
-	
-	typedef BOOST::int8_t int8_t;
-	typedef BOOST::int16_t int16_t;
-	
+
 	enum { echo_hist_size = 8 };
-	
+
 	enum env_mode_t { env_release, env_attack, env_decay, env_sustain };
 	enum { brr_buf_size = 12 };
 	struct voice_t
@@ -114,11 +107,11 @@
 	struct state_t
 	{
 		uint8_t regs [register_count];
-		
+
 		// Echo history keeps most recent 8 samples (twice the size to simplify wrap handling)
 		int echo_hist [echo_hist_size * 2] [2];
 		int (*echo_hist_pos) [2]; // &echo_hist [0 to 7]
-		
+
 		int every_other_sample; // toggles every sample
 		int kon; // KON value when last checked
 		int noise;
@@ -126,14 +119,14 @@
 		int echo_length; // number of bytes that echo_offset will stop at
 		int phase; // next clock cycle to run (0-31)
 		unsigned counters [4];
-		
+
 		int new_kon;
 		int t_koff;
-		
+
 		voice_t voices [voice_count];
-		
+
 		unsigned* counter_select [32];
-		
+
 		// non-emulation state
 		uint8_t* ram; // 64K shared RAM between DSP and SMP
 		int mute_mask;
@@ -144,7 +137,7 @@
 		sample_t extra [extra_size];
 	};
 	state_t m;
-	
+
 	void init_counter();
 	void run_counter( int );
 	void soft_reset_common();
@@ -166,14 +159,14 @@
 {
 	int l = (int8_t) m.regs [addr + v_voll];
 	int r = (int8_t) m.regs [addr + v_volr];
-	
+
 	if ( l * r < m.surround_threshold )
 	{
 		// signs differ, so negate those that are negative
 		l ^= l >> 7;
 		r ^= r >> 7;
 	}
-	
+
 	voice_t& v = m.voices [addr >> 4];
 	int enabled = v.enabled;
 	v.volume [0] = l & enabled;
@@ -183,7 +176,7 @@
 inline void Spc_Dsp::write( int addr, int data )
 {
 	assert( (unsigned) addr < register_count );
-	
+
 	m.regs [addr] = (uint8_t) data;
 	int low = addr & 0x0F;
 	if ( low < 0x2 ) // voice volumes
@@ -194,7 +187,7 @@
 	{
 		if ( addr == r_kon )
 			m.new_kon = (uint8_t) data;
-		
+
 		if ( addr == r_endx ) // always cleared, regardless of data written
 			m.regs [r_endx] = 0;
 	}

audacious-plugins-3.3.4.tar.bz2/src/console/Spc_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Spc_Emu.cxx Changed

@@ -24,12 +24,12 @@
 Spc_Emu::Spc_Emu()
 {
 	set_type( gme_spc_type );
-	
+
 	static const char* const names [Snes_Spc::voice_count] = {
 		"DSP 1", "DSP 2", "DSP 3", "DSP 4", "DSP 5", "DSP 6", "DSP 7", "DSP 8"
 	};
 	set_voice_names( names );
-	
+
 	set_gain( 1.4 );
 }
 
@@ -52,19 +52,19 @@
 		check( false );
 		return;
 	}
-	long info_size = get_le32( begin + 4 );
-	byte const* in = begin + 8; 
+	long info_size = GET_LE32( begin + 4 );
+	byte const* in = begin + 8;
 	if ( end - in > info_size )
 	{
 		debug_printf( "Extra data after SPC xid6 info\n" );
 		end = in + info_size;
 	}
-	
+
 	int year = 0;
 	char copyright [256 + 5];
 	int copyright_len = 0;
 	int const year_len = 5;
-	
+
 	while ( end - in >= 4 )
 	{
 		// header
@@ -78,7 +78,7 @@
 			check( false );
 			break; // block goes past end of data
 		}
-		
+
 		// handle specific block types
 		char* field = 0;
 		switch ( id )
@@ -89,7 +89,7 @@
 			case 0x04: field = out->dumper; break;
 			case 0x07: field = out->comment; break;
 			case 0x14: year = data; break;
-			
+
 			//case 0x30: // intro length
 			// Many SPCs have intro length set wrong for looped tracks, making it useless
 			/*
@@ -97,7 +97,7 @@
 				check( len == 4 );
 				if ( len >= 4 )
 				{
-					out->intro_length = get_le32( in ) / 64;
+					out->intro_length = GET_LE32( in ) / 64;
 					if ( out->length > 0 )
 					{
 						long loop = out->length - out->intro_length;
@@ -107,12 +107,12 @@
 				}
 				break;
 			*/
-			
+
 			case 0x13:
 				copyright_len = min( len, (int) sizeof copyright - year_len );
 				memcpy( &copyright [year_len], in, copyright_len );
 				break;
-			
+
 			default:
 				if ( id < 0x01 || (id > 0x07 && id < 0x10) ||
 						(id > 0x14 && id < 0x30) || id > 0x36 )
@@ -124,10 +124,10 @@
 			check( type == 1 );
 			Gme_File::copy_field_( field, (char const*) in, len );
 		}
-		
+
 		// skip to next block
 		in += len;
-		
+
 		// blocks are supposed to be 4-byte aligned with zero-padding...
 		byte const* unaligned = in;
 		while ( (in - begin) & 3 && in < end )
@@ -141,7 +141,7 @@
 			}
 		}
 	}
-	
+
 	char* p = &copyright [year_len];
 	if ( year )
 	{
@@ -155,7 +155,7 @@
 	}
 	if ( copyright_len )
 		Gme_File::copy_field_( out->copyright, p, copyright_len );
-	
+
 	check( in == end );
 }
 
@@ -179,18 +179,18 @@
 		len_secs += n;
 	}
 	if ( !len_secs || len_secs > 0x1FFF )
-		len_secs = get_le16( h.len_secs );
+		len_secs = GET_LE16( h.len_secs );
 	if ( len_secs < 0x1FFF )
 		out->length = len_secs * 1000;
-	
+
 	int offset = (h.author [0] < ' ' || unsigned (h.author [0] - '0') <= 9);
 	Gme_File::copy_field_( out->author, &h.author [offset], sizeof h.author - offset );
-	
+
 	GME_COPY_FIELD( h, out, song );
 	GME_COPY_FIELD( h, out, game );
 	GME_COPY_FIELD( h, out, dumper );
 	GME_COPY_FIELD( h, out, comment );
-	
+
 	if ( xid6_size )
 		get_spc_xid6( xid6, xid6_size, out );
 }
@@ -212,9 +212,9 @@
 {
 	Spc_Emu::header_t header;
 	blargg_vector<byte> xid6;
-	
+
 	Spc_File() { set_type( gme_spc_type ); }
-	
+
 	blargg_err_t load_( Data_Reader& in )
 	{
 		long file_size = in.remain();
@@ -232,7 +232,7 @@
 		}
 		return 0;
 	}
-	
+
 	blargg_err_t track_info_( track_info_t* out, int ) const
 	{
 		get_spc_info( header, xid6.begin(), xid6.size(), out );
@@ -316,15 +316,15 @@
 		count = long (count * resampler.ratio()) & ~1;
 		count -= resampler.skip_input( count );
 	}
-	
+
 	// TODO: shouldn't skip be adjusted for the 64 samples read afterwards?
-	
+
 	if ( count > 0 )
 	{
 		RETURN_ERR( apu.skip( count ) );
 		filter.clear();
 	}
-	
+
 	// eliminate pop due to resampler
 	const int resampler_latency = 64;
 	sample_t buf [resampler_latency];
@@ -335,7 +335,7 @@
 {
 	if ( sample_rate() == native_sample_rate )
 		return play_and_filter( count, out );
-	
+
 	long remain = count;
 	while ( remain > 0 )
 	{

audacious-plugins-3.3.4.tar.bz2/src/console/Spc_Filter.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Spc_Filter.cxx Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Spc_Filter.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Spc_Filter.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Track_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Track_Emu.cxx Changed

@@ -45,7 +45,7 @@
 {
 	emu->start_track( track );
 	sync ( 0 );
-	
+
 	// skip initial silence
 	for ( int n = 40 * stereo * emu->sample_rate() / buf_size; n--; )
 	{
@@ -124,7 +124,7 @@
 {
 	assert( out_count % 2 == 0 );
 	assert( emu );
-	
+
 	int pos = 0;
 	while ( pos < out_count )
 	{
@@ -144,12 +144,12 @@
 				memset( &out [pos], 0, (out_count - pos) * sizeof *out );
 				return true;
 			}
-			
+
 			memcpy( &out [pos], &buf [buf_size - buf_count], count * sizeof *out );
 			buf_count -= count;
 		}
 		pos += count;
-		
+
 		// keep internal buffer full and possibly run ahead
 		for ( int n = 6; n--; )
 		{
@@ -160,11 +160,11 @@
 		}
 	}
 	out_time += out_count;
-	
-	if ( detect_silence && 
+
+	if ( detect_silence &&
 		( emu_time - silence_time > silence_max * stereo * emu->sample_rate() && silence_time ) )
 		end_track();
-	
+
 	// fade if track is ending
 	if ( out_time > fade_time )
 	{
@@ -173,14 +173,14 @@
 			double gain = pow( fade_factor, (double) (out_time + i - fade_time) );
 			if ( gain < 0.005 )
 				end_track();
-			
+
 			int count = min( fade_block_size, out_count - i );
 			int igain = (unsigned int)((double)gain * (1 << 15));;
 			for ( int j = 0; j < count; j++ )
 				out [i + j] = (out [i + j] * igain) >> 15;
 		}
 	}
-	
+
 	return !silence_count && !buf_count && track_ended;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Track_Emu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Track_Emu.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Vgm_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Vgm_Emu.cxx Changed

@@ -28,14 +28,14 @@
 	disable_oversampling_ = false;
 	psg_rate = 0;
 	set_type( gme_vgm_type );
-	
+
 	static int const types [8] = {
 		wave_type | 1, wave_type | 0, wave_type | 2, noise_type | 0
 	};
 	set_voice_types( types );
-	
+
 	set_silence_lookahead( 1 ); // tracks should already be trimmed
-	
+
 	static equalizer_t const eq = { -14.0, 80 };
 	set_equalizer( eq );
 }
@@ -91,11 +91,11 @@
 {
 	if ( remain < gd3_header_size ) return 0;
 	if ( memcmp( h, "Gd3 ", 4 ) ) return 0;
-	if ( get_le32( h + 4 ) >= 0x200 ) return 0;
-	
-	long gd3_size = get_le32( h + 8 );
+	if ( GET_LE32( h + 4 ) >= 0x200 ) return 0;
+
+	long gd3_size = GET_LE32( h + 8 );
 	if ( gd3_size > remain - gd3_header_size ) return 0;
-	
+
 	return gd3_size;
 }
 
@@ -103,29 +103,29 @@
 {
 	if ( size )
 		*size = 0;
-	
-	long gd3_offset = get_le32( header().gd3_offset ) - 0x2C;
+
+	long gd3_offset = GET_LE32( header().gd3_offset ) - 0x2C;
 	if ( gd3_offset < 0 )
 		return 0;
-	
+
 	byte const* gd3 = data + header_size + gd3_offset;
 	long gd3_size = check_gd3_header( gd3, data_end - gd3 );
 	if ( !gd3_size )
 		return 0;
-	
+
 	if ( size )
 		*size = gd3_size + gd3_header_size;
-	
+
 	return gd3;
 }
 
 static void get_vgm_length( Vgm_Emu::header_t const& h, track_info_t* out )
 {
-	long length = get_le32( h.track_duration ) * 10 / 441;
+	long length = GET_LE32( h.track_duration ) * 10 / 441;
 	if ( length > 0 )
 	{
-		long loop = get_le32( h.loop_duration );
-		if ( loop > 0 && get_le32( h.loop_offset ) )
+		long loop = GET_LE32( h.loop_duration );
+		if ( loop > 0 && GET_LE32( h.loop_offset ) )
 		{
 			out->loop_length = loop * 10 / 441;
 			out->intro_length = length - out->loop_length;
@@ -142,12 +142,12 @@
 blargg_err_t Vgm_Emu::track_info_( track_info_t* out, int ) const
 {
 	get_vgm_length( header(), out );
-	
+
 	int size;
 	byte const* gd3 = gd3_data( &size );
 	if ( gd3 )
 		parse_gd3( gd3 + gd3_header_size, gd3 + size, out );
-	
+
 	return 0;
 }
 
@@ -162,19 +162,19 @@
 {
 	Vgm_Emu::header_t h;
 	blargg_vector<byte> gd3;
-	
+
 	Vgm_File() { set_type( gme_vgm_type ); }
-	
+
 	blargg_err_t load_( Data_Reader& in )
 	{
 		long file_size = in.remain();
 		if ( file_size <= Vgm_Emu::header_size )
 			return gme_wrong_file_type;
-		
+
 		RETURN_ERR( in.read( &h, Vgm_Emu::header_size ) );
 		RETURN_ERR( check_vgm_header( h ) );
-		
-		long gd3_offset = get_le32( h.gd3_offset ) - 0x2C;
+
+		long gd3_offset = GET_LE32( h.gd3_offset ) - 0x2C;
 		long remain = file_size - Vgm_Emu::header_size - gd3_offset;
 		byte gd3_h [gd3_header_size];
 		if ( gd3_offset > 0 && remain >= gd3_header_size )
@@ -190,7 +190,7 @@
 		}
 		return 0;
 	}
-	
+
 	blargg_err_t track_info_( track_info_t* out, int ) const
 	{
 		get_vgm_length( h, out );
@@ -223,7 +223,7 @@
 		// TODO: remove? calculates vgm_rate more accurately (above differs at most by one Hz only)
 		//blip_time_factor = (long) floor( double (1L << blip_time_bits) * psg_rate / 44100 / t + 0.5 );
 		//vgm_rate = (long) floor( double (1L << blip_time_bits) * psg_rate / blip_time_factor + 0.5 );
-		
+
 		fm_time_factor = 2 + (long) floor( fm_rate * (1L << fm_time_bits) / vgm_rate + 0.5 );
 	}
 }
@@ -258,7 +258,7 @@
 			dac_synth.volume( (mask & 0x40) ? 0.0 : 0.1115 / 256 * fm_gain * gain() );
 			ym2612.mute_voices( mask );
 		}
-		
+
 		if ( ym2413.enabled() )
 		{
 			int m = mask & 0x3F;
@@ -274,55 +274,55 @@
 blargg_err_t Vgm_Emu::load_mem_( byte const* new_data, long new_size )
 {
 	assert( offsetof (header_t,unused2 [8]) == header_size );
-	
+
 	if ( new_size <= header_size )
 		return gme_wrong_file_type;
-	
+
 	header_t const& h = *(header_t const*) new_data;
-	
+
 	RETURN_ERR( check_vgm_header( h ) );
-	
-	check( get_le32( h.version ) <= 0x150 );
-	
+
+	check( GET_LE32( h.version ) <= 0x150 );
+
 	// psg rate
-	psg_rate = get_le32( h.psg_rate );
+	psg_rate = GET_LE32( h.psg_rate );
 	if ( !psg_rate )
 		psg_rate = 3579545;
 	blip_buf.clock_rate( psg_rate );
-	
+
 	data = new_data;
 	data_end = new_data + new_size;
-	
+
 	// get loop
 	loop_begin = data_end;
-	if ( get_le32( h.loop_offset ) )
-		loop_begin = &data [get_le32( h.loop_offset ) + offsetof (header_t,loop_offset)];
-	
+	if ( GET_LE32( h.loop_offset ) )
+		loop_begin = &data [GET_LE32( h.loop_offset ) + offsetof (header_t,loop_offset)];
+
 	set_voice_count( psg.osc_count );
-	
+
 	RETURN_ERR( setup_fm() );
-	
+
 	static const char* const fm_names [] = {
 		"FM 1", "FM 2", "FM 3", "FM 4", "FM 5", "FM 6", "PCM", "PSG"
 	};
 	static const char* const psg_names [] = { "Square 1", "Square 2", "Square 3", "Noise" };
 	set_voice_names( uses_fm ? fm_names : psg_names );
-	
+
 	// do after FM in case output buffer is changed
 	return Classic_Emu::setup_buffer( psg_rate );
 }
 
 blargg_err_t Vgm_Emu::setup_fm()
 {
-	long ym2612_rate = get_le32( header().ym2612_rate );
-	long ym2413_rate = get_le32( header().ym2413_rate );
-	if ( ym2413_rate && get_le32( header().version ) < 0x110 )
+	long ym2612_rate = GET_LE32( header().ym2612_rate );
+	long ym2413_rate = GET_LE32( header().ym2413_rate );
+	if ( ym2413_rate && GET_LE32( header().version ) < 0x110 )
 		update_fm_rates( &ym2413_rate, &ym2612_rate );
-	
+
 	uses_fm = false;
-	
+
 	fm_rate = blip_buf.sample_rate() * oversample_factor;
-	
+
 	if ( ym2612_rate )
 	{
 		uses_fm = true;
@@ -333,7 +333,7 @@
 		ym2612.enable( true );
 		set_voice_count( 8 );
 	}
-	
+
 	if ( !uses_fm && ym2413_rate )
 	{
 		uses_fm = true;
@@ -347,7 +347,7 @@
 		ym2413.enable( true );
 		set_voice_count( 8 );
 	}
-	
+
 	if ( uses_fm )
 	{
 		RETURN_ERR( Dual_Resampler::reset( blip_buf.length() * blip_buf.sample_rate() / 1000 ) );
@@ -359,7 +359,7 @@
 		ym2413.enable( false );
 		psg.volume( gain() );
 	}
-	
+
 	return 0;
 }
 
@@ -368,30 +368,30 @@
 blargg_err_t Vgm_Emu::start_track_( int track )
 {
 	RETURN_ERR( Classic_Emu::start_track_( track ) );
-	psg.reset( get_le16( header().noise_feedback ), header().noise_width );
-	
+	psg.reset( GET_LE16( header().noise_feedback ), header().noise_width );
+
 	dac_disabled = -1;
 	pos = data + header_size;
 	pcm_data = pos;
 	pcm_pos = pos;
 	dac_amp = -1;
 	vgm_time = 0;
-	if ( get_le32( header().version ) >= 0x150 )
+	if ( GET_LE32( header().version ) >= 0x150 )
 	{
-		long data_offset = get_le32( header().data_offset );
+		long data_offset = GET_LE32( header().data_offset );
 		check( data_offset );
 		if ( data_offset )
 			pos += data_offset + offsetof (header_t,data_offset) - 0x40;
 	}
-	
+
 	if ( uses_fm )
 	{
 		if ( ym2413.enabled() )
 			ym2413.reset();
-		
+
 		if ( ym2612.enabled() )
 			ym2612.reset();
-		
+
 		fm_time_offset = 0;
 		blip_buf.clear();
 		Dual_Resampler::clear();
@@ -410,7 +410,7 @@
 {
 	if ( !uses_fm )
 		return Classic_Emu::play_( count, out );
-		
+
 	Dual_Resampler::dual_play( count, out, blip_buf );
 	return 0;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Vgm_Emu_Impl.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Vgm_Emu_Impl.cxx Changed

@@ -35,7 +35,7 @@
 	cmd_short_delay = 0x70,
 	cmd_pcm_delay = 0x80,
 	cmd_pcm_seek = 0xE0,
-	
+
 	pcm_block_type = 0x00,
 	ym2612_dac_port = 0x2A
 };
@@ -47,21 +47,21 @@
 		case 0x03:
 		case 0x04:
 			return 2;
-		
+
 		case 0x05:
 		case 0x0A:
 		case 0x0B:
 			return 3;
-		
+
 		case 0x0C:
 		case 0x0D:
 			return 4;
-		
+
 		case 0x0E:
 		case 0x0F:
 			return 5;
 	}
-	
+
 	check( false );
 	return 1;
 }
@@ -89,7 +89,7 @@
 	}
 	return true;
 }
-	
+
 inline Vgm_Emu_Impl::fm_time_t Vgm_Emu_Impl::to_fm_time( vgm_time_t t ) const
 {
 	return (t * fm_time_factor + fm_time_offset) >> fm_time_bits;
@@ -114,7 +114,7 @@
 
 blip_time_t Vgm_Emu_Impl::run_commands( vgm_time_t end_time )
 {
-	vgm_time_t vgm_time = this->vgm_time; 
+	vgm_time_t vgm_time = this->vgm_time;
 	byte const* pos = this->pos;
 	if ( pos >= data_end )
 	{
@@ -122,7 +122,7 @@
 		if ( pos > data_end )
 			set_warning( "Stream lacked end event" );
 	}
-	
+
 	while ( vgm_time < end_time && pos < data_end )
 	{
 		// TODO: be sure there are enough bytes left in stream for particular command
@@ -132,38 +132,38 @@
 		case cmd_end:
 			pos = loop_begin; // if not looped, loop_begin == data_end
 			break;
-		
+
 		case cmd_delay_735:
 			vgm_time += 735;
 			break;
-		
+
 		case cmd_delay_882:
 			vgm_time += 882;
 			break;
-		
+
 		case cmd_gg_stereo:
 			psg.write_ggstereo( to_blip_time( vgm_time ), *pos++ );
 			break;
-		
+
 		case cmd_psg:
 			psg.write_data( to_blip_time( vgm_time ), *pos++ );
 			break;
-		
+
 		case cmd_delay:
 			vgm_time += pos [1] * 0x100L + pos [0];
 			pos += 2;
 			break;
-		
+
 		case cmd_byte_delay:
 			vgm_time += *pos++;
 			break;
-		
+
 		case cmd_ym2413:
 			if ( ym2413.run_until( to_fm_time( vgm_time ) ) )
 				ym2413.write( pos [0], pos [1] );
 			pos += 2;
 			break;
-		
+
 		case cmd_ym2612_port0:
 			if ( pos [0] == ym2612_dac_port )
 			{
@@ -180,30 +180,30 @@
 			}
 			pos += 2;
 			break;
-		
+
 		case cmd_ym2612_port1:
 			if ( ym2612.run_until( to_fm_time( vgm_time ) ) )
 				ym2612.write1( pos [0], pos [1] );
 			pos += 2;
 			break;
-			
+
 		case cmd_data_block: {
 			check( *pos == cmd_end );
 			int type = pos [1];
-			long size = get_le32( pos + 2 );
+			long size = GET_LE32( pos + 2 );
 			pos += 6;
 			if ( type == pcm_block_type )
 				pcm_data = pos;
 			pos += size;
 			break;
 		}
-		
+
 		case cmd_pcm_seek:
 			pcm_pos = pcm_data + pos [3] * 0x1000000L + pos [2] * 0x10000L +
 					pos [1] * 0x100L + pos [0];
 			pos += 4;
 			break;
-		
+
 		default:
 			int cmd = pos [-1];
 			switch ( cmd & 0xF0 )
@@ -212,15 +212,15 @@
 					write_pcm( vgm_time, *pcm_pos++ );
 					vgm_time += cmd & 0x0F;
 					break;
-				
+
 				case cmd_short_delay:
 					vgm_time += (cmd & 0x0F) + 1;
 					break;
-				
+
 				case 0x50:
 					pos += 2;
 					break;
-				
+
 				default:
 					pos += command_len( cmd ) - 1;
 					set_warning( "Unknown stream event" );
@@ -230,14 +230,14 @@
 	vgm_time -= end_time;
 	this->pos = pos;
 	this->vgm_time = vgm_time;
-	
+
 	return to_blip_time( end_time );
 }
 
 int Vgm_Emu_Impl::play_frame( blip_time_t blip_time, int sample_count, sample_t* buf )
 {
 	// to do: timing is working mostly by luck
-	
+
 	int min_pairs = sample_count >> 1;
 	int vgm_time = ((long) min_pairs << fm_time_bits) / fm_time_factor - 1;
 	assert( to_fm_time( vgm_time ) <= min_pairs );
@@ -245,7 +245,7 @@
 	while ( (pairs = to_fm_time( vgm_time )) < min_pairs )
 		vgm_time++;
 	//debug_printf( "pairs: %d, min_pairs: %d\n", pairs, min_pairs );
-	
+
 	if ( ym2612.enabled() )
 	{
 		ym2612.begin_frame( buf );
@@ -255,16 +255,16 @@
 	{
 		ym2413.begin_frame( buf );
 	}
-	
+
 	run_commands( vgm_time );
 	ym2612.run_until( pairs );
 	ym2413.run_until( pairs );
-	
+
 	fm_time_offset = (vgm_time * fm_time_factor + fm_time_offset) -
 			((long) pairs << fm_time_bits);
-	
+
 	psg.end_frame( blip_time );
-	
+
 	return pairs * stereo;
 }
 
@@ -278,35 +278,35 @@
 		{
 		case cmd_end:
 			return;
-		
+
 		case cmd_psg:
 		case cmd_byte_delay:
 			p += 2;
 			break;
-		
+
 		case cmd_delay:
 			p += 3;
 			break;
-		
+
 		case cmd_data_block:
-			p += 7 + get_le32( p + 3 );
+			p += 7 + GET_LE32( p + 3 );
 			break;
-		
+
 		case cmd_ym2413:
 			*ym2612_rate = 0;
 			return;
-		
+
 		case cmd_ym2612_port0:
 		case cmd_ym2612_port1:
 			*ym2612_rate = *ym2413_rate;
 			*ym2413_rate = 0;
 			return;
-		
+
 		case cmd_ym2151:
 			*ym2413_rate = 0;
 			*ym2612_rate = 0;
 			return;
-		
+
 		default:
 			p += command_len( *p );
 		}

audacious-plugins-3.3.4.tar.bz2/src/console/Vgm_Emu_Impl.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Vgm_Emu_Impl.h Changed

@@ -29,42 +29,42 @@
 	typedef Classic_Emu::sample_t sample_t;
 protected:
 	enum { stereo = 2 };
-	
+
 	typedef int vgm_time_t;
-	
+
 	enum { fm_time_bits = 12 };
 	typedef int fm_time_t;
 	long fm_time_offset;
 	int fm_time_factor;
 	fm_time_t to_fm_time( vgm_time_t ) const;
-	
+
 	enum { blip_time_bits = 12 };
 	int blip_time_factor;
 	blip_time_t to_blip_time( vgm_time_t ) const;
-	
+
 	byte const* data;
 	byte const* loop_begin;
 	byte const* data_end;
 	void update_fm_rates( long* ym2413_rate, long* ym2612_rate ) const;
-	
+
 	vgm_time_t vgm_time;
 	byte const* pos;
 	blip_time_t run_commands( vgm_time_t );
 	int play_frame( blip_time_t blip_time, int sample_count, sample_t* buf );
-	
+
 	byte const* pcm_data;
 	byte const* pcm_pos;
 	int dac_amp;
 	int dac_disabled; // -1 if disabled
 	void write_pcm( vgm_time_t, int amp );
-	
+
 	Ym_Emu<Ym2612_Emu> ym2612;
 	Ym_Emu<Ym2413_Emu> ym2413;
-	
+
 	Blip_Buffer blip_buf;
 	Sms_Apu psg;
 	Blip_Synth<blip_med_quality,1> dac_synth;
-	
+
 	friend class Vgm_Emu;
 };

audacious-plugins-3.3.4.tar.bz2/src/console/Ym2413_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Ym2413_Emu.cxx Changed

@@ -12,7 +12,7 @@
 : Version 0.32 -- LPF implemented.
 2001 01-18 : Version 0.33 -- Fixed the drum problem, refine the mix-down method.
 -- Fixed the LFO bug.
- 2001 01-24 : Version 0.35 -- Fixed the drum problem, 
+ 2001 01-24 : Version 0.35 -- Fixed the drum problem,
 support undocumented EG behavior.
 2001 02-02 : Version 0.38 -- Improved the performance.
 Fixed the hi-hat and cymbal model.
@@ -37,7 +37,7 @@
 2002 05-30 : Version 0.60 -- Fixed HH&CYM generator and all voice datas.
 2004 04-10 : Version 0.61 -- Added YMF281B tone (defined by Chabin).
 
- References: 
+ References:
 fmopl.c -- 1999,2000 written by Tatsuyuki Satoh (MAME development).
 fmopl.c(fixed) -- (C) 2002 Jarek Burczynski.
 s_opl.c -- 2001 written by Mamiya (NEZplug development).
@@ -84,7 +84,7 @@
 /* slot */
 typedef struct __OPLL_SLOT {
 
- OPLL_PATCH *patch; 
+ OPLL_PATCH *patch;
 
 e_int32 type ; /* 0 : modulator 1 : carrier */
 
@@ -137,7 +137,7 @@
 #endif
 
 /* Register */
- e_uint8 reg[0x40] ; 
+ e_uint8 reg[0x40] ;
 e_int32 slot_on_flag[18] ;
 
 /* Pitch Modulator */
@@ -216,7 +216,7 @@
 #include <math.h>
 
 #define EMU2413_COMPACTION
-#define INLINE inline 
+#define INLINE inline
 
 #ifdef EMU2413_COMPACTION
 #define OPLL_TONE_NUM 1
@@ -247,8 +247,8 @@
 #else
 #define OPLL_TONE_NUM 3
 static unsigned char default_inst[OPLL_TONE_NUM][(16 + 3) * 16] = {
- { 
-#include "2413tone.h" 
+ {
+#include "2413tone.h"
 },
 {
 #include "vrc7tone.h"
@@ -377,7 +377,7 @@
 static OPLL_PATCH default_patch[OPLL_TONE_NUM][(16 + 3) * 2];
 
 /* Definition of envelope mode */
-enum OPLL_EG_STATE 
+enum OPLL_EG_STATE
 { READY, ATTACK, DECAY, SUSHOLD, SUSTINE, RELEASE, SETTLE, FINISH };
 
 /* Phase incr table for Attack */
@@ -393,9 +393,9 @@
 static e_uint32 dphaseTable[512][8][16];
 
 /***************************************************
- 
+
 Create tables
- 
+
 ****************************************************/
 INLINE static e_int32
 Min (e_int32 i, e_int32 j)
@@ -624,7 +624,7 @@
 dphaseARTable[AR][Rks] = 0;
 break;
 case 15:
- dphaseARTable[AR][Rks] = 0;/*EG_DP_WIDTH;*/ 
+ dphaseARTable[AR][Rks] = 0;/*EG_DP_WIDTH;*/
 break;
 default:
 #ifdef USE_SPEC_ENV_SPEED
@@ -1439,7 +1439,7 @@
 
 if (egout >= DB_MUTE)
 egout = DB_MUTE - 1;
- 
+
 slot->egout = egout | 3;
 }
 
@@ -1505,24 +1505,24 @@
 {
 if(slot->egout>=(DB_MUTE-1))
 return 0;
- 
+
 if(BIT(slot->pgout,7))
 return DB2LIN_TABLE[(noise?DB_POS(0.0):DB_POS(15.0))+slot->egout];
 else
 return DB2LIN_TABLE[(noise?DB_NEG(0.0):DB_NEG(15.0))+slot->egout];
 }
 
-/* 
- TOP-CYM 
+/*
+ TOP-CYM
 */
 INLINE static e_int32
 calc_slot_cym (OPLL_SLOT * slot, e_uint32 pgout_hh)
 {
 e_uint32 dbout;
 
- if (slot->egout >= (DB_MUTE - 1)) 
+ if (slot->egout >= (DB_MUTE - 1))
 return 0;
- else if( 
+ else if(
 /* the same as fmopl.c */
 ((BIT(pgout_hh,PG_BITS-8)^BIT(pgout_hh,PG_BITS-1))|BIT(pgout_hh,PG_BITS-7)) ^
 /* different from fmopl.c */
@@ -1535,17 +1535,17 @@
 return DB2LIN_TABLE[dbout + slot->egout];
 }
 
-/* 
- HI-HAT 
+/*
+ HI-HAT
 */
 INLINE static e_int32
 calc_slot_hat (OPLL_SLOT *slot, e_int32 pgout_cym, e_uint32 noise)
 {
 e_uint32 dbout;
 
- if (slot->egout >= (DB_MUTE - 1)) 
+ if (slot->egout >= (DB_MUTE - 1))
 return 0;
- else if( 
+ else if(
 /* the same as fmopl.c */
 ((BIT(slot->pgout,PG_BITS-8)^BIT(slot->pgout,PG_BITS-1))|BIT(slot->pgout,PG_BITS-7)) ^
 /* different from fmopl.c */
@@ -2180,15 +2180,15 @@
 		opll = 0;
 		use_count--;
 	}
-	
+
 	// Only one YM2413 may be used at a time (emu2413 uses lots of global data)
 	assert( use_count == 0 );
 	use_count++;
-	
+
 	opll = OPLL_new ((int) clock_rate, (int) sample_rate);
 	if ( !opll )
 		return 1;
-	
+
 	reset();
 	return 0;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Ym2413_Emu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Ym2413_Emu.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Ym2612_Emu.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Ym2612_Emu.cxx Changed

@@ -203,9 +203,9 @@
 	unsigned int SL_TAB [16]; // Substain level table
 	unsigned int NULL_RATE [32]; // Table for NULL rate
 	int LFO_INC_TAB [8]; // LFO step table
-	
+
 	short ENV_TAB [2 * ENV_LENGHT + 8]; // ENV CURVE TABLE (attack & decay)
-	
+
 	short LFO_ENV_TAB [LFO_LENGHT]; // LFO AMS TABLE (adjusted for 11.8 dB)
 	short LFO_FREQ_TAB [LFO_LENGHT]; // LFO FMS TABLE
 	int TL_TAB [TL_LENGHT * 2]; // TOTAL LEVEL TABLE (positif and minus)
@@ -233,7 +233,7 @@
 };
 
 static const unsigned char FKEY_TAB [16] =
-{ 
+{
 	0, 0, 0, 0,
 	0, 0, 0, 1,
 	2, 3, 3, 3,
@@ -258,17 +258,17 @@
 struct Ym2612_Impl
 {
 	enum { channel_count = Ym2612_Emu::channel_count };
-	
+
 	state_t YM2612;
 	int mute_mask;
 	tables_t g;
-	
+
 	void KEY_ON( channel_t&, int );
 	void KEY_OFF( channel_t&, int );
 	int SLOT_SET( int, int );
 	int CHANNEL_SET( int, int );
 	int YM_SET( int, int );
-	
+
 	void set_rate( double sample_rate, double clock_factor );
 	void reset();
 	void write0( int addr, int data );
@@ -280,13 +280,13 @@
 void Ym2612_Impl::KEY_ON( channel_t& ch, int nsl)
 {
 	slot_t *SL = &(ch.SLOT [nsl]); // on recupere le bon pointeur de slot
-	
+
 	if (SL->Ecurp == RELEASE) // la touche est-elle rel'chee ?
 	{
 		SL->Fcnt = 0;
 
 		// Fix Ecco 2 splash sound
-		
+
 		SL->Ecnt = (g.DECAY_TO_ATTACK [g.ENV_TAB [SL->Ecnt >> ENV_LBITS]] + ENV_ATTACK) & SL->ChgEnM;
 		SL->ChgEnM = ~0;
 
@@ -303,7 +303,7 @@
 void Ym2612_Impl::KEY_OFF(channel_t& ch, int nsl)
 {
 	slot_t *SL = &(ch.SLOT [nsl]); // on recupere le bon pointeur de slot
-	
+
 	if (SL->Ecurp != RELEASE) // la touche est-elle appuyee ?
 	{
 		if (SL->Ecnt < ENV_DECAY) // attack phase ?
@@ -323,7 +323,7 @@
 	int nch = Adr & 3;
 	if ( nch == 3 )
 		return 1;
-	
+
 	channel_t& ch = YM2612.CHANNEL [nch + (Adr & 0x100 ? 3 : 0)];
 	slot_t& sl = ch.SLOT [(Adr >> 2) & 3];
 
@@ -397,7 +397,7 @@
 			// SSG-EG envelope shapes :
 			/*
 			 E At Al H
-			 
+
 			 1 0 0 0 \\\\
 			 1 0 0 1 \___
 			 1 0 1 0 \/\/
@@ -406,7 +406,7 @@
 			 1 1 0 1 /
 			 1 1 1 0 /\/\
 			 1 1 1 1 /___
-			 
+
 			 E = SSG-EG enable
 			 At = Start negate
 			 Al = Altern
@@ -425,9 +425,9 @@
 	int num = Adr & 3;
 	if ( num == 3 )
 		return 1;
-	
+
 	channel_t& ch = YM2612.CHANNEL [num + (Adr & 0x100 ? 3 : 0)];
-	
+
 	switch ( Adr & 0xFC )
 	{
 		case 0xA0:
@@ -487,7 +487,7 @@
 				YM2612_Special_Update();
 
 				ch.ALGO = data & 7;
-				
+
 				ch.SLOT [0].ChgEnM = 0;
 				ch.SLOT [1].ChgEnM = 0;
 				ch.SLOT [2].ChgEnM = 0;
@@ -502,13 +502,13 @@
 
 		case 0xB4: {
 			YM2612_Special_Update();
-			
+
 			ch.LEFT = 0 - ((data >> 7) & 1);
 			ch.RIGHT = 0 - ((data >> 6) & 1);
-			
+
 			ch.AMS = LFO_AMS_TAB [(data >> 4) & 3];
 			ch.FMS = LFO_FMS_TAB [data & 7];
-			
+
 			for ( int i = 0; i < 4; i++ )
 			{
 				slot_t& sl = ch.SLOT [i];
@@ -517,7 +517,7 @@
 			break;
 		}
 	}
-	
+
 	return 0;
 }
 
@@ -617,14 +617,14 @@
 			else KEY_OFF(ch, S3); // On rel'che la touche pour le slot 4
 			break;
 		}
-		
+
 		case 0x2B:
 			if (YM2612.DAC ^ (data & 0x80)) YM2612_Special_Update();
 
 			YM2612.DAC = data & 0x80; // activation/desactivation du DAC
 			break;
 	}
-	
+
 	return 0;
 }
 
@@ -632,12 +632,12 @@
 {
 	assert( sample_rate );
 	assert( clock_rate > sample_rate );
-	
+
 	int i;
 
 	// 144 = 12 * (prescale * 2) = 12 * 6 * 2
 	// prescale set to 6 by default
-	
+
 	double Frequence = clock_rate / sample_rate / 144.0;
 	if ( fabs( Frequence - 1.0 ) < 0.0000001 )
 		Frequence = 1.0;
@@ -662,9 +662,9 @@
 			g.TL_TAB [TL_LENGHT + i] = -g.TL_TAB [i];
 		}
 	}
-	
+
 	// Tableau SIN :
-	// g.SIN_TAB [x] [y] = sin(x) * y; 
+	// g.SIN_TAB [x] [y] = sin(x) * y;
 	// x = phase and y = volume
 
 	g.SIN_TAB [0] = g.SIN_TAB [SIN_LENGHT / 2] = PG_CUT_OFF;
@@ -720,11 +720,11 @@
 	}
 	for ( i = 0; i < 8; i++ )
 		g.ENV_TAB [i + ENV_LENGHT * 2] = 0;
-	
+
 	g.ENV_TAB [ENV_END >> ENV_LBITS] = ENV_LENGHT - 1; // for the stopped state
-	
+
 	// Tableau pour la conversion Attack -> Decay and Decay -> Attack
-	
+
 	int j = ENV_LENGHT - 1;
 	for ( i = 0; i < ENV_LENGHT; i++ )
 	{
@@ -735,7 +735,7 @@
 	}
 
 	// Tableau pour le Substain Level
-	
+
 	for(i = 0; i < 15; i++)
 	{
 		double x = i * 3; // 3 and not 6 (Mickey Mania first music for test)
@@ -770,7 +770,7 @@
 		g.AR_TAB [i] = 0;
 		g.DR_TAB [i] = 0;
 	}
-	
+
 	for(i = 0; i < 60; i++)
 	{
 		double x = Frequence;
@@ -790,10 +790,10 @@
 
 		g.NULL_RATE [i - 64] = 0;
 	}
-	
+
 	for ( i = 96; i < 128; i++ )
 		g.AR_TAB [i] = 0;
-	
+
 	// Tableau Detune
 
 	for(i = 0; i < 4; i++)
@@ -810,7 +810,7 @@
 			g.DT_TAB [i + 4] [j] = (int) -y;
 		}
 	}
-	
+
 	// Tableau LFO
 	g.LFO_INC_TAB [0] = (unsigned int) (3.98 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
 	g.LFO_INC_TAB [1] = (unsigned int) (5.56 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
@@ -820,7 +820,7 @@
 	g.LFO_INC_TAB [5] = (unsigned int) (9.63 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
 	g.LFO_INC_TAB [6] = (unsigned int) (48.1 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
 	g.LFO_INC_TAB [7] = (unsigned int) (72.2 * (double) (1 << (LFO_HBITS + LFO_LBITS)) / sample_rate);
-	
+
 	reset();
 }
 
@@ -834,9 +834,9 @@
 		impl->mute_mask = 0;
 	}
 	memset( &impl->YM2612, 0, sizeof impl->YM2612 );
-	
+
 	impl->set_rate( sample_rate, clock_rate );
-	
+
 	return 0;
 }
 
@@ -848,7 +848,7 @@
 inline void Ym2612_Impl::write0( int opn_addr, int data )
 {
 	assert( (unsigned) data <= 0xFF );
-	
+
 	if ( opn_addr < 0x30 )
 	{
 		YM2612.REG [0] [opn_addr] = data;
@@ -857,7 +857,7 @@
 	else if ( YM2612.REG [0] [opn_addr] != data )
 	{
 		YM2612.REG [0] [opn_addr] = data;
-		
+
 		if ( opn_addr < 0xA0 )
 			SLOT_SET( opn_addr, data );
 		else
@@ -868,7 +868,7 @@
 inline void Ym2612_Impl::write1( int opn_addr, int data )
 {
 	assert( (unsigned) data <= 0xFF );
-	
+
 	if ( opn_addr >= 0x30 && YM2612.REG [1] [opn_addr] != data )
 	{
 		YM2612.REG [1] [opn_addr] = data;
@@ -902,7 +902,7 @@
 	for ( i = 0; i < channel_count; i++ )
 	{
 		channel_t& ch = YM2612.CHANNEL [i];
-		
+
 		ch.LEFT = ~0;
 		ch.RIGHT = ~0;
 		ch.ALGO = 0;
@@ -945,7 +945,7 @@
 		write0( i, 0 );
 		write1( i, 0 );
 	}
-	
+
 	write0( 0x2A, 0x80 );
 }
 
@@ -967,7 +967,7 @@
 	{
 	case 0:
 		// Env_Attack_Next
-		
+
 		// Verified with Gynoug even in HQ (explode SFX)
 		sl->Ecnt = ENV_DECAY;
 
@@ -975,10 +975,10 @@
 		sl->Ecmp = sl->SLL;
 		sl->Ecurp = DECAY;
 		break;
-	
+
 	case 1:
 		// Env_Decay_Next
-		
+
 		// Verified with Gynoug even in HQ (explode SFX)
 		sl->Ecnt = sl->SLL;
 
@@ -986,13 +986,13 @@
 		sl->Ecmp = ENV_END;
 		sl->Ecurp = SUBSTAIN;
 		break;
-	
+
 	case 2:
 		// Env_Substain_Next(slot_t *SL)
 		if (sl->SEG & 8) // SSG envelope type
 		{
 			int release = sl->SEG & 1;
-			
+
 			if ( !release )
 			{
 				// re KEY ON
@@ -1007,19 +1007,19 @@
 			}
 
 			set_seg( *sl, (sl->SEG << 1) & 4 );
-			
+
 			if ( !release )
 				break;
 		}
 		// fall through
-	
+
 	case 3:
 		// Env_Release_Next
 		sl->Ecnt = ENV_END;
 		sl->Einc = 0;
 		sl->Ecmp = ENV_END + 1;
 		break;
-	
+
 	// default: no op
 	}
 }
@@ -1043,54 +1043,54 @@
 		Ym2612_Emu::sample_t* buf, int length )
 {
 	int not_end = ch.SLOT [S3].Ecnt - ENV_END;
-	
+
 	// algo is a compile-time constant, so all conditions based on it are resolved
 	// during compilation
-	
+
 	// special cases
 	if ( algo == 7 )
 		not_end |= ch.SLOT [S0].Ecnt - ENV_END;
-	
+
 	if ( algo >= 5 )
 		not_end |= ch.SLOT [S2].Ecnt - ENV_END;
-	
+
 	if ( algo >= 4 )
 		not_end |= ch.SLOT [S1].Ecnt - ENV_END;
-	
+
 	int CH_S0_OUT_1 = ch.S0_OUT [1];
-	
+
 	int in0 = ch.SLOT [S0].Fcnt;
 	int in1 = ch.SLOT [S1].Fcnt;
 	int in2 = ch.SLOT [S2].Fcnt;
 	int in3 = ch.SLOT [S3].Fcnt;
-	
+
 	int YM2612_LFOinc = g.LFOinc;
 	int YM2612_LFOcnt = g.LFOcnt + YM2612_LFOinc;
-	
+
 	if ( !not_end )
 		return;
-	
+
 	do
 	{
 		// envelope
 		int const env_LFO = g.LFO_ENV_TAB [YM2612_LFOcnt >> LFO_LBITS & LFO_MASK];
-		
+
 		short const* const ENV_TAB = g.ENV_TAB;
-		
+
 	#define CALC_EN( x ) \
 		int temp##x = ENV_TAB [ch.SLOT [S##x].Ecnt >> ENV_LBITS] + ch.SLOT [S##x].TLL; \
 		int en##x = ((temp##x ^ ch.SLOT [S##x].env_xor) + (env_LFO >> ch.SLOT [S##x].AMS)) & \
 				((temp##x - ch.SLOT [S##x].env_max) >> 31);
-		
+
 		CALC_EN( 0 )
 		CALC_EN( 1 )
 		CALC_EN( 2 )
 		CALC_EN( 3 )
-		
+
 		int const* const TL_TAB = g.TL_TAB;
-		
+
 	#define SINT( i, o ) (TL_TAB [g.SIN_TAB [(i)] + (o)])
-		
+
 		// feedback
 		int CH_S0_OUT_0 = ch.S0_OUT [0];
 		{
@@ -1098,7 +1098,7 @@
 			CH_S0_OUT_1 = CH_S0_OUT_0;
 			CH_S0_OUT_0 = SINT( (temp >> SIN_LBITS) & SIN_MASK, en0 );
 		}
-		
+
 		int CH_OUTd;
 		if ( algo == 0 )
 		{
@@ -1155,9 +1155,9 @@
 					SINT( (in2 >> SIN_LBITS) & SIN_MASK, en2 ) + CH_S0_OUT_1;
 			//DO_LIMIT
 		}
-		
+
 		CH_OUTd >>= MAX_OUT_BITS - output_bits + 2;
-		
+
 		// update phase
 		unsigned freq_LFO = ((g.LFO_FREQ_TAB [YM2612_LFOcnt >> LFO_LBITS & LFO_MASK] *
 				ch.FMS) >> (LFO_HBITS - 1 + 1)) + (1L << (LFO_FMS_LBITS - 1));
@@ -1166,24 +1166,24 @@
 		in1 += (ch.SLOT [S1].Finc * freq_LFO) >> (LFO_FMS_LBITS - 1);
 		in2 += (ch.SLOT [S2].Finc * freq_LFO) >> (LFO_FMS_LBITS - 1);
 		in3 += (ch.SLOT [S3].Finc * freq_LFO) >> (LFO_FMS_LBITS - 1);
-		
+
 		int t0 = buf [0] + (CH_OUTd & ch.LEFT);
 		int t1 = buf [1] + (CH_OUTd & ch.RIGHT);
-		
+
 		update_envelope( ch.SLOT [0] );
 		update_envelope( ch.SLOT [1] );
 		update_envelope( ch.SLOT [2] );
 		update_envelope( ch.SLOT [3] );
-		
+
 		ch.S0_OUT [0] = CH_S0_OUT_0;
 		buf [0] = t0;
 		buf [1] = t1;
 		buf += 2;
 	}
 	while ( --length );
-	
+
 	ch.S0_OUT [1] = CH_S0_OUT_1;
-	
+
 	ch.SLOT [S0].Fcnt = in0;
 	ch.SLOT [S1].Fcnt = in1;
 	ch.SLOT [S2].Fcnt = in2;
@@ -1211,7 +1211,7 @@
 		if ( n > remain )
 			n = remain;
 		remain -= n;
-		
+
 		long i = n * YM2612.TimerBase;
 		if (YM2612.Mode & 1) // Timer A ON ?
 		{
@@ -1219,7 +1219,7 @@
 			if ((YM2612.TimerAcnt -= i) <= 0)
 			{
 				// timer a overflow
-				
+
 				YM2612.Status |= (YM2612.Mode & 0x04) >> 2;
 				YM2612.TimerAcnt += YM2612.TimerAL;
 
@@ -1251,27 +1251,27 @@
 {
 	if ( pair_count <= 0 )
 		return;
-	
+
 	if ( YM2612.Mode & 3 )
 		run_timer( pair_count );
-	
+
 	// Mise à jour des pas des compteurs-frequences s'ils ont ete modifies
-	
+
 	for ( int chi = 0; chi < channel_count; chi++ )
 	{
 		channel_t& ch = YM2612.CHANNEL [chi];
 		if ( ch.SLOT [0].Finc != -1 )
 			continue;
-		
+
 		int i2 = 0;
 		if ( chi == 2 && (YM2612.Mode & 0x40) )
 			i2 = 2;
-		
+
 		for ( int i = 0; i < 4; i++ )
 		{
 			// static int seq [4] = { 2, 1, 3, 0 };
 			// if ( i2 ) i2 = seq [i];
-			
+
 			slot_t& sl = ch.SLOT [i];
 			int finc = g.FINC_TAB [ch.FNUM [i2]] >> (7 - ch.FOCT [i2]);
 			int ksr = ch.KC [i2] >> sl.KSR_S; // keycode attenuation
@@ -1301,18 +1301,18 @@
 						sl.Einc = sl.EincR;
 				}
 			}
-			
+
 			if ( i2 )
 				i2 = (i2 ^ 2) ^ (i2 >> 1);
 		}
 	}
-	
+
 	for ( int i = 0; i < channel_count; i++ )
 	{
 		if ( !(mute_mask & (1 << i)) && (i != 5 || !YM2612.DAC) )
 			UPDATE_CHAN [YM2612.CHANNEL [i].ALGO]( g, YM2612.CHANNEL [i], out, pair_count );
 	}
-	
+
 	g.LFOcnt += g.LFOinc * pair_count;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/Ym2612_Emu.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Ym2612_Emu.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/Zlib_Inflater.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/Zlib_Inflater.cxx Changed

@@ -23,7 +23,7 @@
 	assert( code != Z_OK );
 	if ( code == Z_MEM_ERROR )
 		return "Out of memory";
-	
+
 	const char* str = zError( code );
 	if ( code == Z_DATA_ERROR )
 		str = "Zip data is corrupt";
@@ -41,7 +41,7 @@
 			check( false );
 	}
 	buf.clear();
-	
+
 	static z_stream const empty = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	memcpy( &zbuf, &empty, sizeof zbuf );
 }
@@ -61,20 +61,20 @@
 		long buf_size )
 {
 	end();
-	
+
 	if ( buf_size && buf.resize( buf_size ) )
 		buf_size = 0; // not enough memory for requested size, so use default
-	
+
 	if ( !buf_size )
 		RETURN_ERR( buf.resize( 16 * 1024L ) );
-	
+
 	// Fill buffer with some data, less than normal buffer size since caller might
 	// just be examining beginning of file. 4K is a common disk block size.
 	long count = (buf_size ? buf_size : 4096);
 	RETURN_ERR( callback( user_data, buf.begin(), &count ) );
 	zbuf.avail_in = count;
 	zbuf.next_in  = buf.begin();
-	
+
 	if ( mode == mode_auto )
 	{
 		// examine buffer for gzip header
@@ -83,17 +83,17 @@
 		if ( count >= min_gzip_size && buf [0] == 0x1F && buf [1] == 0x8B )
 			mode = mode_ungz;
 	}
-	
+
 	if ( mode != mode_copy )
 	{
 		int wb = MAX_WBITS + 16; // have zlib handle gzip header
 		if ( mode == mode_raw_deflate )
 			wb = -MAX_WBITS;
-		
+
 		int zerr = inflateInit2( &zbuf, wb );
 		if ( zerr )
 			return get_zlib_err( zerr );
-		
+
 		deflated_ = true;
 	}
 	return 0;
@@ -105,7 +105,7 @@
 {
 	if ( !*count_io )
 		return 0;
-	
+
 	if ( !deflated_ )
 	{
 		// copy buffered data
@@ -120,7 +120,7 @@
 			if ( !zbuf.avail_in )
 				buf.clear(); // done with buffer
 		}
-		
+
 		// read remaining directly
 		long second = *count_io - first;
 		if ( second )
@@ -134,7 +134,7 @@
 	{
 		zbuf.next_out  = (Bytef*) out;
 		zbuf.avail_out = *count_io;
-		
+
 		while ( 1 )
 		{
 			uInt old_avail_in = zbuf.avail_in;
@@ -145,23 +145,23 @@
 				end();
 				break; // all data deflated
 			}
-			
+
 			if ( err == Z_BUF_ERROR && !old_avail_in )
 				err = 0; // we just need to provide more input
-			
+
 			if ( err )
 				return get_zlib_err( err );
-			
+
 			if ( !zbuf.avail_out )
 				break; // requested number of bytes deflated
-			
+
 			if ( zbuf.avail_in )
 			{
 				// inflate() should never leave input if there's still space for output
 				assert( false );
 				return "Corrupt zip data";
 			}
-			
+
 			// refill buffer
 			long count = buf.size();
 			RETURN_ERR( callback( user_data, buf.begin(), &count ) );

audacious-plugins-3.3.4.tar.bz2/src/console/Zlib_Inflater.h -> audacious-plugins-3.4.2.tar.bz2/src/console/Zlib_Inflater.h Changed

@@ -9,28 +9,28 @@
 
 class Zlib_Inflater {
 public:
-	
+
 	// Data reader callback
 	typedef blargg_err_t (*callback_t)( void* user_data, void* out, long* count );
-	
+
 	// Begin inflation using specified mode and fill buffer using read callback.
 	// Default buffer is 16K and filled to 4K, or specify buf_size for custom
 	// buffer size and to read that much file data. Using mode_auto selects
-	// between mode_copy and mode_ungz by examining first two bytes of buffer. 
+	// between mode_copy and mode_ungz by examining first two bytes of buffer.
 	enum mode_t { mode_copy, mode_ungz, mode_raw_deflate, mode_auto };
 	blargg_err_t begin( mode_t, callback_t, void* user_data, long buf_size = 0 );
-	
+
 	// True if begin() has been called with mode_ungz or mode_raw_deflate
 	bool deflated() const { return deflated_; }
-	
+
 	// Read/inflate at most *count_io bytes into out and set *count_io to actual
 	// number of bytes read (less than requested if end of deflated data is reached).
 	// Keeps buffer full with user-provided callback.
 	blargg_err_t read( void* out, long* count_io, callback_t, void* user_data );
-	
+
 	// End inflation and free memory
 	void end();
-	
+
 private:
 	// noncopyable
 	Zlib_Inflater( const Zlib_Inflater& );

audacious-plugins-3.3.4.tar.bz2/src/console/blargg_common.h -> audacious-plugins-3.4.2.tar.bz2/src/console/blargg_common.h Changed

@@ -5,32 +5,27 @@
 #define BLARGG_COMMON_H
 
 #include <stddef.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <limits.h>
 
-#undef BLARGG_COMMON_H
-// allow blargg_config.h to #include blargg_common.h
-#include "blargg_config.h"
-#ifndef BLARGG_COMMON_H
-#define BLARGG_COMMON_H
+#include <new>
 
-// BLARGG_RESTRICT: equivalent to restrict, where supported
-#if __GNUC__ >= 3 || _MSC_VER >= 1100
-	#define BLARGG_RESTRICT __restrict
-#else
-	#define BLARGG_RESTRICT
-#endif
+// Have GME use VFS file access
+#define GME_FILE_READER Vfs_File_Reader
+#define GME_FILE_READER_INCLUDE "Vfs_File.h"
 
-// STATIC_CAST(T,expr): Used in place of static_cast<T> (expr)
-#ifndef STATIC_CAST
-	#define STATIC_CAST(T,expr) ((T) (expr))
-#endif
+#define STATIC_CAST(T,expr) static_cast<T>(expr)
+
+#define BLARGG_NEW new(std::nothrow)
 
 // blargg_err_t (0 on success, otherwise error string)
-#ifndef blargg_err_t
-	typedef const char* blargg_err_t;
-#endif
+typedef const char* blargg_err_t;
+
+// blargg_long/blargg_ulong = at least 32 bits
+typedef int blargg_long;
+typedef unsigned blargg_ulong;
 
 // blargg_vector - very lightweight vector of POD types (no constructor/destructor)
 template<class T>
@@ -60,22 +55,6 @@
 	}
 };
 
-#ifndef BLARGG_DISABLE_NOTHROW
-	// throw spec mandatory in ISO C++ if operator new can return NULL
-	#if __cplusplus >= 199711 || __GNUC__ >= 3
-		#define BLARGG_THROWS( spec ) throw spec
-	#else
-		#define BLARGG_THROWS( spec )
-	#endif
-	#define BLARGG_DISABLE_NOTHROW \
-		void* operator new ( size_t s ) BLARGG_THROWS(()) { return malloc( s ); }\
-		void operator delete ( void* p ) { free( p ); }
-	#define BLARGG_NEW new
-#else
-	#include <new>
-	#define BLARGG_NEW new (std::nothrow)
-#endif
-
 // BLARGG_4CHAR('a','b','c','d') = 'abcd' (four character integer constant)
 #define BLARGG_4CHAR( a, b, c, d ) \
 	((a&0xFF)*0x1000000L + (b&0xFF)*0x10000L + (c&0xFF)*0x100L + (d&0xFF))
@@ -94,103 +73,4 @@
 	#endif
 #endif
 
-// BLARGG_COMPILER_HAS_BOOL: If 0, provides bool support for old compiler. If 1,
-// compiler is assumed to support bool. If undefined, availability is determined.
-#ifndef BLARGG_COMPILER_HAS_BOOL
-	#if defined (__MWERKS__)
-		#if !__option(bool)
-			#define BLARGG_COMPILER_HAS_BOOL 0
-		#endif
-	#elif defined (_MSC_VER)
-		#if _MSC_VER < 1100
-			#define BLARGG_COMPILER_HAS_BOOL 0
-		#endif
-	#elif defined (__GNUC__)
-		// supports bool
-	#elif __cplusplus < 199711
-		#define BLARGG_COMPILER_HAS_BOOL 0
-	#endif
-#endif
-#if defined (BLARGG_COMPILER_HAS_BOOL) && !BLARGG_COMPILER_HAS_BOOL
-	// If you get errors here, modify your blargg_config.h file
-	typedef int bool;
-	const bool true = 1;
-	const bool false = 0;
-#endif
-
-// blargg_long/blargg_ulong = at least 32 bits, int if it's big enough
-
-#if INT_MAX < 0x7FFFFFFF || LONG_MAX == 0x7FFFFFFF
-	typedef long blargg_long;
-#else
-	typedef int blargg_long;
-#endif
-
-#if UINT_MAX < 0xFFFFFFFF || ULONG_MAX == 0xFFFFFFFF
-	typedef unsigned long blargg_ulong;
-#else
-	typedef unsigned blargg_ulong;
-#endif
-
-// BOOST::int8_t etc.
-
-// HAVE_STDINT_H: If defined, use <stdint.h> for int8_t etc.
-#if defined (HAVE_STDINT_H)
-	#include <stdint.h>
-	#define BOOST
-
-// HAVE_INTTYPES_H: If defined, use <stdint.h> for int8_t etc.
-#elif defined (HAVE_INTTYPES_H)
-	#include <inttypes.h>
-	#define BOOST
-
-#else
-	struct BOOST
-	{
-		#if UCHAR_MAX == 0xFF && SCHAR_MAX == 0x7F
-			typedef signed char int8_t;
-			typedef unsigned char uint8_t;
-		#else
-			// No suitable 8-bit type available
-			typedef struct see_blargg_common_h int8_t;
-			typedef struct see_blargg_common_h uint8_t;
-		#endif
-		
-		#if USHRT_MAX == 0xFFFF
-			typedef short int16_t;
-			typedef unsigned short uint16_t;
-		#else
-			// No suitable 16-bit type available
-			typedef struct see_blargg_common_h int16_t;
-			typedef struct see_blargg_common_h uint16_t;
-		#endif
-		
-		#if ULONG_MAX == 0xFFFFFFFF
-			typedef long int32_t;
-			typedef unsigned long uint32_t;
-		#elif UINT_MAX == 0xFFFFFFFF
-			typedef int int32_t;
-			typedef unsigned int uint32_t;
-		#else
-			// No suitable 32-bit type available
-			typedef struct see_blargg_common_h int32_t;
-			typedef struct see_blargg_common_h uint32_t;
-		#endif
-	};
-#endif
-
-#if __GNUC__ >= 3
-	#define BLARGG_DEPRECATED __attribute__ ((deprecated))
-#else
-	#define BLARGG_DEPRECATED
-#endif
-
-// Use in place of "= 0;" for a pure virtual, since these cause calls to std C++ lib.
-// During development, BLARGG_PURE( x ) expands to = 0;
-// virtual int func() BLARGG_PURE( { return 0; } )
-#ifndef BLARGG_PURE
-	#define BLARGG_PURE( def ) def
-#endif
-
-#endif
 #endif

audacious-plugins-3.3.4.tar.bz2/src/console/blargg_endian.h -> audacious-plugins-3.4.2.tar.bz2/src/console/blargg_endian.h Changed

@@ -3,6 +3,8 @@
 #ifndef BLARGG_ENDIAN
 #define BLARGG_ENDIAN
 
+#include <glib.h>
+
 #include "blargg_common.h"
 
 // BLARGG_CPU_CISC: Defined if CPU has very few general-purpose registers (< 16)
@@ -17,168 +19,32 @@
 	#define BLARGG_CPU_RISC 1
 #endif
 
-// BLARGG_BIG_ENDIAN, BLARGG_LITTLE_ENDIAN: Determined automatically, otherwise only
-// one may be #defined to 1. Only needed if something actually depends on byte order.
-#if !defined (BLARGG_BIG_ENDIAN) && !defined (BLARGG_LITTLE_ENDIAN)
-#ifdef __GLIBC__
-	// GCC handles this for us
-	#include <endian.h>
-	#if __BYTE_ORDER == __LITTLE_ENDIAN
-		#define BLARGG_LITTLE_ENDIAN 1
-	#elif __BYTE_ORDER == __BIG_ENDIAN
-		#define BLARGG_BIG_ENDIAN 1
-	#endif
-#else
-
-#if defined (LSB_FIRST) || defined (__LITTLE_ENDIAN__) || BLARGG_CPU_X86 || \
-		(defined (LITTLE_ENDIAN) && LITTLE_ENDIAN+0 != 1234)
-	#define BLARGG_LITTLE_ENDIAN 1
-#endif
-
-#if defined (MSB_FIRST) || defined (__BIG_ENDIAN__) || defined (WORDS_BIGENDIAN) || \
-	defined (__sparc__) || BLARGG_CPU_POWERPC || \
-	(defined (BIG_ENDIAN) && BIG_ENDIAN+0 != 4321)
+#if G_BYTE_ORDER == G_BIG_ENDIAN
 	#define BLARGG_BIG_ENDIAN 1
-#elif !defined (__mips__)
-	// No endian specified; assume little-endian, since it's most common
+#else
 	#define BLARGG_LITTLE_ENDIAN 1
 #endif
-#endif
-#endif
-
-#if BLARGG_LITTLE_ENDIAN && BLARGG_BIG_ENDIAN
-	#undef BLARGG_LITTLE_ENDIAN
-	#undef BLARGG_BIG_ENDIAN
-#endif
-
-inline void blargg_verify_byte_order()
-{
-	#ifndef NDEBUG
-		#if BLARGG_BIG_ENDIAN
-			volatile int i = 1;
-			assert( *(volatile char*) &i == 0 );
-		#elif BLARGG_LITTLE_ENDIAN
-			volatile int i = 1;
-			assert( *(volatile char*) &i != 0 );
-		#endif
-	#endif
-}
-
-inline unsigned get_le16( void const* p )
-{
-	return (unsigned) ((unsigned char const*) p) [1] << 8 |
-			(unsigned) ((unsigned char const*) p) [0];
-}
-
-inline unsigned get_be16( void const* p )
-{
-	return (unsigned) ((unsigned char const*) p) [0] << 8 |
-			(unsigned) ((unsigned char const*) p) [1];
-}
-
-inline blargg_ulong get_le32( void const* p )
-{
-	return (blargg_ulong) ((unsigned char const*) p) [3] << 24 |
-			(blargg_ulong) ((unsigned char const*) p) [2] << 16 |
-			(blargg_ulong) ((unsigned char const*) p) [1] << 8 |
-			(blargg_ulong) ((unsigned char const*) p) [0];
-}
 
-inline blargg_ulong get_be32( void const* p )
-{
-	return (blargg_ulong) ((unsigned char const*) p) [0] << 24 |
-			(blargg_ulong) ((unsigned char const*) p) [1] << 16 |
-			(blargg_ulong) ((unsigned char const*) p) [2] << 8 |
-			(blargg_ulong) ((unsigned char const*) p) [3];
-}
+inline unsigned GET_LE16 (const void * p) { return GUINT16_FROM_LE (* (uint16_t *) p); }
+inline unsigned GET_BE16 (const void * p) { return GUINT16_FROM_BE (* (uint16_t *) p); }
+inline unsigned GET_LE32 (const void * p) { return GUINT32_FROM_LE (* (uint32_t *) p); }
+inline unsigned GET_BE32 (const void * p) { return GUINT32_FROM_BE (* (uint32_t *) p); }
 
-inline void set_le16( void* p, unsigned n )
-{
-	((unsigned char*) p) [1] = (unsigned char) (n >> 8);
-	((unsigned char*) p) [0] = (unsigned char) n;
-}
-
-inline void set_be16( void* p, unsigned n )
-{
-	((unsigned char*) p) [0] = (unsigned char) (n >> 8);
-	((unsigned char*) p) [1] = (unsigned char) n;
-}
-
-inline void set_le32( void* p, blargg_ulong n )
-{
-	((unsigned char*) p) [0] = (unsigned char) n;
-	((unsigned char*) p) [1] = (unsigned char) (n >> 8);
-	((unsigned char*) p) [2] = (unsigned char) (n >> 16);
-	((unsigned char*) p) [3] = (unsigned char) (n >> 24);
-}
-
-inline void set_be32( void* p, blargg_ulong n )
-{
-	((unsigned char*) p) [3] = (unsigned char) n;
-	((unsigned char*) p) [2] = (unsigned char) (n >> 8);
-	((unsigned char*) p) [1] = (unsigned char) (n >> 16);
-	((unsigned char*) p) [0] = (unsigned char) (n >> 24);
-}
-
-#if BLARGG_NONPORTABLE
-	// Optimized implementation if byte order is known
-	#if BLARGG_LITTLE_ENDIAN
-		#define GET_LE16( addr ) (*(BOOST::uint16_t*) (addr))
-		#define GET_LE32( addr ) (*(BOOST::uint32_t*) (addr))
-		#define SET_LE16( addr, data ) (void) (*(BOOST::uint16_t*) (addr) = (data))
-		#define SET_LE32( addr, data ) (void) (*(BOOST::uint32_t*) (addr) = (data))
-	#elif BLARGG_BIG_ENDIAN
-		#define GET_BE16( addr ) (*(BOOST::uint16_t*) (addr))
-		#define GET_BE32( addr ) (*(BOOST::uint32_t*) (addr))
-		#define SET_BE16( addr, data ) (void) (*(BOOST::uint16_t*) (addr) = (data))
-		#define SET_BE32( addr, data ) (void) (*(BOOST::uint32_t*) (addr) = (data))
-		
-		#if BLARGG_CPU_POWERPC
-			// PowerPC has special byte-reversed instructions
-			#if defined (__MWERKS__)
-				#define GET_LE16( addr ) (__lhbrx( addr, 0 ))
-				#define GET_LE32( addr ) (__lwbrx( addr, 0 ))
-				#define SET_LE16( addr, in ) (__sthbrx( in, addr, 0 ))
-				#define SET_LE32( addr, in ) (__stwbrx( in, addr, 0 ))
-			#elif defined (__GNUC__)
-				#define GET_LE16( addr ) ({unsigned short ppc_lhbrx_; __asm__ volatile( "lhbrx %0,0,%1" : "=r" (ppc_lhbrx_) : "r" (addr) : "memory" ); ppc_lhbrx_;})
-				#define GET_LE32( addr ) ({unsigned short ppc_lwbrx_; __asm__ volatile( "lwbrx %0,0,%1" : "=r" (ppc_lwbrx_) : "r" (addr) : "memory" ); ppc_lwbrx_;})
-				#define SET_LE16( addr, in ) ({__asm__ volatile( "sthbrx %0,0,%1" : : "r" (in), "r" (addr) : "memory" );})
-				#define SET_LE32( addr, in ) ({__asm__ volatile( "stwbrx %0,0,%1" : : "r" (in), "r" (addr) : "memory" );})
-			#endif
-		#endif
-	#endif
-#endif
-
-#ifndef GET_LE16
-	#define GET_LE16( addr ) get_le16( addr )
-	#define SET_LE16( addr, data ) set_le16( addr, data )
-#endif
-
-#ifndef GET_LE32
-	#define GET_LE32( addr ) get_le32( addr )
-	#define SET_LE32( addr, data ) set_le32( addr, data )
-#endif
-
-#ifndef GET_BE16
-	#define GET_BE16( addr ) get_be16( addr )
-	#define SET_BE16( addr, data ) set_be16( addr, data )
-#endif
-
-#ifndef GET_BE32
-	#define GET_BE32( addr ) get_be32( addr )
-	#define SET_BE32( addr, data ) set_be32( addr, data )
-#endif
+inline void SET_LE16 (void * p, uint16_t n) { * (uint16_t *) p = GUINT16_TO_LE (n); }
+inline void SET_BE16 (void * p, uint16_t n) { * (uint16_t *) p = GUINT16_TO_BE (n); }
+inline void SET_LE32 (void * p, uint32_t n) { * (uint32_t *) p = GUINT32_TO_LE (n); }
+inline void SET_BE32 (void * p, uint32_t n) { * (uint32_t *) p = GUINT32_TO_BE (n); }
 
 // auto-selecting versions
 
-inline void set_le( BOOST::uint16_t* p, unsigned n ) { SET_LE16( p, n ); }
-inline void set_le( BOOST::uint32_t* p, blargg_ulong n ) { SET_LE32( p, n ); }
-inline void set_be( BOOST::uint16_t* p, unsigned n ) { SET_BE16( p, n ); }
-inline void set_be( BOOST::uint32_t* p, blargg_ulong n ) { SET_BE32( p, n ); }
-inline unsigned get_le( BOOST::uint16_t* p ) { return GET_LE16( p ); }
-inline blargg_ulong get_le( BOOST::uint32_t* p ) { return GET_LE32( p ); }
-inline unsigned get_be( BOOST::uint16_t* p ) { return GET_BE16( p ); }
-inline blargg_ulong get_be( BOOST::uint32_t* p ) { return GET_BE32( p ); }
+inline void set_le (uint16_t * p, uint16_t n) { SET_LE16 (p, n); }
+inline void set_le (uint32_t * p, uint32_t n) { SET_LE32 (p, n); }
+inline void set_be (uint16_t * p, uint16_t n) { SET_BE16 (p, n); }
+inline void set_be (uint32_t * p, uint32_t n) { SET_BE32 (p, n); }
+
+inline uint16_t get_le (const uint16_t * p) { return GET_LE16 (p); }
+inline uint32_t get_le (const uint32_t * p) { return GET_LE32 (p); }
+inline uint16_t get_be (const uint16_t * p) { return GET_BE16 (p); }
+inline uint32_t get_be (const uint32_t * p) { return GET_BE32 (p); }
 
 #endif

audacious-plugins-3.3.4.tar.bz2/src/console/blargg_source.h -> audacious-plugins-3.4.2.tar.bz2/src/console/blargg_source.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/configure.c -> audacious-plugins-3.4.2.tar.bz2/src/console/configure.c Changed

audacious-plugins-3.3.4.tar.bz2/src/console/gme.cxx -> audacious-plugins-3.4.2.tar.bz2/src/console/gme.cxx Changed

@@ -69,7 +69,7 @@
 
 BLARGG_EXPORT const char* gme_identify_header( void const* header )
 {
-	switch ( get_be32( header ) )
+	switch ( GET_BE32( header ) )
 	{
 		case BLARGG_4CHAR('Z','X','A','Y'): return "AY";
 		case BLARGG_4CHAR('G','B','S',0x01): return "GBS";
@@ -101,10 +101,10 @@
 	char const* end = strrchr( extension_, '.' );
 	if ( end )
 		extension_ = end + 1;
-	
+
 	char extension [6];
 	to_uppercase( extension_, sizeof extension, extension );
-	
+
 	for ( gme_type_t const* types = gme_type_list(); *types; types++ )
 		if ( !strcmp( extension, (*types)->extension_ ) )
 			return *types;
@@ -123,30 +123,30 @@
 		RETURN_ERR( in.read( header, sizeof header ) );
 		*type_out = gme_identify_extension( gme_identify_header( header ) );
 	}
-	return 0; 
+	return 0;
 }
 
 BLARGG_EXPORT gme_err_t gme_open_data( void const* data, long size, Music_Emu** out, int sample_rate )
 {
 	require( (data || !size) && out );
 	*out = 0;
-	
+
 	gme_type_t file_type = 0;
 	if ( size >= 4 )
 		file_type = gme_identify_extension( gme_identify_header( data ) );
 	if ( !file_type )
 		return gme_wrong_file_type;
-	
+
 	Music_Emu* emu = gme_new_emu( file_type, sample_rate );
 	CHECK_ALLOC( emu );
-	
+
 	gme_err_t err = gme_load_data( emu, data, size );
-	
+
 	if ( err )
 		delete emu;
 	else
 		*out = emu;
-	
+
 	return err;
 }
 
@@ -154,13 +154,13 @@
 {
 	require( path && out );
 	*out = 0;
-	
+
 	GME_FILE_READER in;
 	RETURN_ERR( in.open( path ) );
-	
+
 	char header [4];
 	int header_size = 0;
-	
+
 	gme_type_t file_type = gme_identify_extension( path );
 	if ( !file_type )
 	{
@@ -170,20 +170,20 @@
 	}
 	if ( !file_type )
 		return gme_wrong_file_type;
-	
+
 	Music_Emu* emu = gme_new_emu( file_type, sample_rate );
 	CHECK_ALLOC( emu );
-	
+
 	// optimization: avoids seeking/re-reading header
 	Remaining_Reader rem( header, header_size, &in );
 	gme_err_t err = emu->load( rem );
 	in.close();
-	
+
 	if ( err )
 		delete emu;
 	else
 		*out = emu;
-	
+
 	return err;
 }
 
@@ -193,7 +193,7 @@
 	{
 		if ( rate == gme_info_only )
 			return type->new_info();
-		
+
 		Music_Emu* me = type->new_emu();
 		if ( me )
 		{
@@ -204,7 +204,7 @@
 				if ( me->effects_buffer )
 					me->set_buffer( me->effects_buffer );
 			}
-			
+
 			if ( !(type->flags_ & 1) || me->effects_buffer )
 		#endif
 			{
@@ -245,30 +245,28 @@
 struct gme_info_t_ : gme_info_t
 {
 	track_info_t info;
-	
-	BLARGG_DISABLE_NOTHROW
 };
 
 BLARGG_EXPORT gme_err_t gme_track_info( Music_Emu const* me, gme_info_t** out, int track )
 {
 	*out = NULL;
-	
+
 	gme_info_t_* info = BLARGG_NEW gme_info_t_;
 	CHECK_ALLOC( info );
-	
+
 	gme_err_t err = me->track_info( &info->info, track );
 	if ( err )
 	{
 		gme_free_info( info );
 		return err;
 	}
-	
+
 	#define COPY(name) info->name = info->info.name;
-	
+
 	COPY( length );
 	COPY( intro_length );
 	COPY( loop_length );
-	
+
 	info->i4 = -1;
 	info->i5 = -1;
 	info->i6 = -1;
@@ -281,7 +279,7 @@
 	info->i13 = -1;
 	info->i14 = -1;
 	info->i15 = -1;
-	
+
 	info->s7 = "";
 	info->s8 = "";
 	info->s9 = "";
@@ -291,7 +289,7 @@
 	info->s13 = "";
 	info->s14 = "";
 	info->s15 = "";
-	
+
 	COPY( system );
 	COPY( game );
 	COPY( song );
@@ -299,9 +297,9 @@
 	COPY( copyright );
 	COPY( comment );
 	COPY( dumper );
-	
+
 	#undef COPY
-	
+
 	info->play_length = info->length;
 	if ( info->play_length <= 0 )
 	{
@@ -309,9 +307,9 @@
 		if ( info->play_length <= 0 )
 			info->play_length = 150 * 1000; // 2.5 minutes
 	}
-	
+
 	*out = info;
-	
+
 	return 0;
 }

audacious-plugins-3.3.4.tar.bz2/src/console/gme.h -> audacious-plugins-3.4.2.tar.bz2/src/console/gme.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/hes_cpu_io.h -> audacious-plugins-3.4.2.tar.bz2/src/console/hes_cpu_io.h Changed

audacious-plugins-3.3.4.tar.bz2/src/console/nes_cpu_io.h -> audacious-plugins-3.4.2.tar.bz2/src/console/nes_cpu_io.h Changed

@@ -10,32 +10,32 @@
 int Nsf_Emu::cpu_read( nes_addr_t addr )
 {
 	int result;
-	
+
 	result = cpu::low_mem [addr & 0x7FF];
 	if ( !(addr & 0xE000) )
 		goto exit;
-	
+
 	result = *cpu::get_code( addr );
 	if ( addr > 0x7FFF )
 		goto exit;
-	
+
 	result = sram [addr & (sizeof sram - 1)];
 	if ( addr > 0x5FFF )
 		goto exit;
-	
+
 	if ( addr == Nes_Apu::status_addr )
 		return apu.read_status( cpu::time() );
-	
+
 	#if !NSF_EMU_APU_ONLY
 		if ( addr == Nes_Namco_Apu::data_reg_addr && namco )
 			return namco->read_data();
 	#endif
-	
+
 	result = addr >> 8; // simulate open bus
-	
+
 	if ( addr != 0x2002 )
 		debug_printf( "Read unmapped $%.4X\n", (unsigned) addr );
-	
+
 exit:
 	return result;
 }
@@ -58,14 +58,14 @@
 			return;
 		}
 	}
-	
+
 	if ( unsigned (addr - Nes_Apu::start_addr) <= Nes_Apu::end_addr - Nes_Apu::start_addr )
 	{
 		GME_APU_HOOK( this, addr - Nes_Apu::start_addr, data );
 		apu.write_register( cpu::time(), addr, data );
 		return;
 	}
-	
+
 	unsigned bank = addr - bank_select_addr;
 	if ( bank < bank_count )
 	{
@@ -75,7 +75,7 @@
 		cpu::map_code( (bank + 8) * bank_size, bank_size, rom.at_addr( offset ) );
 		return;
 	}
-	
+
 	cpu_write_misc( addr, data );
 }

audacious-plugins-3.3.4.tar.bz2/src/console/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/console/plugin.c Changed

audacious-plugins-3.3.4.tar.bz2/src/console/sap_cpu_io.h -> audacious-plugins-3.4.2.tar.bz2/src/console/sap_cpu_io.h Changed

audacious-plugins-3.3.4.tar.bz2/src/crossfade/crossfade.c -> audacious-plugins-3.4.2.tar.bz2/src/crossfade/crossfade.c Changed

audacious-plugins-3.3.4.tar.bz2/src/crystalizer/crystalizer.c -> audacious-plugins-3.4.2.tar.bz2/src/crystalizer/crystalizer.c Changed

audacious-plugins-3.3.4.tar.bz2/src/cue/cue.c -> audacious-plugins-3.4.2.tar.bz2/src/cue/cue.c Changed

audacious-plugins-3.3.4.tar.bz2/src/echo_plugin/echo.c -> audacious-plugins-3.4.2.tar.bz2/src/echo_plugin/echo.c Changed

@@ -6,8 +6,6 @@
 #include <audacious/plugin.h>
 #include <audacious/preferences.h>
 
-#include "config.h"
-
 #define MAX_DELAY 1000
 #define MAX_SRATE 50000
 #define MAX_CHANNELS 2
@@ -43,14 +41,14 @@
 
 static bool_t init (void)
 {
-	aud_config_set_defaults ("echo_plugin", echo_defaults);
-	return TRUE;
+ aud_config_set_defaults ("echo_plugin", echo_defaults);
+ return TRUE;
 }
 
 static void cleanup(void)
 {
-	free(buffer);
-	buffer = NULL;
+ free(buffer);
+ buffer = NULL;
 }
 
 static int echo_channels = 0;
@@ -58,75 +56,75 @@
 
 static void echo_start(int *channels, int *rate)
 {
-	static int old_srate, old_nch;
+ static int old_srate, old_nch;
 
-	if (buffer == NULL)
-		buffer = malloc (BUFFER_BYTES);
+ if (buffer == NULL)
+ buffer = malloc (BUFFER_BYTES);
 
-	echo_channels = *channels;
-	echo_rate = *rate;
+ echo_channels = *channels;
+ echo_rate = *rate;
 
-	if (echo_channels != old_nch || echo_rate != old_srate)
-	{
-		memset(buffer, 0, BUFFER_BYTES);
-		w_ofs = 0;
-		old_nch = echo_channels;
-		old_srate = echo_rate;
-	}
+ if (echo_channels != old_nch || echo_rate != old_srate)
+ {
+ memset(buffer, 0, BUFFER_BYTES);
+ w_ofs = 0;
+ old_nch = echo_channels;
+ old_srate = echo_rate;
+ }
 }
 
 static void echo_process(float **d, int *samples)
 {
-	int delay = aud_get_int ("echo_plugin", "delay");
-	int feedback = aud_get_int ("echo_plugin", "feedback");
-	int volume = aud_get_int ("echo_plugin", "volume");
-
-	float in, out, buf;
-	int r_ofs;
-	float *data = *d;
-	float *end = *d + *samples;
-
-	r_ofs = w_ofs - (echo_rate * delay / 1000) * echo_channels;
-	if (r_ofs < 0)
-		r_ofs += BUFFER_SHORTS;
-
-	for (; data < end; data++)
-	{
-		in = *data;
-
-		buf = buffer[r_ofs];
-		out = in + buf * volume / 100;
-		buf = in + buf * feedback / 100;
-		buffer[w_ofs] = buf;
-		*data = out;
-
-		if (++r_ofs >= BUFFER_SHORTS)
-			r_ofs -= BUFFER_SHORTS;
-		if (++w_ofs >= BUFFER_SHORTS)
-			w_ofs -= BUFFER_SHORTS;
-	}
+ int delay = aud_get_int ("echo_plugin", "delay");
+ int feedback = aud_get_int ("echo_plugin", "feedback");
+ int volume = aud_get_int ("echo_plugin", "volume");
+
+ float in, out, buf;
+ int r_ofs;
+ float *data = *d;
+ float *end = *d + *samples;
+
+ r_ofs = w_ofs - (echo_rate * delay / 1000) * echo_channels;
+ if (r_ofs < 0)
+ r_ofs += BUFFER_SHORTS;
+
+ for (; data < end; data++)
+ {
+ in = *data;
+
+ buf = buffer[r_ofs];
+ out = in + buf * volume / 100;
+ buf = in + buf * feedback / 100;
+ buffer[w_ofs] = buf;
+ *data = out;
+
+ if (++r_ofs >= BUFFER_SHORTS)
+ r_ofs -= BUFFER_SHORTS;
+ if (++w_ofs >= BUFFER_SHORTS)
+ w_ofs -= BUFFER_SHORTS;
+ }
 }
 
 static void echo_finish(float **d, int *samples)
 {
-	echo_process(d, samples);
+ echo_process(d, samples);
 }
 
 static const char echo_about[] =
 N_("Echo Plugin\n"
-	"By Johan Levin, 1999\n\n"
-	"Surround echo by Carl van Schaik, 1999");
+ "By Johan Levin, 1999\n\n"
+ "Surround echo by Carl van Schaik, 1999");
 
 AUD_EFFECT_PLUGIN
 (
-	.name = N_("Echo"),
-	.domain = PACKAGE,
-	.about_text = echo_about,
-	.prefs = & echo_prefs,
-	.init = init,
-	.cleanup = cleanup,
-	.start = echo_start,
-	.process = echo_process,
-	.finish = echo_finish,
-	.preserves_format = TRUE
+ .name = N_("Echo"),
+ .domain = PACKAGE,
+ .about_text = echo_about,
+ .prefs = & echo_prefs,
+ .init = init,
+ .cleanup = cleanup,
+ .start = echo_start,
+ .process = echo_process,
+ .finish = echo_finish,
+ .preserves_format = TRUE
 )

audacious-plugins-3.3.4.tar.bz2/src/ffaudio/ffaudio-core.c -> audacious-plugins-3.4.2.tar.bz2/src/ffaudio/ffaudio-core.c Changed

@@ -30,7 +30,6 @@
 #undef FFAUDIO_DOUBLECHECK /* Doublecheck probing result for debugging purposes */
 #undef FFAUDIO_NO_BLACKLIST /* Don't blacklist any recognized codecs/formats */
 
-#include "config.h"
 #include "ffaudio-stdinc.h"
 #include <audacious/i18n.h>
 #include <audacious/debug.h>
@@ -44,6 +43,15 @@
 static pthread_mutex_t data_mutex = PTHREAD_MUTEX_INITIALIZER;
 static GHashTable * extension_dict = NULL;
 
+typedef struct
+{
+ int stream_idx;
+ AVStream * stream;
+ AVCodecContext * context;
+ AVCodec * codec;
+}
+CodecInfo;
+
 /* str_unref() may be a macro */
 static void str_unref_cb (void * str)
 {
@@ -247,6 +255,33 @@
 io_context_free (io);
 }
 
+static bool_t find_codec (AVFormatContext * c, CodecInfo * cinfo)
+{
+ avformat_find_stream_info (c, NULL);
+
+ for (int i = 0; i < c->nb_streams; i++)
+ {
+ AVStream * stream = c->streams[i];
+
+ if (stream && stream->codec && stream->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+ {
+ AVCodec * codec = avcodec_find_decoder (stream->codec->codec_id);
+
+ if (codec)
+ {
+ cinfo->stream_idx = i;
+ cinfo->stream = stream;
+ cinfo->context = stream->codec;
+ cinfo->codec = codec;
+
+ return TRUE;
+ }
+ }
+ }
+
+ return FALSE;
+}
+
 static gboolean
 ffaudio_codec_is_seekable(AVCodec *codec)
 {
@@ -292,82 +327,53 @@
 {TUPLE_INT, FIELD_TRACK_NUMBER, {"track", "WM/TrackNumber", NULL}},
 };
 
-static const gint n_metaentries = sizeof(metaentries) / sizeof(metaentries[0]);
-
-static void
-ffaudio_get_meta(Tuple *tuple, AVFormatContext *ic, const ffaudio_meta_t *m)
+static void read_metadata_dict (Tuple * tuple, AVDictionary * dict)
 {
- if (! ic->metadata)
- return;
-
- AVDictionaryEntry *tag = NULL;
-
- for (gint i = 0; ! tag && m->keys[i]; i ++)
- tag = av_dict_get (ic->metadata, m->keys[i], NULL, 0);
-
- if (tag != NULL)
+ for (int i = 0; i < G_N_ELEMENTS (metaentries); i ++)
 {
- switch (m->ttype) {
- case TUPLE_STRING:
- tuple_set_str (tuple, m->field, NULL, tag->value);
- break;
+ const ffaudio_meta_t * m = & metaentries[i];
+ AVDictionaryEntry * entry = NULL;
 
- case TUPLE_INT:
- tuple_set_int (tuple, m->field, NULL, atoi(tag->value));
- break;
+ for (int j = 0; ! entry && m->keys[j]; j ++)
+ entry = av_dict_get (dict, m->keys[j], NULL, 0);
 
- default:
- break;
+ if (entry && entry->value)
+ {
+ if (m->ttype == TUPLE_STRING)
+ tuple_set_str (tuple, m->field, NULL, entry->value);
+ else if (m->ttype == TUPLE_INT)
+ tuple_set_int (tuple, m->field, NULL, atoi (entry->value));
 }
 }
 }
 
-static void
-ffaudio_get_tuple_data(Tuple *tuple, AVFormatContext *ic, AVCodecContext *c, AVCodec *codec)
-{
- if (ic != NULL)
- {
- gint i;
- for (i = 0; i < n_metaentries; i++)
- ffaudio_get_meta(tuple, ic, &metaentries[i]);
-
- tuple_set_int(tuple, FIELD_LENGTH, NULL, ic->duration / 1000);
- tuple_set_int(tuple, FIELD_BITRATE, NULL, ic->bit_rate / 1000);
- }
-
- if (codec != NULL && codec->long_name != NULL)
- {
- tuple_set_str(tuple, FIELD_CODEC, NULL, codec->long_name);
- }
-}
-
 static Tuple * read_tuple (const gchar * filename, VFSFile * file)
 {
- AVCodec *codec = NULL;
- AVCodecContext *c = NULL;
- AVStream *s = NULL;
- gint i;
-
+ Tuple * tuple = NULL;
 AVFormatContext * ic = open_input_file (filename, file);
- if (! ic)
- return NULL;
 
- for (i = 0; i < ic->nb_streams; i++)
+ if (ic)
 {
- s = ic->streams[i];
- c = s->codec;
- if (c->codec_type == AVMEDIA_TYPE_AUDIO)
+ CodecInfo cinfo;
+
+ if (find_codec (ic, & cinfo))
 {
- avformat_find_stream_info (ic, NULL);
- codec = avcodec_find_decoder(c->codec_id);
- if (codec != NULL)
- break;
+ tuple = tuple_new_from_filename (filename);
+
+ tuple_set_int (tuple, FIELD_LENGTH, NULL, ic->duration / 1000);
+ tuple_set_int (tuple, FIELD_BITRATE, NULL, ic->bit_rate / 1000);
+
+ if (cinfo.codec->long_name)
+ tuple_set_str (tuple, FIELD_CODEC, NULL, cinfo.codec->long_name);
+
+ if (ic->metadata)
+ read_metadata_dict (tuple, ic->metadata);
+ if (cinfo.stream->metadata)
+ read_metadata_dict (tuple, cinfo.stream->metadata);
 }
- }
 
- Tuple *tuple = tuple_new_from_filename(filename);
- ffaudio_get_tuple_data(tuple, ic, c, codec);
- close_input_file (ic);
+ close_input_file (ic);
+ }
 
 return tuple;
 }
@@ -406,61 +412,57 @@
 if (! file)
 return FALSE;
 
- AVCodec *codec = NULL;
- AVCodecContext *c = NULL;
- AVStream *s = NULL;
 AVPacket pkt = {.data = NULL};
- gint i, stream_id, errcount;
+ gint errcount;
 gboolean codec_opened = FALSE;
 gint out_fmt;
+ gboolean planar;
 gboolean seekable;
 gboolean error = FALSE;
 
+ void *buf = NULL;
+ gint bufsize = 0;
+
 AVFormatContext * ic = open_input_file (filename, file);
 if (! ic)
 return FALSE;
 
- for (i = 0; i < ic->nb_streams; i++)
- {
- s = ic->streams[i];
- c = s->codec;
- if (c->codec_type == AVMEDIA_TYPE_AUDIO)
- {
- avformat_find_stream_info (ic, NULL);
- codec = avcodec_find_decoder(c->codec_id);
- stream_id = i;
- if (codec != NULL)
- break;
- }
- }
+ CodecInfo cinfo;
 
- if (codec == NULL)
+ if (! find_codec (ic, & cinfo))
 {
 fprintf (stderr, "ffaudio: No codec found for %s.\n", filename);
 goto error_exit;
 }
 
- AUDDBG("got codec %s for stream index %d, opening\n", codec->name, stream_id);
+ AUDDBG("got codec %s for stream index %d, opening\n", cinfo.codec->name, cinfo.stream_idx);
 
- if (avcodec_open2 (c, codec, NULL) < 0)
+ if (avcodec_open2 (cinfo.context, cinfo.codec, NULL) < 0)
 goto error_exit;
 
 codec_opened = TRUE;
 
- switch (c->sample_fmt) {
- case AV_SAMPLE_FMT_U8: out_fmt = FMT_U8; break;
- case AV_SAMPLE_FMT_S16: out_fmt = FMT_S16_NE; break;
- case AV_SAMPLE_FMT_S32: out_fmt = FMT_S32_NE; break;
- case AV_SAMPLE_FMT_FLT: out_fmt = FMT_FLOAT; break;
+ switch (cinfo.context->sample_fmt)
+ {
+ case AV_SAMPLE_FMT_U8: out_fmt = FMT_U8; planar = FALSE; break;
+ case AV_SAMPLE_FMT_S16: out_fmt = FMT_S16_NE; planar = FALSE; break;
+ case AV_SAMPLE_FMT_S32: out_fmt = FMT_S32_NE; planar = FALSE; break;
+ case AV_SAMPLE_FMT_FLT: out_fmt = FMT_FLOAT; planar = FALSE; break;
+
+ case AV_SAMPLE_FMT_U8P: out_fmt = FMT_U8; planar = TRUE; break;
+ case AV_SAMPLE_FMT_S16P: out_fmt = FMT_S16_NE; planar = TRUE; break;
+ case AV_SAMPLE_FMT_S32P: out_fmt = FMT_S32_NE; planar = TRUE; break;
+ case AV_SAMPLE_FMT_FLTP: out_fmt = FMT_FLOAT; planar = TRUE; break;
+
 default:
- fprintf (stderr, "ffaudio: Unsupported audio format %d\n", (int) c->sample_fmt);
+ fprintf (stderr, "ffaudio: Unsupported audio format %d\n", (int) cinfo.context->sample_fmt);
 goto error_exit;
 }
 
 /* Open audio output */
 AUDDBG("opening audio output\n");
 
- if (playback->output->open_audio(out_fmt, c->sample_rate, c->channels) <= 0)
+ if (playback->output->open_audio(out_fmt, cinfo.context->sample_rate, cinfo.context->channels) <= 0)
 {
 error = TRUE;
 goto error_exit;
@@ -473,7 +475,7 @@
 if (pause)
 playback->output->pause(TRUE);
 
- playback->set_params(playback, ic->bit_rate, c->sample_rate, c->channels);
+ playback->set_params(playback, ic->bit_rate, cinfo.context->sample_rate, cinfo.context->channels);
 
 pthread_mutex_lock (& ctrl_mutex);
 
@@ -481,7 +483,7 @@
 seek_value = (start_time > 0) ? start_time : -1;
 playback->set_pb_ready(playback);
 errcount = 0;
- seekable = ffaudio_codec_is_seekable(codec);
+ seekable = ffaudio_codec_is_seekable(cinfo.codec);
 
 pthread_mutex_unlock (& ctrl_mutex);
 
@@ -527,7 +529,7 @@
 errcount = 0;
 
 /* Ignore any other substreams */
- if (pkt.stream_index != stream_id)
+ if (pkt.stream_index != cinfo.stream_idx)
 {
 av_free_packet(&pkt);
 continue;
@@ -553,7 +555,7 @@
 
 AVFrame * frame = avcodec_alloc_frame ();
 int decoded = 0;
- int len = avcodec_decode_audio4 (c, frame, & decoded, & tmp);
+ int len = avcodec_decode_audio4 (cinfo.context, frame, & decoded, & tmp);
 
 if (len < 0)
 {
@@ -567,8 +569,23 @@
 if (! decoded)
 continue;
 
- playback->output->write_audio (frame->data[0], FMT_SIZEOF (out_fmt)
- * c->channels * frame->nb_samples);
+ gint size = FMT_SIZEOF (out_fmt) * cinfo.context->channels * frame->nb_samples;
+
+ if (planar)
+ {
+ if (bufsize < size)
+ {
+ buf = realloc (buf, size);
+ bufsize = size;
+ }
+
+ audio_interlace ((const void * *) frame->data, out_fmt,
+ cinfo.context->channels, buf, frame->nb_samples);
+ playback->output->write_audio (buf, size);
+ }
+ else
+ playback->output->write_audio (frame->data[0], size);
+
 av_free (frame);
 }
 
@@ -577,19 +594,17 @@
 }
 
 error_exit:
-
- AUDDBG("decode loop finished, shutting down\n");
-
 stop_flag = TRUE;
 
 if (pkt.data)
 av_free_packet(&pkt);
 if (codec_opened)
- avcodec_close(c);
+ avcodec_close(cinfo.context);
 if (ic != NULL)
 close_input_file(ic);
 
- AUDDBG("exiting thread\n");
+ free (buf);
+
 return ! error;
 }
 
@@ -691,7 +706,6 @@
 .extensions = ffaudio_fmts,
 .update_song_tuple = ffaudio_write_tag,
 
- /* FFMPEG probing takes forever on network files, so try everything else
- * first. -jlindgren */
+ /* lowest priority fallback */
 .priority = 10,
 )

audacious-plugins-3.3.4.tar.bz2/src/filewriter/filewriter.h -> audacious-plugins-3.4.2.tar.bz2/src/filewriter/filewriter.h Changed

audacious-plugins-3.3.4.tar.bz2/src/filewriter/flac.c -> audacious-plugins-3.4.2.tar.bz2/src/filewriter/flac.c Changed

@@ -27,6 +27,7 @@
 #include <stdlib.h>
 
 static FLAC__StreamEncoder *flac_encoder;
+static FLAC__StreamMetadata *flac_metadata;
 
 static FLAC__StreamEncoderWriteStatus flac_write_cb(const FLAC__StreamEncoder *encoder,
 const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, gpointer data)
@@ -77,6 +78,7 @@
 char * sval = tuple_get_str (tuple, field, NULL);
 temp = g_strdup_printf ("%s=%s", name, sval);
 str_unref (sval);
+ break;
 default:
 return;
 }
@@ -97,26 +99,26 @@
 
 FLAC__stream_encoder_set_channels(flac_encoder, input.channels);
 FLAC__stream_encoder_set_sample_rate(flac_encoder, input.frequency);
- FLAC__stream_encoder_init_stream(flac_encoder, flac_write_cb, flac_seek_cb, flac_tell_cb,
-				 NULL, output_file);
 
 if (tuple)
 {
- FLAC__StreamMetadata *meta;
- meta = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
-
- insert_vorbis_comment (meta, "title", tuple, FIELD_TITLE);
- insert_vorbis_comment (meta, "artist", tuple, FIELD_ARTIST);
- insert_vorbis_comment (meta, "album", tuple, FIELD_ALBUM);
- insert_vorbis_comment (meta, "genre", tuple, FIELD_GENRE);
- insert_vorbis_comment (meta, "comment", tuple, FIELD_COMMENT);
- insert_vorbis_comment (meta, "date", tuple, FIELD_DATE);
- insert_vorbis_comment (meta, "year", tuple, FIELD_YEAR);
- insert_vorbis_comment (meta, "tracknumber", tuple, FIELD_TRACK_NUMBER);
-
- FLAC__stream_encoder_set_metadata(flac_encoder, &meta, 1);
+ flac_metadata = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
+
+ insert_vorbis_comment (flac_metadata, "TITLE", tuple, FIELD_TITLE);
+ insert_vorbis_comment (flac_metadata, "ARTIST", tuple, FIELD_ARTIST);
+ insert_vorbis_comment (flac_metadata, "ALBUM", tuple, FIELD_ALBUM);
+ insert_vorbis_comment (flac_metadata, "GENRE", tuple, FIELD_GENRE);
+ insert_vorbis_comment (flac_metadata, "COMMENT", tuple, FIELD_COMMENT);
+ insert_vorbis_comment (flac_metadata, "DATE", tuple, FIELD_DATE);
+ insert_vorbis_comment (flac_metadata, "YEAR", tuple, FIELD_YEAR);
+ insert_vorbis_comment (flac_metadata, "TRACKNUMBER", tuple, FIELD_TRACK_NUMBER);
+
+ FLAC__stream_encoder_set_metadata(flac_encoder, &flac_metadata, 1);
 }
 
+ FLAC__stream_encoder_init_stream(flac_encoder, flac_write_cb, flac_seek_cb,
+ flac_tell_cb, NULL, output_file);
+
 return 1;
 }
 
@@ -170,8 +172,18 @@
 
 static void flac_close(void)
 {
- FLAC__stream_encoder_finish(flac_encoder);
- FLAC__stream_encoder_delete(flac_encoder);
+ if (flac_encoder)
+ {
+ FLAC__stream_encoder_finish(flac_encoder);
+ FLAC__stream_encoder_delete(flac_encoder);
+ flac_encoder = NULL;
+ }
+
+ if (flac_metadata)
+ {
+ FLAC__metadata_object_delete(flac_metadata);
+ flac_metadata = NULL;
+ }
 }
 
 static int flac_format_required (int fmt)

audacious-plugins-3.3.4.tar.bz2/src/filewriter/vorbis.c -> audacious-plugins-3.4.2.tar.bz2/src/filewriter/vorbis.c Changed

audacious-plugins-3.3.4.tar.bz2/src/flacng/metadata.c -> audacious-plugins-3.4.2.tar.bz2/src/flacng/metadata.c Changed

audacious-plugins-3.3.4.tar.bz2/src/flacng/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/flacng/plugin.c Changed

audacious-plugins-3.3.4.tar.bz2/src/flacng/tools.c -> audacious-plugins-3.4.2.tar.bz2/src/flacng/tools.c Changed

audacious-plugins-3.3.4.tar.bz2/src/gio/gio.c -> audacious-plugins-3.4.2.tar.bz2/src/gio/gio.c Changed

audacious-plugins-3.4.2.tar.bz2/src/gl-spectrum Added

audacious-plugins-3.4.2.tar.bz2/src/gl-spectrum/Makefile Added

audacious-plugins-3.4.2.tar.bz2/src/gl-spectrum/gl-spectrum.c Added

@@ -0,0 +1,299 @@
+/*
+ * OpenGL Spectrum Analyzer for Audacious
+ * Copyright 2013 Christophe Budé and John Lindgren
+ *
+ * Based on the XMMS plugin:
+ * Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and
+ * 4Front Technologies
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option) any later
+ * version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include <math.h>
+#include <string.h>
+
+#include <audacious/i18n.h>
+#include <audacious/plugin.h>
+
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
+
+#include <GL/gl.h>
+#include <GL/glx.h>
+
+#define NUM_BANDS 32
+#define DB_RANGE 40
+
+#define BAR_SPACING (3.2f / NUM_BANDS)
+#define BAR_WIDTH (0.8f * BAR_SPACING)
+
+static float logscale[NUM_BANDS + 1];
+static float colors[NUM_BANDS][NUM_BANDS][3];
+
+static GLXContext s_context;
+static GtkWidget * s_widget = NULL;
+
+static int s_pos = 0;
+static float s_angle = 25, s_anglespeed = 0.05f;
+static float s_bars[NUM_BANDS][NUM_BANDS];
+
+static bool_t init (void)
+{
+ for (int i = 0; i <= NUM_BANDS; i ++)
+ logscale[i] = powf (256, (float) i / NUM_BANDS) - 0.5f;
+
+ for (int y = 0; y < NUM_BANDS; y ++)
+ {
+ float yf = (float) y / (NUM_BANDS - 1);
+
+ for (int x = 0; x < NUM_BANDS; x ++)
+ {
+ float xf = (float) x / (NUM_BANDS - 1);
+
+ colors[x][y][0] = (1 - xf) * (1 - yf);
+ colors[x][y][1] = xf;
+ colors[x][y][2] = yf;
+ }
+ }
+
+ return TRUE;
+}
+
+/* stolen from the skins plugin */
+/* convert linear frequency graph to logarithmic one */
+static void make_log_graph (const float * freq, float * graph)
+{
+ for (int i = 0; i < NUM_BANDS; i ++)
+ {
+ /* sum up values in freq array between logscale[i] and logscale[i + 1],
+ including fractional parts */
+ int a = ceilf (logscale[i]);
+ int b = floorf (logscale[i + 1]);
+ float sum = 0;
+
+ if (b < a)
+ sum += freq[b] * (logscale[i + 1] - logscale[i]);
+ else
+ {
+ if (a > 0)
+ sum += freq[a - 1] * (a - logscale[i]);
+ for (; a < b; a ++)
+ sum += freq[a];
+ if (b < 256)
+ sum += freq[b] * (logscale[i + 1] - b);
+ }
+
+ /* fudge factor to make the graph have the same overall height as a
+ 12-band one no matter how many bands there are */
+ sum *= (float) NUM_BANDS / 12;
+
+ /* convert to dB */
+ float val = 20 * log10f (sum);
+
+ /* scale (-DB_RANGE, 0.0) to (0.0, 1.0) */
+ val = 1 + val / DB_RANGE;
+
+ graph[i] = CLAMP (val, 0, 1);
+ }
+}
+
+static void render_freq (const float * freq)
+{
+ make_log_graph (freq, s_bars[s_pos]);
+ s_pos = (s_pos + 1) % NUM_BANDS;
+
+ s_angle += s_anglespeed;
+ if (s_angle > 45 || s_angle < -45)
+ s_anglespeed = -s_anglespeed;
+
+ if (s_widget)
+ gtk_widget_queue_draw (s_widget);
+}
+
+static void clear (void)
+{
+ memset (s_bars, 0, sizeof s_bars);
+
+ if (s_widget)
+ gtk_widget_queue_draw (s_widget);
+}
+
+static void draw_rectangle (float x1, float y1, float z1, float x2, float y2,
+ float z2, float r, float g, float b)
+{
+ glColor3f (r, g, b);
+
+ glBegin (GL_POLYGON);
+ glVertex3f (x1, y2, z1);
+ glVertex3f (x2, y2, z1);
+ glVertex3f (x2, y2, z2);
+ glVertex3f (x1, y2, z2);
+ glEnd ();
+
+ glColor3f (0.65f * r, 0.65f * g, 0.65f * b);
+
+ glBegin (GL_POLYGON);
+ glVertex3f (x1, y1, z1);
+ glVertex3f (x1, y2, z1);
+ glVertex3f (x1, y2, z2);
+ glVertex3f (x1, y1, z2);
+ glEnd ();
+
+ glBegin (GL_POLYGON);
+ glVertex3f (x2, y2, z1);
+ glVertex3f (x2, y1, z1);
+ glVertex3f (x2, y1, z2);
+ glVertex3f (x2, y2, z2);
+ glEnd ();
+
+ glColor3f (0.8f * r, 0.8f * g, 0.8f * b);
+
+ glBegin (GL_POLYGON);
+ glVertex3f (x1, y1, z1);
+ glVertex3f (x2, y1, z1);
+ glVertex3f (x2, y2, z1);
+ glVertex3f (x1, y2, z1);
+ glEnd ();
+}
+
+static void draw_bar (float x, float z, float h, float r, float g, float b)
+{
+ draw_rectangle (x, 0, z, x + BAR_WIDTH, h, z + BAR_WIDTH,
+ r * (0.2f + 0.8f * h), g * (0.2f + 0.8f * h), b * (0.2f + 0.8f * h));
+}
+
+static void draw_bars (void)
+{
+ glPushMatrix ();
+ glTranslatef (0.0f, -0.5f, -5.0f);
+ glRotatef (38.0f, 1.0f, 0.0f, 0.0f);
+ glRotatef (s_angle + 180.0f, 0.0f, 1.0f, 0.0f);
+ glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+
+ for (int i = 0; i < NUM_BANDS; i ++)
+ {
+ float z = -1.6f + (NUM_BANDS - i) * BAR_SPACING;
+
+ for (int j = 0; j < NUM_BANDS; j ++)
+ {
+ draw_bar (1.6f - BAR_SPACING * j, z,
+ s_bars[(s_pos + i) % NUM_BANDS][j] * 1.6,
+ colors[i][j][0], colors[i][j][1], colors[i][j][2]);
+ }
+ }
+
+ glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+ glPopMatrix ();
+}
+
+static bool_t draw_cb (GtkWidget * widget, cairo_t * cr)
+{
+ Display * xdisplay = GDK_SCREEN_XDISPLAY (gdk_screen_get_default ());
+ Window xwindow = GDK_WINDOW_XID (gtk_widget_get_window (widget));
+
+ glXMakeCurrent (xdisplay, xwindow, s_context);
+
+ GtkAllocation alloc;
+ gtk_widget_get_allocation (widget, & alloc);
+ glViewport (0, 0, alloc.width, alloc.height);
+
+ glDisable (GL_BLEND);
+ glMatrixMode (GL_PROJECTION);
+ glPushMatrix();
+ glLoadIdentity();
+ glFrustum (-1.1f, 1, -1.5f, 1, 2, 10);
+ glMatrixMode (GL_MODELVIEW);
+ glPushMatrix ();
+ glLoadIdentity ();
+ glEnable (GL_DEPTH_TEST);
+ glDepthFunc (GL_LESS);
+ glPolygonMode (GL_FRONT, GL_FILL);
+ glEnable (GL_BLEND);
+ glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+
+ glClearColor (0, 0, 0, 1);
+ glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ draw_bars ();
+
+ glPopMatrix ();
+ glMatrixMode (GL_PROJECTION);
+ glPopMatrix ();
+ glDisable (GL_DEPTH_TEST);
+ glDisable (GL_BLEND);
+ glDepthMask (GL_TRUE);
+
+ glXSwapBuffers (xdisplay, xwindow);
+
+ return TRUE;
+}
+
+static /* GtkWidget * */ void * get_widget (void)
+{
+ if (s_widget)
+ return s_widget;
+
+ s_widget = gtk_drawing_area_new ();
+
+ g_signal_connect (s_widget, "draw", (GCallback) draw_cb, NULL);
+ g_signal_connect (s_widget, "destroy", (GCallback) gtk_widget_destroyed, & s_widget);
+
+ GdkScreen * screen = gdk_screen_get_default ();
+ Display * xdisplay = GDK_SCREEN_XDISPLAY (screen);
+ int nscreen = GDK_SCREEN_XNUMBER (screen);
+
+ /* Create s_context */
+ int attribs[] = {
+ GLX_RGBA,
+ GLX_RED_SIZE, 1,
+ GLX_GREEN_SIZE, 1,
+ GLX_BLUE_SIZE, 1,
+ GLX_ALPHA_SIZE, 1,
+ GLX_DOUBLEBUFFER,
+ GLX_DEPTH_SIZE, 1,
+ None
+ };
+
+ XVisualInfo * xvinfo = glXChooseVisual (xdisplay, nscreen, attribs);
+ s_context = glXCreateContext (xdisplay, xvinfo, 0, True);
+
+ /* Fix up visual/colormap */
+ GdkVisual * visual = gdk_x11_screen_lookup_visual (screen, xvinfo->visualid);
+ gtk_widget_set_visual (s_widget, visual);
+
+ /* Disable GTK double buffering */
+ gtk_widget_set_double_buffered (s_widget, FALSE);
+
+ return s_widget;
+}
+
+static const char about_text[] =
+ N_("OpenGL Spectrum Analyzer for Audacious\n"
+ "Copyright 2013 Christophe Budé and John Lindgren\n\n"
+ "Based on the XMMS plugin:\n"
+ "Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, "
+ "and 4Front Technologies\n\n"
+ "License: GPLv2+");
+
+AUD_VIS_PLUGIN
+(
+ .name = N_("OpenGL Spectrum Analyzer"),
+ .domain = PACKAGE,
+ .about_text = about_text,
+ .init = init,
+ .render_freq = render_freq,
+ .clear = clear,
+ .get_widget = get_widget,
+)

audacious-plugins-3.3.4.tar.bz2/src/gnomeshortcuts/gnomeshortcuts.c -> audacious-plugins-3.4.2.tar.bz2/src/gnomeshortcuts/gnomeshortcuts.c Changed

@@ -1,4 +1,3 @@
-/* -*- Mode: C; indent-tabs: t; c-basic-offset: 9; tab-width: 9 -*- */
 /*
 * This file is part of audacious-gnome-shortcut plugin for audacious
 *
@@ -21,8 +20,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <config.h>
-
 #include <string.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-bindings.h>
@@ -42,16 +39,16 @@
 
 static const char about[] =
 N_("Gnome Shortcut Plugin\n"
-	"Lets you control the player with Gnome's shortcuts.\n\n"
-	"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>");
+ "Lets you control the player with Gnome's shortcuts.\n\n"
+ "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>");
 
 AUD_GENERAL_PLUGIN
 (
-	.name = N_("Gnome Shortcuts"),
-	.domain = PACKAGE,
-	.about_text = about,
-	.init = init,
-	.cleanup = cleanup
+ .name = N_("Gnome Shortcuts"),
+ .domain = PACKAGE,
+ .about_text = about,
+ .init = init,
+ .cleanup = cleanup
 )
 
 #define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
@@ -59,255 +56,239 @@
 
 static void
 hotkey_marshal_VOID__STRING_STRING (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data)
+ GValue *return_value,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer invocation_hint,
+ gpointer marshal_data)
 {
-	typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1,
-							gpointer arg_1,
-							gpointer arg_2);
-	register GMarshalFunc_VOID__STRING_STRING callback;
-	register GCClosure *cc = (GCClosure*) closure;
-	register gpointer data1;
-
-	g_return_if_fail (n_param_values == 3);
-
-	if (G_CCLOSURE_SWAP_DATA (closure))
-	{
-		data1 = closure->data;
-	} else {
-		data1 = g_value_peek_pointer (param_values + 0);
-	}
-	callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback);
-
-	callback (data1,
-		g_marshal_value_peek_string (param_values + 1),
-		g_marshal_value_peek_string (param_values + 2));
+ typedef void (*GMarshalFunc_VOID__STRING_STRING) (gpointer data1,
+ gpointer arg_1,
+ gpointer arg_2);
+ register GMarshalFunc_VOID__STRING_STRING callback;
+ register GCClosure *cc = (GCClosure*) closure;
+ register gpointer data1;
+
+ g_return_if_fail (n_param_values == 3);
+
+ if (G_CCLOSURE_SWAP_DATA (closure))
+ {
+ data1 = closure->data;
+ } else {
+ data1 = g_value_peek_pointer (param_values + 0);
+ }
+ callback = (GMarshalFunc_VOID__STRING_STRING) (marshal_data ? marshal_data : cc->callback);
+
+ callback (data1,
+ g_marshal_value_peek_string (param_values + 1),
+ g_marshal_value_peek_string (param_values + 2));
 }
 
 static void
 on_media_player_key_pressed (DBusGProxy *proxy, const gchar *application, const gchar *key)
 {
-	if (strcmp ("Audacious", application) == 0) {
-		gint current_volume /* , old_volume */ ;
-		static gint volume_static = 0;
-		gboolean play, mute;
-
-		/* playing or not */
-		play = aud_drct_get_playing ();
-
-		/* get current volume */
-		aud_drct_get_volume_main (&current_volume);
-		/* old_volume = current_volume; */
-		if (current_volume)
-		{
-			/* volume is not mute */
-			mute = FALSE;
-		} else {
-			/* volume is mute */
-			mute = TRUE;
-		}
-
-		/* mute the playback */
-		if (strcmp ("Mute", key) == 0)
-		{
-			if (!mute)
-			{
-				volume_static = current_volume;
-				aud_drct_set_volume_main (0);
-				mute = TRUE;
-			} else {
-				aud_drct_set_volume_main (volume_static);
-				mute = FALSE;
-			}
-			return;
-		}
-
-		/* decreace volume */
-/*		if ((keycode == plugin_cfg.vol_down) && (state == plugin_cfg.vol_down_mask))
-		{
-			if (mute)
-			{
-				current_volume = old_volume;
-				old_volume = 0;
-				mute = FALSE;
-			}
-
-			if ((current_volume -= plugin_cfg.vol_decrement) < 0)
-			{
-				current_volume = 0;
-			}
-
-			if (current_volume != old_volume)
-			{
-				xmms_remote_set_main_volume (audacioushotkey.xmms_session,
-							current_volume);
-			}
-
-			old_volume = current_volume;
-			return TRUE;
-		}*/
-
-		/* increase volume */
-/*		if ((keycode == plugin_cfg.vol_up) && (state == plugin_cfg.vol_up_mask))
-		{
-			if (mute)
-			{
-				current_volume = old_volume;
-				old_volume = 0;
-				mute = FALSE;
-			}
-
-			if ((current_volume += plugin_cfg.vol_increment) > 100)
-			{
-				current_volume = 100;
-			}
-
-			if (current_volume != old_volume)
-			{
-				xmms_remote_set_main_volume (audacioushotkey.xmms_session,
-							current_volume);
-			}
-
-			old_volume = current_volume;
-			return TRUE;
-		}*/
-
-		/* play */
-		if (strcmp ("Play", key) == 0)
-		{
-			if (!play)
-			{
-				aud_drct_play ();
-			} else {
-				aud_drct_pause ();
-			}
-			return;
-		}
-
-		/* pause */
-		if (strcmp ("Pause", key) == 0)
-		{
-			if (!play) aud_drct_play ();
-			else aud_drct_pause ();
-
-			return;
-		}
-
-		/* stop */
-		if (strcmp ("Stop", key) == 0)
-		{
-			aud_drct_stop ();
-			return;
-		}
-
-		/* prev track */
-		if (strcmp ("Previous", key) == 0)
-		{
-			aud_drct_pl_prev ();
-			return;
-		}
-
-		/* next track */
-		if (strcmp ("Next", key) == 0)
-		{
-			aud_drct_pl_next ();
-			return;
-		}
-	}
+ if (strcmp ("Audacious", application) == 0) {
+ gint current_volume /* , old_volume */ ;
+ static gint volume_static = 0;
+ gboolean mute;
+
+ /* get current volume */
+ aud_drct_get_volume_main (&current_volume);
+ /* old_volume = current_volume; */
+ if (current_volume)
+ {
+ /* volume is not mute */
+ mute = FALSE;
+ } else {
+ /* volume is mute */
+ mute = TRUE;
+ }
+
+ /* mute the playback */
+ if (strcmp ("Mute", key) == 0)
+ {
+ if (!mute)
+ {
+ volume_static = current_volume;
+ aud_drct_set_volume_main (0);
+ mute = TRUE;
+ } else {
+ aud_drct_set_volume_main (volume_static);
+ mute = FALSE;
+ }
+ return;
+ }
+
+ /* decreace volume */
+/* if ((keycode == plugin_cfg.vol_down) && (state == plugin_cfg.vol_down_mask))
+ {
+ if (mute)
+ {
+ current_volume = old_volume;
+ old_volume = 0;
+ mute = FALSE;
+ }
+
+ if ((current_volume -= plugin_cfg.vol_decrement) < 0)
+ {
+ current_volume = 0;
+ }
+
+ if (current_volume != old_volume)
+ {
+ xmms_remote_set_main_volume (audacioushotkey.xmms_session,
+ current_volume);
+ }
+
+ old_volume = current_volume;
+ return TRUE;
+ }*/
+
+ /* increase volume */
+/* if ((keycode == plugin_cfg.vol_up) && (state == plugin_cfg.vol_up_mask))
+ {
+ if (mute)
+ {
+ current_volume = old_volume;
+ old_volume = 0;
+ mute = FALSE;
+ }
+
+ if ((current_volume += plugin_cfg.vol_increment) > 100)
+ {
+ current_volume = 100;
+ }
+
+ if (current_volume != old_volume)
+ {
+ xmms_remote_set_main_volume (audacioushotkey.xmms_session,
+ current_volume);
+ }
+
+ old_volume = current_volume;
+ return TRUE;
+ }*/
+
+ /* play or pause */
+ if (strcmp ("Play", key) == 0 || strcmp ("Pause", key) == 0)
+ {
+ aud_drct_play_pause ();
+ return;
+ }
+
+ /* stop */
+ if (strcmp ("Stop", key) == 0)
+ {
+ aud_drct_stop ();
+ return;
+ }
+
+ /* prev track */
+ if (strcmp ("Previous", key) == 0)
+ {
+ aud_drct_pl_prev ();
+ return;
+ }
+
+ /* next track */
+ if (strcmp ("Next", key) == 0)
+ {
+ aud_drct_pl_next ();
+ return;
+ }
+ }
 }
 
 void gnome_remote_uninit ()
 {
-	GError *error = NULL;
-	if (media_player_keys_proxy == NULL) return;
-
-	dbus_g_proxy_disconnect_signal (media_player_keys_proxy, "MediaPlayerKeyPressed",
-			G_CALLBACK (on_media_player_key_pressed), NULL);
-
-	dbus_g_proxy_call (media_player_keys_proxy,
-				"ReleaseMediaPlayerKeys", &error,
-				G_TYPE_STRING, "Audacious",
-				G_TYPE_INVALID, G_TYPE_INVALID);
-	if (error != NULL) {
-		g_warning ("Could not release media player keys: %s", error->message);
-		g_error_free (error);
-	}
-	g_object_unref(media_player_keys_proxy);
-	media_player_keys_proxy = NULL;
+ GError *error = NULL;
+ if (media_player_keys_proxy == NULL) return;
+
+ dbus_g_proxy_disconnect_signal (media_player_keys_proxy, "MediaPlayerKeyPressed",
+ G_CALLBACK (on_media_player_key_pressed), NULL);
+
+ dbus_g_proxy_call (media_player_keys_proxy,
+ "ReleaseMediaPlayerKeys", &error,
+ G_TYPE_STRING, "Audacious",
+ G_TYPE_INVALID, G_TYPE_INVALID);
+ if (error != NULL) {
+ g_warning ("Could not release media player keys: %s", error->message);
+ g_error_free (error);
+ }
+ g_object_unref(media_player_keys_proxy);
+ media_player_keys_proxy = NULL;
 }
 
 void gnome_remote_init ()
 {
-	DBusGConnection *bus;
-	GError *error = NULL;
-	dbus_g_thread_init();
-
-	bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-	if ((bus == NULL) || error) {
-		g_warning ("Error connecting to DBus: %s", error->message);
-	} else {
-		media_player_keys_proxy = dbus_g_proxy_new_for_name (bus,
-			"org.gnome.SettingsDaemon",
-			"/org/gnome/SettingsDaemon/MediaKeys",
-			"org.gnome.SettingsDaemon.MediaKeys");
-		if (media_player_keys_proxy == NULL) return;
-
-		dbus_g_proxy_call (media_player_keys_proxy,
-				"GrabMediaPlayerKeys", &error,
-				G_TYPE_STRING, "Audacious",
-				G_TYPE_UINT, 0,
-				G_TYPE_INVALID,
-				G_TYPE_INVALID);
-		if (error != NULL) {
-			g_error_free (error);
-			error = NULL;
-			g_object_unref(media_player_keys_proxy);
-			media_player_keys_proxy = NULL;
- 			media_player_keys_proxy = dbus_g_proxy_new_for_name (bus,
-				"org.gnome.SettingsDaemon",
-				"/org/gnome/SettingsDaemon",
-				"org.gnome.SettingsDaemon");
-			if (media_player_keys_proxy == NULL) return;
-
-			dbus_g_proxy_call (media_player_keys_proxy,
-					"GrabMediaPlayerKeys", &error,
-					G_TYPE_STRING, "Audacious",
-					G_TYPE_UINT, 0,
-					G_TYPE_INVALID,
-					G_TYPE_INVALID);
-			if (error != NULL) {
-				g_warning ("Could not grab media player keys: %s", error->message);
-				g_error_free (error);
-				g_object_unref(media_player_keys_proxy);
-				media_player_keys_proxy = NULL;
-				return;
-			}
-		}
-
-		dbus_g_object_register_marshaller (hotkey_marshal_VOID__STRING_STRING,
-				G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-
-		dbus_g_proxy_add_signal (media_player_keys_proxy, "MediaPlayerKeyPressed",
-				G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
-
-		dbus_g_proxy_connect_signal (media_player_keys_proxy, "MediaPlayerKeyPressed",
-				G_CALLBACK (on_media_player_key_pressed), NULL, NULL);
-	}
+ DBusGConnection *bus;
+ GError *error = NULL;
+ dbus_g_thread_init();
+
+ bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
+ if ((bus == NULL) && error) {
+ g_warning ("Error connecting to DBus: %s", error->message);
+ g_error_free (error);
+ } else {
+ media_player_keys_proxy = dbus_g_proxy_new_for_name (bus,
+ "org.gnome.SettingsDaemon",
+ "/org/gnome/SettingsDaemon/MediaKeys",
+ "org.gnome.SettingsDaemon.MediaKeys");
+ if (media_player_keys_proxy == NULL) return;
+
+ dbus_g_proxy_call (media_player_keys_proxy,
+ "GrabMediaPlayerKeys", &error,
+ G_TYPE_STRING, "Audacious",
+ G_TYPE_UINT, 0,
+ G_TYPE_INVALID,
+ G_TYPE_INVALID);
+ if (error != NULL) {
+ g_error_free (error);
+ error = NULL;
+ g_object_unref(media_player_keys_proxy);
+ media_player_keys_proxy = NULL;
+ media_player_keys_proxy = dbus_g_proxy_new_for_name (bus,
+ "org.gnome.SettingsDaemon",
+ "/org/gnome/SettingsDaemon",
+ "org.gnome.SettingsDaemon");
+ if (media_player_keys_proxy == NULL) return;
+
+ dbus_g_proxy_call (media_player_keys_proxy,
+ "GrabMediaPlayerKeys", &error,
+ G_TYPE_STRING, "Audacious",
+ G_TYPE_UINT, 0,
+ G_TYPE_INVALID,
+ G_TYPE_INVALID);
+ if (error != NULL) {
+ g_warning ("Could not grab media player keys: %s", error->message);
+ g_error_free (error);
+ g_object_unref(media_player_keys_proxy);
+ media_player_keys_proxy = NULL;
+ return;
+ }
+ }
+
+ dbus_g_object_register_marshaller (hotkey_marshal_VOID__STRING_STRING,
+ G_TYPE_NONE, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+
+ dbus_g_proxy_add_signal (media_player_keys_proxy, "MediaPlayerKeyPressed",
+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID);
+
+ dbus_g_proxy_connect_signal (media_player_keys_proxy, "MediaPlayerKeyPressed",
+ G_CALLBACK (on_media_player_key_pressed), NULL, NULL);
+ }
 }
 
 static gboolean init (void)
 {
-	gnome_remote_init();
-	loaded = TRUE;
-	return TRUE;
+ gnome_remote_init();
+ loaded = TRUE;
+ return TRUE;
 }
 
 static void cleanup (void)
 {
-	if (!loaded) return;
-	gnome_remote_uninit();
-	loaded = FALSE;
+ if (!loaded) return;
+ gnome_remote_uninit();
+ loaded = FALSE;
 }

audacious-plugins-3.3.4.tar.bz2/src/gtkui/columns.c -> audacious-plugins-3.4.2.tar.bz2/src/gtkui/columns.c Changed

audacious-plugins-3.3.4.tar.bz2/src/gtkui/gtkui.h -> audacious-plugins-3.4.2.tar.bz2/src/gtkui/gtkui.h Changed

audacious-plugins-3.3.4.tar.bz2/src/gtkui/layout.c -> audacious-plugins-3.4.2.tar.bz2/src/gtkui/layout.c Changed

audacious-plugins-3.3.4.tar.bz2/src/gtkui/menus.c -> audacious-plugins-3.4.2.tar.bz2/src/gtkui/menus.c Changed

@@ -28,7 +28,6 @@
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
-#include "config.h"
 #include "gtkui.h"
 #include "playlist_util.h"
 #include "ui_playlist_notebook.h"
@@ -84,11 +83,23 @@
 static void pl_sort_artist (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_ARTIST); }
 static void pl_sort_album (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_ALBUM); }
 static void pl_sort_date (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_DATE); }
+static void pl_sort_length (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_LENGTH); }
 static void pl_sort_path (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_PATH); }
 static void pl_sort_custom (void) {aud_playlist_sort_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_FORMATTED_TITLE); }
 static void pl_reverse (void) {aud_playlist_reverse (aud_playlist_get_active ()); }
 static void pl_random (void) {aud_playlist_randomize (aud_playlist_get_active ()); }
 
+static void pl_sort_selected_track (void) {aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_TRACK); }
+static void pl_sort_selected_title (void) {aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_TITLE); }
+static void pl_sort_selected_artist (void) {aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_ARTIST); }
+static void pl_sort_selected_album (void) {aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_ALBUM); }
+static void pl_sort_selected_date (void) {aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_DATE); }
+static void pl_sort_selected_length (void) {aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_LENGTH); }
+static void pl_sort_selected_path (void) {aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_PATH); }
+static void pl_sort_selected_custom (void) {aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_FORMATTED_TITLE); }
+static void pl_reverse_selected (void) {aud_playlist_reverse_selected (aud_playlist_get_active ()); }
+static void pl_random_selected (void) {aud_playlist_randomize_selected (aud_playlist_get_active ()); }
+
 static void pl_new (void)
 {
 aud_playlist_insert (-1);
@@ -98,6 +109,9 @@
 static void pl_play (void) {aud_drct_play_playlist (aud_playlist_get_active ()); }
 static void pl_refresh (void) {aud_playlist_rescan (aud_playlist_get_active ()); }
 static void pl_remove_failed (void) {aud_playlist_remove_failed (aud_playlist_get_active ()); }
+static void pl_remove_dupes_by_title (void) {aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_TITLE); }
+static void pl_remove_dupes_by_filename (void) {aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_FILENAME); }
+static void pl_remove_dupes_by_path (void) {aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), PLAYLIST_SORT_PATH); }
 static void pl_rename (void) {ui_playlist_notebook_edit_tab_title (aud_playlist_get_active ()); }
 static void pl_close (void) {audgui_confirm_playlist_delete (aud_playlist_get_active ()); }
 static void pl_refresh_sel (void) {aud_playlist_rescan_selected (aud_playlist_get_active ()); }
@@ -145,12 +159,9 @@
 static gboolean infoarea_get (void) {return aud_get_bool ("gtkui", "infoarea_visible"); }
 static gboolean infoarea_vis_get (void) {return aud_get_bool ("gtkui", "infoarea_show_vis"); }
 static gboolean status_bar_get (void) {return aud_get_bool ("gtkui", "statusbar_visible"); }
+static gboolean remaining_time_get (void) {return aud_get_bool ("gtkui", "show_remaining_time"); }
+static void remaining_time_set (gboolean show) {aud_set_bool ("gtkui", "show_remaining_time", show); }
 static gboolean close_button_get (void) {return aud_get_bool ("gtkui", "close_button_visible"); }
-static void close_button_set (gboolean show)
-{
- aud_set_bool ("gtkui", "close_button_visible", show);
- show_close_buttons (show);
-}
 static gboolean column_headers_get (void) {return aud_get_bool ("gtkui", "playlist_headers"); }
 static gboolean autoscroll_get (void) {return aud_get_bool ("gtkui", "autoscroll"); }
 static void autoscroll_set (gboolean on) {aud_set_bool ("gtkui", "autoscroll", on); }
@@ -177,30 +188,55 @@
 {N_("_Repeat"), NULL, 'r', CTRL, .get = repeat_get, repeat_set, "set repeat"},
 {N_("S_huffle"), NULL, 's', CTRL, .get = shuffle_get, shuffle_set, "set shuffle"},
 {N_("N_o Playlist Advance"), NULL, 'n', CTRL, .get = no_advance_get, no_advance_set, "set no_playlist_advance"},
- {N_("Stop _After This Song"), NULL, 'm', CTRL, .get = stop_after_get, stop_after_set, "set stop_after_current_song"},
+ {N_("Stop A_fter This Song"), NULL, 'm', CTRL, .get = stop_after_get, stop_after_set, "set stop_after_current_song"},
 {.sep = TRUE},
 {N_("Song _Info ..."), GTK_STOCK_INFO, 'i', CTRL, .func = audgui_infowin_show_current},
 {N_("Jump to _Time ..."), GTK_STOCK_JUMP_TO, 'k', CTRL, .func = audgui_jump_to_time},
- {N_("_Jump to Song ..."), GTK_STOCK_JUMP_TO, 'j', CTRL, .func = audgui_jump_to_track}};
+ {N_("_Jump to Song ..."), GTK_STOCK_JUMP_TO, 'j', CTRL, .func = audgui_jump_to_track},
+ {.sep = TRUE},
+ {N_("Set Repeat Point _A"), NULL, '1', CTRL, .func = set_ab_repeat_a},
+ {N_("Set Repeat Point _B"), NULL, '2', CTRL, .func = set_ab_repeat_b},
+ {N_("_Clear Repeat Points"), NULL, '3', CTRL, .func = clear_ab_repeat}};
+
+static const struct MenuItem dupe_items[] = {
+ {N_("By _Title"), .func = pl_remove_dupes_by_title},
+ {N_("By _Filename"), .func = pl_remove_dupes_by_filename},
+ {N_("By File _Path"), .func = pl_remove_dupes_by_path}};
 
 static const struct MenuItem sort_items[] = {
 {N_("By Track _Number"), .func = pl_sort_track},
 {N_("By _Title"), .func = pl_sort_title},
 {N_("By _Artist"), .func = pl_sort_artist},
- {N_("By A_lbum"), .func = pl_sort_album},
+ {N_("By Al_bum"), .func = pl_sort_album},
 {N_("By Release _Date"), .func = pl_sort_date},
+ {N_("By _Length"), .func = pl_sort_length},
 {N_("By _File Path"), .func = pl_sort_path},
 {N_("By _Custom Title"), .func = pl_sort_custom},
 {.sep = TRUE},
 {N_("R_everse Order"), GTK_STOCK_SORT_DESCENDING, .func = pl_reverse},
 {N_("_Random Order"), .func = pl_random}};
 
+ static const struct MenuItem sort_selected_items[] = {
+ {N_("By Track _Number"), .func = pl_sort_selected_track},
+ {N_("By _Title"), .func = pl_sort_selected_title},
+ {N_("By _Artist"), .func = pl_sort_selected_artist},
+ {N_("By Al_bum"), .func = pl_sort_selected_album},
+ {N_("By Release _Date"), .func = pl_sort_selected_date},
+ {N_("By _Length"), .func = pl_sort_selected_length},
+ {N_("By _File Path"), .func = pl_sort_selected_path},
+ {N_("By _Custom Title"), .func = pl_sort_selected_custom},
+ {.sep = TRUE},
+ {N_("R_everse Order"), GTK_STOCK_SORT_DESCENDING, .func = pl_reverse_selected},
+ {N_("_Random Order"), .func = pl_random_selected}};
+
 static const struct MenuItem playlist_items[] = {
 {N_("_Play This Playlist"), GTK_STOCK_MEDIA_PLAY, GDK_KEY_Return, SHIFT | CTRL, .func = pl_play},
 {N_("_Refresh"), GTK_STOCK_REFRESH, GDK_KEY_F5, .func = pl_refresh},
- {N_("Remove _Unavailable Files"), GTK_STOCK_REMOVE, .func = pl_remove_failed},
 {.sep = TRUE},
 {N_("_Sort"), GTK_STOCK_SORT_ASCENDING, .items = sort_items, G_N_ELEMENTS (sort_items)},
+ {N_("Sort Se_lected"), GTK_STOCK_SORT_ASCENDING, .items = sort_selected_items, G_N_ELEMENTS (sort_selected_items)},
+ {N_("Remove _Duplicates"), GTK_STOCK_REMOVE, .items = dupe_items, G_N_ELEMENTS (dupe_items)},
+ {N_("Remove _Unavailable Files"), GTK_STOCK_REMOVE, .func = pl_remove_failed},
 {.sep = TRUE},
 {N_("_New"), GTK_STOCK_NEW, 't', CTRL, .func = pl_new},
 {N_("Ren_ame ..."), GTK_STOCK_EDIT, GDK_KEY_F2, .func = pl_rename},
@@ -229,7 +265,9 @@
 {N_("Show Info Bar Vis_ualization"), .get = infoarea_vis_get, show_infoarea_vis},
 {N_("Show _Status Bar"), NULL, 's', SHIFT | CTRL, .get = status_bar_get, show_statusbar},
 {.sep = TRUE},
- {N_("Show Close _Buttons"), NULL, .get = close_button_get, close_button_set},
+ {N_("Show _Remaining Time"), NULL, 'r', SHIFT | CTRL, .get = remaining_time_get, remaining_time_set},
+ {.sep = TRUE},
+ {N_("Show Close _Buttons"), .get = close_button_get, show_close_buttons},
 {N_("Show Column _Headers"), .get = column_headers_get, playlist_show_headers},
 {N_("Choose _Columns ..."), .func = pw_col_choose},
 {N_("Scrol_l on Song Change"), .get = autoscroll_get, autoscroll_set}};

audacious-plugins-3.3.4.tar.bz2/src/gtkui/playlist_util.c -> audacious-plugins-3.4.2.tar.bz2/src/gtkui/playlist_util.c Changed

@@ -51,18 +51,10 @@
 return selected;
 }
 
-gint playlist_get_focus (gint list)
-{
- GtkWidget * tree = playlist_get_treeview (list);
- g_return_val_if_fail (tree, -1);
-
- return audgui_list_get_focus (tree);
-}
-
 void playlist_song_info (void)
 {
 gint list = aud_playlist_get_active ();
- gint focus = playlist_get_focus (list);
+ gint focus = aud_playlist_get_focus (list);
 
 if (focus < 0)
 return;
@@ -73,7 +65,7 @@
 void playlist_queue_toggle (void)
 {
 gint list = aud_playlist_get_active ();
- gint focus = playlist_get_focus (list);
+ gint focus = aud_playlist_get_focus (list);
 
 if (focus < 0)
 return;
@@ -89,21 +81,8 @@
 void playlist_delete_selected (void)
 {
 gint list = aud_playlist_get_active ();
- gint focus = playlist_get_focus (list);
- focus -= playlist_count_selected_in_range (list, 0, focus);
-
- aud_drct_pl_delete_selected (list);
-
- if (aud_playlist_selected_count (list)) /* song changed? */
- return;
-
- if (focus == aud_playlist_entry_count (list))
- focus --;
- if (focus >= 0)
- {
- aud_playlist_entry_set_selected (list, focus, TRUE);
- playlist_set_focus (list, focus);
- }
+ aud_playlist_delete_selected (list);
+ aud_playlist_entry_set_selected (list, aud_playlist_get_focus (list), TRUE);
 }
 
 void playlist_copy (void)
@@ -130,18 +109,17 @@
 return;
 
 gint list = aud_playlist_get_active ();
- audgui_urilist_insert (list, playlist_get_focus (list), text);
+ audgui_urilist_insert (list, aud_playlist_get_focus (list), text);
 g_free (text);
 }
 
 void playlist_shift (gint offset)
 {
 gint list = aud_playlist_get_active ();
- gint focus = playlist_get_focus (list);
+ gint focus = aud_playlist_get_focus (list);
 
 if (focus < 0 || ! aud_playlist_entry_get_selected (list, focus))
 return;
 
- focus += aud_playlist_shift (list, focus, offset);
- playlist_set_focus (list, focus);
+ aud_playlist_shift (list, focus, offset);
 }

audacious-plugins-3.3.4.tar.bz2/src/gtkui/playlist_util.h -> audacious-plugins-3.4.2.tar.bz2/src/gtkui/playlist_util.h Changed

audacious-plugins-3.3.4.tar.bz2/src/gtkui/ui_gtk.c -> audacious-plugins-3.4.2.tar.bz2/src/gtkui/ui_gtk.c Changed

@@ -1,6 +1,6 @@
 /*
 * ui_gtk.c
- * Copyright 2009 William Pitcock, Tomasz Moń, Michał Lipski, and John Lindgren
+ * Copyright 2009-2012 William Pitcock, Tomasz Moń, Michał Lipski, and John Lindgren
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@@ -33,7 +33,6 @@
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
-#include "config.h"
 #include "gtkui.h"
 #include "layout.h"
 #include "ui_playlist_notebook.h"
@@ -46,24 +45,21 @@
 "infoarea_show_vis", "TRUE",
 "infoarea_visible", "TRUE",
 "menu_visible", "TRUE",
- "player_visible", "TRUE",
 "statusbar_visible", "TRUE",
 "close_button_visible", "TRUE",
 
 "autoscroll", "TRUE",
 "playlist_columns", "title artist album queued length",
 "playlist_headers", "TRUE",
+ "show_remaining_time", "FALSE",
 
- "player_x", "-1",
- "player_y", "-1",
+ "player_x", "-1000",
+ "player_y", "-1000",
 "player_width", "760",
 "player_height", "460",
 
- /* hidden settings */
- "always_on_top", "FALSE",
- "save_window_position", "TRUE",
- "show_song_titles", "TRUE",
- NULL};
+ NULL
+};
 
 static PluginHandle * search_tool;
 
@@ -123,6 +119,19 @@
 aud_set_int ("gtkui", "player_height", h);
 }
 
+static void restore_window_size (void)
+{
+ gint x = aud_get_int ("gtkui", "player_x");
+ gint y = aud_get_int ("gtkui", "player_y");
+ gint w = aud_get_int ("gtkui", "player_width");
+ gint h = aud_get_int ("gtkui", "player_height");
+
+ gtk_window_set_default_size ((GtkWindow *) window, w, h);
+
+ if (x > -1000 && y > -1000)
+ gtk_window_move ((GtkWindow *) window, x, y);
+}
+
 static gboolean window_delete()
 {
 gboolean handle = FALSE;
@@ -146,12 +155,31 @@
 audgui_run_filebrowser (FALSE);
 }
 
-static void button_play_pressed (void)
+void set_ab_repeat_a (void)
 {
- if (aud_drct_get_playing () && ! aud_drct_get_paused ())
- aud_drct_pause ();
- else
- aud_drct_play ();
+ if (! aud_drct_get_playing ())
+ return;
+
+ int a, b;
+ aud_drct_get_ab_repeat (& a, & b);
+ a = aud_drct_get_time ();
+ aud_drct_set_ab_repeat (a, b);
+}
+
+void set_ab_repeat_b (void)
+{
+ if (! aud_drct_get_playing ())
+ return;
+
+ int a, b;
+ aud_drct_get_ab_repeat (& a, & b);
+ b = aud_drct_get_time ();
+ aud_drct_set_ab_repeat (a, b);
+}
+
+void clear_ab_repeat (void)
+{
+ aud_drct_set_ab_repeat (-1, -1);
 }
 
 static gboolean title_change_cb (void)
@@ -162,7 +190,7 @@
 delayed_title_change_source = 0;
 }
 
- if (aud_drct_get_playing () && aud_get_bool ("gtkui", "show_song_titles"))
+ if (aud_drct_get_playing ())
 {
 if (aud_drct_get_ready ())
 {
@@ -183,36 +211,31 @@
 
 static void ui_show (gboolean show)
 {
- aud_set_bool ("gtkui", "player_visible", show);
-
 if (show)
 {
- if (aud_get_bool ("gtkui", "save_window_position") && ! gtk_widget_get_visible (window))
- {
- gint x = aud_get_int ("gtkui", "player_x");
- gint y = aud_get_int ("gtkui", "player_y");
- gtk_window_move ((GtkWindow *) window, x, y);
- }
+ if (! ui_is_shown ())
+ restore_window_size ();
 
 gtk_window_present ((GtkWindow *) window);
+
+ /* turn visualization back on if necessary */
+ ui_infoarea_show_vis (aud_get_bool ("gtkui", "infoarea_show_vis"));
 }
- else if (gtk_widget_get_visible (window))
+ else
 {
- if (aud_get_bool ("gtkui", "save_window_position"))
- {
- gint x, y;
- gtk_window_get_position ((GtkWindow *) window, & x, & y);
- aud_set_int ("gtkui", "player_x", x);
- aud_set_int ("gtkui", "player_y", y);
- }
+ if (ui_is_shown ())
+ save_window_size ();
 
 gtk_widget_hide (window);
+
+ /* turn visualization off to reduce CPU usage */
+ ui_infoarea_show_vis (FALSE);
 }
 }
 
 static gboolean ui_is_shown (void)
 {
- return aud_get_bool ("gtkui", "player_visible");
+ return gtk_widget_get_visible (window);
 }
 
 static gboolean ui_is_focused (void)
@@ -230,33 +253,55 @@
 audgui_simple_message (& error_win, GTK_MESSAGE_ERROR, _("Error"), _(text));
 }
 
-static void set_time_label (gint time, gint len)
+static void append_str (char * buf, int bufsize, const char * str)
 {
- gchar s[128];
- snprintf (s, sizeof s, "");
+ snprintf (buf + strlen (buf), bufsize - strlen (buf), "%s", str);
+}
 
+static void append_time_str (char * buf, int bufsize, int time)
+{
 time /= 1000;
 
 if (time < 3600)
- snprintf (s + strlen (s), sizeof s - strlen (s), aud_get_bool (NULL,
- "leading_zero") ? "%02d:%02d" : "%d:%02d", time / 60, time % 60);
+ snprintf (buf + strlen (buf), bufsize - strlen (buf),
+ aud_get_bool (NULL, "leading_zero") ? "%02d:%02d" : "%d:%02d",
+ time / 60, time % 60);
 else
- snprintf (s + strlen (s), sizeof s - strlen (s), "%d:%02d:%02d", time /
- 3600, (time / 60) % 60, time % 60);
+ snprintf (buf + strlen (buf), bufsize - strlen (buf), "%d:%02d:%02d",
+ time / 3600, (time / 60) % 60, time % 60);
+}
+
+static void set_time_label (gint time, gint len)
+{
+ gchar s[128] = "";
+
+ if (len && aud_get_bool ("gtkui", "show_remaining_time"))
+ append_time_str (s, sizeof s, len - time);
+ else
+ append_time_str (s, sizeof s, time);
 
 if (len)
 {
- len /= 1000;
+ append_str (s, sizeof s, " / ");
+ append_time_str (s, sizeof s, len);
 
- if (len < 3600)
- snprintf (s + strlen (s), sizeof s - strlen (s), aud_get_bool (NULL,
- "leading_zero") ? " / %02d:%02d" : " / %d:%02d", len / 60, len % 60);
- else
- snprintf (s + strlen (s), sizeof s - strlen (s), " / %d:%02d:%02d",
- len / 3600, (len / 60) % 60, len % 60);
+ int a, b;
+ aud_drct_get_ab_repeat (& a, & b);
+
+ if (a >= 0)
+ {
+ append_str (s, sizeof s, " A=");
+ append_time_str (s, sizeof s, a);
+ }
+
+ if (b >= 0)
+ {
+ append_str (s, sizeof s, " B=");
+ append_time_str (s, sizeof s, b);
+ }
 }
 
- snprintf (s + strlen (s), sizeof s - strlen (s), "");
+ append_str (s, sizeof s, "");
 gtk_label_set_markup ((GtkLabel *) label_time, s);
 }
 
@@ -285,8 +330,11 @@
 
 static void do_seek (gint time)
 {
+ gint length = aud_drct_get_length ();
+ time = CLAMP (time, 0, length);
+
 set_slider (time);
- set_time_label (time, aud_drct_get_length ());
+ set_time_label (time, length);
 aud_drct_seek (time);
 
 // Trick: Unschedule and then schedule the update function. This gives the
@@ -302,12 +350,15 @@
 static gboolean ui_slider_change_value_cb (GtkRange * range,
 GtkScrollType scroll, gdouble value)
 {
- set_time_label (value, aud_drct_get_length ());
+ gint length = aud_drct_get_length ();
+ gint time = CLAMP ((gint) value, 0, length);
+
+ set_time_label (time, length);
 
 if (slider_is_moving)
- slider_seek_time = value;
- else if ((gint) value != slider_seek_time) // avoid seeking twice
- do_seek (value);
+ slider_seek_time = time;
+ else if (time != slider_seek_time) // avoid seeking twice
+ do_seek (time);
 
 return FALSE;
 }
@@ -638,7 +689,9 @@
 
 static void config_save (void)
 {
- save_window_size ();
+ if (ui_is_shown ())
+ save_window_size ();
+
 layout_save ();
 pw_col_save ();
 }
@@ -688,19 +741,9 @@
 
 pw_col_init ();
 
- gint x = aud_get_int ("gtkui", "player_x");
- gint y = aud_get_int ("gtkui", "player_y");
- gint w = aud_get_int ("gtkui", "player_width");
- gint h = aud_get_int ("gtkui", "player_height");
-
 window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_default_size ((GtkWindow *) window, w, h);
- gtk_window_set_keep_above ((GtkWindow *) window, aud_get_bool ("gtkui", "always_on_top"));
 gtk_window_set_has_resize_grip ((GtkWindow *) window, FALSE);
 
- if (aud_get_bool ("gtkui", "save_window_position") && (x != -1 || y != -1))
- gtk_window_move ((GtkWindow *) window, x, y);
-
 g_signal_connect(G_OBJECT(window), "delete-event", G_CALLBACK(window_delete), NULL);
 
 accel = gtk_accel_group_new ();
@@ -731,7 +774,7 @@
 /* playback buttons */
 toolbar_button_add (toolbar, button_open_pressed, GTK_STOCK_OPEN);
 toolbar_button_add (toolbar, button_add_pressed, GTK_STOCK_ADD);
- button_play = toolbar_button_add (toolbar, button_play_pressed, GTK_STOCK_MEDIA_PLAY);
+ button_play = toolbar_button_add (toolbar, aud_drct_play_pause, GTK_STOCK_MEDIA_PLAY);
 button_stop = toolbar_button_add (toolbar, aud_drct_stop, GTK_STOCK_MEDIA_STOP);
 toolbar_button_add (toolbar, aud_drct_pl_prev, GTK_STOCK_MEDIA_PREVIOUS);
 toolbar_button_add (toolbar, aud_drct_pl_next, GTK_STOCK_MEDIA_NEXT);
@@ -836,9 +879,6 @@
 
 gtk_widget_show_all (vbox_outer);
 
- if (aud_get_bool ("gtkui", "player_visible"))
- ui_show (TRUE);
-
 update_toggles (NULL, NULL);
 
 menu_rclick = make_menu_rclick (accel);
@@ -967,9 +1007,12 @@
 {
 infoarea = ui_infoarea_new ();
 g_signal_connect (infoarea, "destroy", (GCallback) gtk_widget_destroyed, & infoarea);
- ui_infoarea_show_vis (aud_get_bool ("gtkui", "infoarea_show_vis"));
 gtk_box_pack_end ((GtkBox *) vbox, infoarea, FALSE, FALSE, 0);
 gtk_widget_show_all (infoarea);
+
+ /* only turn on visualization if interface is shown */
+ if (ui_is_shown ())
+ ui_infoarea_show_vis (aud_get_bool ("gtkui", "infoarea_show_vis"));
 }
 
 if (! show && infoarea)

audacious-plugins-3.3.4.tar.bz2/src/gtkui/ui_infoarea.c -> audacious-plugins-3.4.2.tar.bz2/src/gtkui/ui_infoarea.c Changed

@@ -65,13 +65,14 @@
 
 static void vis_render_cb (const gfloat * freq)
 {
- const gfloat xscale[VIS_BANDS + 1] = {0.00, 0.59, 1.52, 3.00, 5.36, 9.10,
- 15.0, 24.5, 39.4, 63.2, 101, 161, 256}; /* logarithmic scale - 1 */
+ /* xscale[i] = pow (256, i / VIS_BANDS) - 0.5; */
+ const gfloat xscale[VIS_BANDS + 1] = {0.5, 1.09, 2.02, 3.5, 5.85, 9.58,
+ 15.5, 24.9, 39.82, 63.5, 101.09, 160.77, 255.5};
 
 for (gint i = 0; i < VIS_BANDS; i ++)
 {
- gint a = ceil (xscale[i]);
- gint b = floor (xscale[i + 1]);
+ gint a = ceilf (xscale[i]);
+ gint b = floorf (xscale[i + 1]);
 gfloat n = 0;
 
 if (b < a)
@@ -87,7 +88,7 @@
 }
 
 /* 40 dB range */
- gint x = 20 * log10 (n * 100);
+ gint x = 40 + 20 * log10f (n);
 x = CLAMP (x, 0, 40);
 
 vis.bars[i] -= MAX (0, VIS_FALLOFF - vis.delay[i]);
@@ -405,11 +406,24 @@
 if (area->pb)
 g_object_unref (area->pb);
 
- area->pb = audgui_pixbuf_for_current ();
+ area->pb = audgui_pixbuf_request_current ();
+ if (! area->pb)
+ area->pb = audgui_pixbuf_fallback ();
 if (area->pb)
 audgui_pixbuf_scale_within (& area->pb, ICON_SIZE);
 }
 
+static void album_art_ready (void)
+{
+ g_return_if_fail (area);
+
+ if (! aud_drct_get_playing ())
+ return;
+
+ set_album_art ();
+ gtk_widget_queue_draw (area->main);
+}
+
 static void infoarea_next (void)
 {
 g_return_if_fail (area);
@@ -506,10 +520,9 @@
 ui_infoarea_show_vis (FALSE);
 
 hook_dissociate ("playlist update", (HookFunction) ui_infoarea_set_title);
- hook_dissociate ("playback begin", (HookFunction)
- ui_infoarea_playback_start);
- hook_dissociate ("playback stop", (HookFunction)
- ui_infoarea_playback_stop);
+ hook_dissociate ("playback begin", (HookFunction) ui_infoarea_playback_start);
+ hook_dissociate ("playback stop", (HookFunction) ui_infoarea_playback_stop);
+ hook_dissociate ("current art ready", (HookFunction) album_art_ready);
 
 if (area->fade_timeout)
 {
@@ -549,6 +562,7 @@
 hook_associate ("playlist update", (HookFunction) ui_infoarea_set_title, NULL);
 hook_associate ("playback begin", (HookFunction) ui_infoarea_playback_start, NULL);
 hook_associate ("playback stop", (HookFunction) ui_infoarea_playback_stop, NULL);
+ hook_associate ("current art ready", (HookFunction) album_art_ready, NULL);
 
 g_signal_connect (area->box, "destroy", (GCallback) destroy_cb, NULL);

audacious-plugins-3.3.4.tar.bz2/src/gtkui/ui_playlist_notebook.c -> audacious-plugins-3.4.2.tar.bz2/src/gtkui/ui_playlist_notebook.c Changed

@@ -17,7 +17,7 @@
 * the use of this software.
 */
 
-#include "config.h"
+#include <stdlib.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
@@ -27,6 +27,7 @@
 #include <audacious/misc.h>
 #include <audacious/playlist.h>
 #include <audacious/plugin.h>
+#include <libaudcore/hook.h>
 #include <libaudgui/list.h>
 #include <libaudgui/libaudgui.h>
 
@@ -35,10 +36,7 @@
 #include "ui_playlist_widget.h"
 #include "playlist_util.h"
 
-#define CURRENT_POS (-2)
-
 static GtkWidget * notebook = NULL;
-static GQueue follow_queue = G_QUEUE_INIT;
 static gint highlighted = -1;
 
 static gint switch_handler = 0;
@@ -106,6 +104,8 @@
 
 void show_close_buttons (gboolean show)
 {
+ aud_set_bool ("gtkui", "close_button_visible", show);
+
 gint pages = gtk_notebook_get_n_pages ((GtkNotebook *) notebook);
 
 for (gint i = 0; i < pages; i ++)
@@ -126,6 +126,33 @@
 return GTK_NOTEBOOK(notebook);
 }
 
+static void save_column_widths ()
+{
+ int current = gtk_notebook_get_current_page ((GtkNotebook *) notebook);
+ GtkWidget * treeview = playlist_get_treeview (current);
+
+ char * widths, * expand;
+ ui_playlist_widget_get_column_widths (treeview, & widths, & expand);
+
+ aud_set_string ("gtkui", "column_widths", widths);
+ aud_set_string ("gtkui", "column_expand", expand);
+
+ free (widths);
+ free (expand);
+}
+
+static void apply_column_widths (GtkWidget * treeview)
+{
+ char * widths = aud_get_string ("gtkui", "column_widths");
+ char * expand = aud_get_string ("gtkui", "column_expand");
+
+ if (widths && widths[0] && expand && expand[0])
+ ui_playlist_widget_set_column_widths (treeview, widths, expand);
+
+ free (widths);
+ free (expand);
+}
+
 static void tab_title_reset(GtkWidget *ebox)
 {
 GtkWidget *label = g_object_get_data(G_OBJECT(ebox), "label");
@@ -172,10 +199,10 @@
 static void tab_changed (GtkNotebook * notebook, GtkWidget * page, gint
 page_num, void * unused)
 {
- GtkWidget * treeview = playlist_get_treeview (page_num);
+ save_column_widths ();
+ apply_column_widths (playlist_get_treeview (page_num));
 
- if (treeview != NULL)
- aud_playlist_set_active (page_num);
+ aud_playlist_set_active (page_num);
 }
 
 static void tab_reordered(GtkNotebook *notebook, GtkWidget *child, guint page_num, gpointer user_data)
@@ -236,6 +263,8 @@
 vscroll = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scrollwin));
 
 treeview = ui_playlist_widget_new(playlist);
+ apply_column_widths (treeview);
+
 g_object_set_data(G_OBJECT(scrollwin), "treeview", treeview);
 
 gtk_container_add(GTK_CONTAINER(scrollwin), treeview);
@@ -274,6 +303,7 @@
 {
 aud_playlist_select_all (playlist, FALSE);
 aud_playlist_entry_set_selected (playlist, position, TRUE);
+ aud_playlist_set_focus (playlist, position);
 audgui_list_set_highlight (treeview, position);
 audgui_list_set_focus (treeview, position);
 }
@@ -320,34 +350,13 @@
 gtk_notebook_remove_page ((GtkNotebook *) notebook, -- n_pages);
 }
 
-static void do_follow (void)
+static void add_remove_pages (void)
 {
- while (! g_queue_is_empty (& follow_queue))
- {
- gint list = aud_playlist_by_unique_id (GPOINTER_TO_INT (g_queue_pop_head
- (& follow_queue)));
- gint row = GPOINTER_TO_INT (g_queue_pop_head (& follow_queue));
+ g_signal_handlers_block_by_func (notebook, (void *) tab_changed, NULL);
+ g_signal_handlers_block_by_func (notebook, (void *) tab_reordered, NULL);
 
- if (list < 0)
- continue;
-
- GtkWidget * widget = playlist_get_treeview (list);
+ save_column_widths ();
 
- if (row == CURRENT_POS)
- {
- row = aud_playlist_get_position (list);
- audgui_list_set_highlight (widget, row);
-
- if (! aud_get_bool ("gtkui", "autoscroll"))
- continue;
- }
-
- audgui_list_set_focus (widget, row);
- }
-}
-
-static void add_remove_pages (void)
-{
 gint lists = aud_playlist_count ();
 gint pages = gtk_notebook_get_n_pages ((GtkNotebook *) notebook);
 
@@ -361,9 +370,7 @@
 /* do we have an orphaned treeview? */
 if (aud_playlist_by_unique_id (tree_id) < 0)
 {
- g_signal_handlers_block_by_func (notebook, (void *) tab_changed, NULL);
 gtk_notebook_remove_page ((GtkNotebook *) notebook, i);
- g_signal_handlers_unblock_by_func (notebook, (void *) tab_changed, NULL);
 pages --;
 continue;
 }
@@ -390,9 +397,7 @@
 /* found it? move it to the right place */
 if (tree_id == list_id)
 {
- g_signal_handlers_block_by_func (notebook, (void *) tab_reordered, NULL);
 gtk_notebook_reorder_child ((GtkNotebook *) notebook, page, i);
- g_signal_handlers_unblock_by_func (notebook, (void *) tab_reordered, NULL);
 found = TRUE;
 break;
 }
@@ -413,6 +418,13 @@
 ui_playlist_notebook_create_tab (pages);
 pages ++;
 }
+
+ int active = aud_playlist_get_active ();
+ apply_column_widths (playlist_get_treeview (active));
+ gtk_notebook_set_current_page ((GtkNotebook *) notebook, active);
+
+ g_signal_handlers_unblock_by_func (notebook, (void *) tab_changed, NULL);
+ g_signal_handlers_unblock_by_func (notebook, (void *) tab_reordered, NULL);
 }
 
 void ui_playlist_notebook_update (void * data, void * user)
@@ -429,41 +441,34 @@
 if (global_level >= PLAYLIST_UPDATE_METADATA)
 set_tab_label (list, get_tab_label (list));
 
+ GtkWidget * treeview = playlist_get_treeview (list);
+
 gint at, count;
 gint level = aud_playlist_updated_range (list, & at, & count);
 
 if (level)
- ui_playlist_widget_update (playlist_get_treeview (list), level, at, count);
+ ui_playlist_widget_update (treeview, level, at, count);
+
+ audgui_list_set_highlight (treeview, aud_playlist_get_position (list));
 }
 
 gtk_notebook_set_current_page ((GtkNotebook *) notebook, aud_playlist_get_active ());
-
- do_follow ();
-}
-
-void playlist_set_focus (gint list, gint row)
-{
- g_queue_push_tail (& follow_queue, GINT_TO_POINTER
- (aud_playlist_get_unique_id (list)));
- g_queue_push_tail (& follow_queue, GINT_TO_POINTER (row));
-
- if (! aud_playlist_update_pending ())
- do_follow ();
 }
 
 void ui_playlist_notebook_position (void * data, void * user)
 {
 gint list = GPOINTER_TO_INT (data);
+ gint row = aud_playlist_get_position (list);
 
 if (aud_get_bool ("gtkui", "autoscroll"))
 {
 aud_playlist_select_all (list, FALSE);
-
- if (aud_playlist_get_position (list) >= 0)
- aud_playlist_entry_set_selected (list, aud_playlist_get_position (list), TRUE);
+ aud_playlist_entry_set_selected (list, row, TRUE);
+ aud_playlist_set_focus (list, row);
 }
 
- playlist_set_focus (list, CURRENT_POS);
+ if (! aud_playlist_update_pending ())
+ audgui_list_set_highlight (playlist_get_treeview (list), row);
 }
 
 void ui_playlist_notebook_activate (void * data, void * user)
@@ -496,8 +501,9 @@
 
 static void destroy_cb (void)
 {
+ hook_dissociate ("config save", (HookFunction) save_column_widths);
+
 notebook = NULL;
- g_queue_clear (& follow_queue);
 switch_handler = 0;
 reorder_handler = 0;
 }
@@ -508,6 +514,8 @@
 gtk_notebook_set_scrollable ((GtkNotebook *) notebook, TRUE);
 make_add_button (notebook);
 
+ hook_associate ("config save", (HookFunction) save_column_widths, NULL);
+
 g_signal_connect (notebook, "destroy", (GCallback) destroy_cb, NULL);
 return notebook;
 }

audacious-plugins-3.3.4.tar.bz2/src/gtkui/ui_playlist_widget.c -> audacious-plugins-3.4.2.tar.bz2/src/gtkui/ui_playlist_widget.c Changed

@@ -25,11 +25,11 @@
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
 #include <audacious/playlist.h>
+#include <libaudcore/audstrings.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 #include <libaudgui/list.h>
 
-#include "config.h"
 #include "gtkui.h"
 #include "playlist_util.h"
 #include "ui_playlist_widget.h"
@@ -186,12 +186,16 @@
 aud_playlist_select_all (((PlaylistWidgetData *) user)->list, selected);
 }
 
+static void focus_change (void * user, gint row)
+{
+ aud_playlist_set_focus (((PlaylistWidgetData *) user)->list, row);
+}
+
 static void activate_row (void * user, gint row)
 {
 gint list = ((PlaylistWidgetData *) user)->list;
 aud_playlist_set_position (list, row);
- aud_playlist_set_playing (list);
- aud_drct_play ();
+ aud_drct_play_playlist (list);
 }
 
 static void right_click (void * user, GdkEventButton * event)
@@ -291,6 +295,7 @@
 .get_selected = get_selected,
 .set_selected = set_selected,
 .select_all = select_all,
+ .focus_change = focus_change,
 .activate_row = activate_row,
 .right_click = right_click,
 .shift_rows = shift_rows,
@@ -428,25 +433,27 @@
 PlaylistWidgetData * data = audgui_list_get_user (widget);
 g_return_if_fail (data);
 
- if (type >= PLAYLIST_UPDATE_STRUCTURE)
+ if (type == PLAYLIST_UPDATE_STRUCTURE)
 {
- gint diff = aud_playlist_entry_count (data->list) -
- audgui_list_row_count (widget);
+ gint old_entries = audgui_list_row_count (widget);
+ gint entries = aud_playlist_entry_count (data->list);
 
- if (diff > 0)
- audgui_list_insert_rows (widget, at, diff);
- else if (diff < 0)
- audgui_list_delete_rows (widget, at, -diff);
+ audgui_list_delete_rows (widget, at, old_entries - (entries - count));
+ audgui_list_insert_rows (widget, at, count);
 
- audgui_list_set_highlight (widget, aud_playlist_get_position (data->list));
+ /* scroll to end of playlist if entries were added there
+ (but not if a newly added entry is playing) */
+ if (entries > old_entries && at + count == entries &&
+ aud_playlist_get_focus (data->list) < old_entries)
+ aud_playlist_set_focus (data->list, entries - 1);
 
 ui_playlist_widget_scroll (widget);
 }
-
- if (type >= PLAYLIST_UPDATE_METADATA)
+ else if (type == PLAYLIST_UPDATE_METADATA)
 audgui_list_update_rows (widget, at, count);
 
 audgui_list_update_selection (widget, at, count);
+ audgui_list_set_focus (widget, aud_playlist_get_focus (data->list));
 update_queue (widget, data);
 }
 
@@ -472,3 +479,36 @@
 else
 popup_hide (data);
 }
+
+void ui_playlist_widget_get_column_widths (GtkWidget * widget, char * * widths,
+ char * * expand)
+{
+ int w[pw_num_cols], ex[pw_num_cols];
+
+ for (int i = 0; i < pw_num_cols; i ++)
+ {
+ GtkTreeViewColumn * col = gtk_tree_view_get_column ((GtkTreeView *) widget, i);
+ w[i] = gtk_tree_view_column_get_fixed_width (col);
+ ex[i] = gtk_tree_view_column_get_expand (col);
+ }
+
+ * widths = int_array_to_string (w, pw_num_cols);
+ * expand = int_array_to_string (ex, pw_num_cols);
+}
+
+void ui_playlist_widget_set_column_widths (GtkWidget * widget,
+ const char * widths, const char * expand)
+{
+ int w[pw_num_cols], ex[pw_num_cols];
+
+ if (! string_to_int_array (widths, w, pw_num_cols) ||
+ ! string_to_int_array (expand, ex, pw_num_cols))
+ return;
+
+ for (int i = 0; i < pw_num_cols; i ++)
+ {
+ GtkTreeViewColumn * col = gtk_tree_view_get_column ((GtkTreeView *) widget, i);
+ gtk_tree_view_column_set_fixed_width (col, w[i]);
+ gtk_tree_view_column_set_expand (col, ex[i]);
+ }
+}

audacious-plugins-3.3.4.tar.bz2/src/gtkui/ui_playlist_widget.h -> audacious-plugins-3.4.2.tar.bz2/src/gtkui/ui_playlist_widget.h Changed

audacious-plugins-3.3.4.tar.bz2/src/gtkui/ui_statusbar.c -> audacious-plugins-3.4.2.tar.bz2/src/gtkui/ui_statusbar.c Changed

audacious-plugins-3.3.4.tar.bz2/src/hotkey/grab.c -> audacious-plugins-3.4.2.tar.bz2/src/hotkey/grab.c Changed

audacious-plugins-3.3.4.tar.bz2/src/hotkey/gui.c -> audacious-plugins-3.4.2.tar.bz2/src/hotkey/gui.c Changed

@@ -33,8 +33,6 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <config.h>
-
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms-compat.h>
@@ -69,22 +67,23 @@
 
 
 static gchar* event_desc[EVENT_MAX] = {
- [EVENT_PREV_TRACK] = N_("Previous Track"),
+ [EVENT_PREV_TRACK] = N_("Previous track"),
 [EVENT_PLAY] = N_("Play"),
 [EVENT_PAUSE] = N_("Pause/Resume"),
 [EVENT_STOP] = N_("Stop"),
- [EVENT_NEXT_TRACK] = N_("Next Track"),
- [EVENT_FORWARD] = N_("Forward 5 Seconds"),
- [EVENT_BACKWARD] = N_("Rewind 5 Seconds"),
+ [EVENT_NEXT_TRACK] = N_("Next track"),
+ [EVENT_FORWARD] = N_("Forward 5 seconds"),
+ [EVENT_BACKWARD] = N_("Rewind 5 seconds"),
 [EVENT_MUTE] = N_("Mute"),
- [EVENT_VOL_UP] = N_("Volume Up"),
- [EVENT_VOL_DOWN] = N_("Volume Down"),
- [EVENT_JUMP_TO_FILE] = N_("Jump to File"),
- [EVENT_TOGGLE_WIN] = N_("Toggle Player Window(s)"),
+ [EVENT_VOL_UP] = N_("Volume up"),
+ [EVENT_VOL_DOWN] = N_("Volume down"),
+ [EVENT_JUMP_TO_FILE] = N_("Jump to file"),
+ [EVENT_TOGGLE_WIN] = N_("Toggle player window(s)"),
 [EVENT_SHOW_AOSD] = N_("Show On-Screen-Display"),
- [EVENT_TOGGLE_REPEAT] = N_("Toggle Repeat"),
- [EVENT_TOGGLE_SHUFFLE] = N_("Toggle Shuffle"),
- [EVENT_RAISE] = N_("Raise Player Window(s)")
+ [EVENT_TOGGLE_REPEAT] = N_("Toggle repeat"),
+ [EVENT_TOGGLE_SHUFFLE] = N_("Toggle shuffle"),
+ [EVENT_TOGGLE_STOP] = N_("Toggle stop after current"),
+ [EVENT_RAISE] = N_("Raise player window(s)")
 };

audacious-plugins-3.3.4.tar.bz2/src/hotkey/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/hotkey/plugin.c Changed

audacious-plugins-3.3.4.tar.bz2/src/hotkey/plugin.h -> audacious-plugins-3.4.2.tar.bz2/src/hotkey/plugin.h Changed

audacious-plugins-3.3.4.tar.bz2/src/jack/jack.c -> audacious-plugins-3.4.2.tar.bz2/src/jack/jack.c Changed

audacious-plugins-3.3.4.tar.bz2/src/ladspa/loaded-list.c -> audacious-plugins-3.4.2.tar.bz2/src/ladspa/loaded-list.c Changed

audacious-plugins-3.3.4.tar.bz2/src/ladspa/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/ladspa/plugin.c Changed

audacious-plugins-3.3.4.tar.bz2/src/lirc/lirc.c -> audacious-plugins-3.4.2.tar.bz2/src/lirc/lirc.c Changed

@@ -26,8 +26,6 @@
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "config.h"
-
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -35,6 +33,7 @@
 #include <signal.h>
 #include <stdlib.h>
 #include <ctype.h>
+#include <strings.h>
 
 #include <glib.h>
 #include <lirc/lirc_client.h>
@@ -161,24 +160,13 @@
 while ((ret = lirc_code2char (config, code, &c)) == 0 && c != NULL)
 {
 if (strcasecmp ("PLAY", c) == 0)
- {
 aud_drct_play ();
- }
 else if (strcasecmp ("STOP", c) == 0)
- {
 aud_drct_stop ();
- }
 else if (strcasecmp ("PAUSE", c) == 0)
- {
 aud_drct_pause ();
- }
 else if (strcasecmp ("PLAYPAUSE", c) == 0)
- {
- if (aud_drct_get_playing ())
- aud_drct_pause ();
- else
- aud_drct_play ();
- }
+ aud_drct_play_pause ();
 else if (strncasecmp ("NEXT", c, 4) == 0)
 {
 ptr = c + 4;
@@ -207,17 +195,10 @@
 aud_drct_pl_prev ();
 }
 }
-
 else if (strcasecmp ("SHUFFLE", c) == 0)
- {
- aud_set_bool (NULL, "shuffle",
- !aud_get_bool (NULL, "shuffle"));
- }
+ aud_set_bool (NULL, "shuffle", ! aud_get_bool (NULL, "shuffle"));
 else if (strcasecmp ("REPEAT", c) == 0)
- {
- aud_set_bool (NULL, "repeat", !aud_get_bool (NULL, "repeat"));
- }
-
+ aud_set_bool (NULL, "repeat", ! aud_get_bool (NULL, "repeat"));
 else if (strncasecmp ("FWD", c, 3) == 0)
 {
 ptr = c + 3;

audacious-plugins-3.3.4.tar.bz2/src/lyricwiki/lyricwiki.c -> audacious-plugins-3.4.2.tar.bz2/src/lyricwiki/lyricwiki.c Changed

@@ -37,8 +37,6 @@
 #include <libaudcore/hook.h>
 #include <libaudcore/vfs_async.h>
 
-#include "config.h"
-
 /* all strings in this struct are pooled */
 typedef struct {
 	char *filename; /* of song file */
@@ -109,11 +107,11 @@
 				GMatchInfo *match_info;
 				GRegex *reg;
 
-				reg = g_regex_new("<(lyrics?)>(.*)</\\1>", (G_REGEX_MULTILINE | G_REGEX_DOTALL | G_REGEX_UNGREEDY), 0, NULL);
+				reg = g_regex_new("<(lyrics?)>[[:space:]]*(.*?)[[:space:]]*</\\1>", (G_REGEX_MULTILINE | G_REGEX_DOTALL), 0, NULL);
 				g_regex_match(reg, (gchar *) lyric, G_REGEX_MATCH_NEWLINE_ANY, &match_info);
 
 				ret = g_match_info_fetch(match_info, 2);
-				if (!g_utf8_collate(ret, "\n\n"))
+				if (!g_utf8_collate(ret, ""))
 				{
 					free(ret);
 					ret = strdup(_("No lyrics available"));
@@ -138,6 +136,16 @@
 	gchar *uri = NULL;
 
 	/*
+	 * workaround buggy lyricwiki search output where it cuts the lyrics
+	 * halfway through the UTF-8 symbol resulting in invalid XML.
+	 */
+	GRegex *reg;
+
+	reg = g_regex_new("<(lyrics?)>.*</\\1>", (G_REGEX_MULTILINE | G_REGEX_DOTALL | G_REGEX_UNGREEDY), 0, NULL);
+	gchar *newbuf = g_regex_replace_literal(reg, buf, len, 0, "", G_REGEX_MATCH_NEWLINE_ANY, NULL);
+	g_regex_unref(reg);
+
+	/*
 	 * temporarily set our error-handling functor to our suppression function,
 	 * but we have to set it back because other components of Audacious depend
 	 * on libxml and we don't want to step on their code paths.
@@ -147,7 +155,7 @@
 	 * parsing and hope for the best.
 	 */
 	xmlSetGenericErrorFunc(NULL, libxml_error_handler);
-	doc = xmlParseMemory(buf, (int) len);
+	doc = xmlParseMemory(newbuf, strlen(newbuf));
 	xmlSetGenericErrorFunc(NULL, NULL);
 
 	if (doc != NULL)
@@ -177,13 +185,23 @@
 		xmlFreeDoc(doc);
 	}
 
+	g_free(newbuf);
+
 	return uri;
 }
 
 static void update_lyrics_window(const char *title, const char *artist, const char *lyrics);
 
-static bool_t get_lyrics_step_3(void *buf, int64_t len, void *unused)
+static bool_t get_lyrics_step_3(void *buf, int64_t len, void *requri)
 {
+	if (!state.uri || strcmp(state.uri, requri))
+	{
+		free(buf);
+		str_unref(requri);
+		return FALSE;
+	}
+	str_unref(requri);
+
 	if(!len)
 	{
 		SPRINTF(error, _("Unable to fetch %s"), state.uri);
@@ -208,8 +226,16 @@
 	return TRUE;
 }
 
-static bool_t get_lyrics_step_2(void *buf, int64_t len, void *unused)
+static bool_t get_lyrics_step_2(void *buf, int64_t len, void *requri)
 {
+	if (strcmp(state.uri, requri))
+	{
+		free(buf);
+		str_unref(requri);
+		return FALSE;
+	}
+	str_unref(requri);
+
 	if(!len)
 	{
 		SPRINTF(error, _("Unable to fetch %s"), state.uri);
@@ -232,7 +258,7 @@
 	state.uri = uri;
 
 	update_lyrics_window(state.title, state.artist, _("Looking for lyrics ..."));
-	vfs_async_file_get_contents(uri, get_lyrics_step_3, NULL);
+	vfs_async_file_get_contents(uri, get_lyrics_step_3, str_ref(state.uri));
 
 	free(buf);
 	return TRUE;
@@ -256,7 +282,7 @@
 	 "artist=%s&song=%s&fmt=xml", artist_buf, title_buf);
 
 	update_lyrics_window(state.title, state.artist, _("Connecting to lyrics.wikia.com ..."));
-	vfs_async_file_get_contents(state.uri, get_lyrics_step_2, NULL);
+	vfs_async_file_get_contents(state.uri, get_lyrics_step_2, str_ref(state.uri));
 }
 
 static GtkWidget *scrollview, *vbox;
@@ -306,19 +332,17 @@
 	gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(textbuffer), &iter);
 
 	gtk_text_buffer_insert_with_tags_by_name(GTK_TEXT_BUFFER(textbuffer), &iter,
-			title, strlen(title), "weight_bold", "size_x_large", NULL);
-
-	gtk_text_buffer_insert(GTK_TEXT_BUFFER(textbuffer), &iter, "\n", 1);
+			title, -1, "weight_bold", "size_x_large", NULL);
 
 	if (artist != NULL)
 	{
+		gtk_text_buffer_insert(GTK_TEXT_BUFFER(textbuffer), &iter, "\n", -1);
 		gtk_text_buffer_insert_with_tags_by_name(GTK_TEXT_BUFFER(textbuffer),
-				&iter, artist, strlen(artist), "style_italic", NULL);
-
-		gtk_text_buffer_insert(GTK_TEXT_BUFFER(textbuffer), &iter, "\n", 1);
+				&iter, artist, -1, "style_italic", NULL);
 	}
 
-	gtk_text_buffer_insert(GTK_TEXT_BUFFER(textbuffer), &iter, lyrics, strlen(lyrics));
+	gtk_text_buffer_insert(GTK_TEXT_BUFFER(textbuffer), &iter, "\n\n", -1);
+	gtk_text_buffer_insert(GTK_TEXT_BUFFER(textbuffer), &iter, lyrics, -1);
 
 	gtk_text_buffer_get_start_iter(GTK_TEXT_BUFFER(textbuffer), &iter);
 	gtk_text_view_scroll_to_iter(GTK_TEXT_VIEW(textview), &iter, 0, TRUE, 0, 0);

audacious-plugins-3.3.4.tar.bz2/src/m3u/m3u.c -> audacious-plugins-3.4.2.tar.bz2/src/m3u/m3u.c Changed

audacious-plugins-3.3.4.tar.bz2/src/metronom/metronom.c -> audacious-plugins-3.4.2.tar.bz2/src/metronom/metronom.c Changed

audacious-plugins-3.3.4.tar.bz2/src/mixer/mixer.c -> audacious-plugins-3.4.2.tar.bz2/src/mixer/mixer.c Changed

audacious-plugins-3.3.4.tar.bz2/src/mms/mms.c -> audacious-plugins-3.4.2.tar.bz2/src/mms/mms.c Changed

audacious-plugins-3.3.4.tar.bz2/src/modplug/modplugbmp.cxx -> audacious-plugins-3.4.2.tar.bz2/src/modplug/modplugbmp.cxx Changed

@@ -4,6 +4,8 @@
 * This source code is public domain.
 */
 
+#include "modplugbmp.h"
+
 #include <fstream>
 #include <pthread.h>
 #include <stdint.h>
@@ -14,86 +16,29 @@
 #include <libmodplug/sndfile.h>
 
 extern "C" {
-#include <audacious/misc.h>
+#include <libaudcore/audstrings.h>
 #include <audacious/i18n.h>
-
-#include "config.h"
 }
 
-#include "modplugbmp.h"
 #include "archive/open.h"
 
 using namespace std;
 
-static bool_t stop_flag = FALSE;
-
 // ModplugXMMS member functions ===============================
 
-// operations ----------------------------------------
 ModplugXMMS::ModplugXMMS()
 {
+ memset (this, 0, sizeof (* this));
 mSoundFile = new CSoundFile;
 pthread_mutex_init (& mutex, 0);
 }
+
 ModplugXMMS::~ModplugXMMS()
 {
 delete mSoundFile;
 pthread_mutex_destroy (& mutex);
 }
 
-static const char * const modplug_defaults[] = {
- "Surround", "TRUE",
- "Oversampling", "TRUE",
- "Megabass", "FALSE",
- "NoiseReduction", "TRUE",
- "VolumeRamp", "TRUE",
- "Reverb", "FALSE",
- "Fastinfo", "TRUE",
- "UseFileName", "FALSE",
- "GrabAmigaMOD", "TRUE",
- "PreAmp", "FALSE",
- "PreAmpLevel", "0",
- "Channels", "2",
- "Bits", "16",
- "Frequency", "44100",
- "ResamplingMode", "3", /* SRCMODE_POLYPHASE */
- "ReverbDepth", "30",
- "ReverbDelay", "100",
- "BassAmount", "40",
- "BassRange", "30",
- "SurroundDepth", "20",
- "SurroundDelay", "20",
- "LoopCount", "0",
- NULL};
-
-void ModplugXMMS::Init(void)
-{
- aud_config_set_defaults (MODPLUG_CFGID, modplug_defaults);
-
- mModProps.mSurround = aud_get_bool (MODPLUG_CFGID, "Surround");
- mModProps.mOversamp = aud_get_bool (MODPLUG_CFGID, "Oversampling");
- mModProps.mMegabass = aud_get_bool (MODPLUG_CFGID, "Megabass");
- mModProps.mNoiseReduction = aud_get_bool (MODPLUG_CFGID, "NoiseReduction");
- mModProps.mVolumeRamp = aud_get_bool (MODPLUG_CFGID, "VolumeRamp");
- mModProps.mReverb = aud_get_bool (MODPLUG_CFGID, "Reverb");
- mModProps.mFastinfo = aud_get_bool (MODPLUG_CFGID, "FastInfo");
- mModProps.mUseFilename = aud_get_bool (MODPLUG_CFGID, "UseFileName");
- mModProps.mGrabAmigaMOD = aud_get_bool (MODPLUG_CFGID, "GrabAmigaMOD");
- mModProps.mPreamp = aud_get_bool (MODPLUG_CFGID, "PreAmp");
- mModProps.mPreampLevel = aud_get_double (MODPLUG_CFGID, "PreAmpLevel");
- mModProps.mChannels = aud_get_int (MODPLUG_CFGID, "Channels");
- mModProps.mBits = aud_get_int (MODPLUG_CFGID, "Bits");
- mModProps.mFrequency = aud_get_int (MODPLUG_CFGID, "Frequency");
- mModProps.mResamplingMode = aud_get_int (MODPLUG_CFGID, "ResamplineMode");
- mModProps.mReverbDepth = aud_get_int (MODPLUG_CFGID, "ReverbDepth");
- mModProps.mReverbDelay = aud_get_int (MODPLUG_CFGID, "ReverbDelay");
- mModProps.mBassAmount = aud_get_int (MODPLUG_CFGID, "BassAmount");
- mModProps.mBassRange = aud_get_int (MODPLUG_CFGID, "BassRange");
- mModProps.mSurroundDepth = aud_get_int (MODPLUG_CFGID, "SurroundDepth");
- mModProps.mSurroundDelay = aud_get_int (MODPLUG_CFGID, "SurroundDelay");
- mModProps.mLoopCount = aud_get_int (MODPLUG_CFGID, "LoopCount");
-}
-
 bool ModplugXMMS::CanPlayFileFromVFS(const string& aFilename, VFSFile *file)
 {
 string lExt;
@@ -370,13 +315,8 @@
 
 ipb->set_params(ipb, mSoundFile->GetNumChannels() * 1000, mModProps.mFrequency, mModProps.mChannels);
 
- if(mModProps.mBits == 16)
- mFormat = FMT_S16_NE;
- else
- mFormat = FMT_U8;
-
- if (! ipb->output->open_audio (mFormat, mModProps.mFrequency,
- mModProps.mChannels))
+ int fmt = (mModProps.mBits == 16) ? FMT_S16_NE : FMT_U8;
+ if (! ipb->output->open_audio (fmt, mModProps.mFrequency, mModProps.mChannels))
 return false;
 
 this->PlayLoop(ipb);
@@ -467,7 +407,7 @@
 tuple_set_str(ti, FIELD_QUALITY, NULL, _("sequenced"));
 tuple_set_int(ti, FIELD_LENGTH, NULL, lSoundFile->GetSongTime() * 1000);
 
- char *tmps2 = MODPLUG_CONVERT(lSoundFile->GetTitle());
+ char *tmps2 = str_to_utf8(lSoundFile->GetTitle());
 // Chop any leading spaces off. They are annoying in the playlist.
 char *tmps3 = tmps2; // Make another pointer so tmps2 can still be free()d
 while ( *tmps3 == ' ' ) tmps3++ ;
@@ -481,25 +421,7 @@
 return ti;
 }
 
-void ModplugXMMS::SetInputPlugin(InputPlugin& aInPlugin)
-{
- mInPlug = &aInPlugin;
-}
-
-const ModplugXMMS::Settings& ModplugXMMS::GetModProps()
-{
- return mModProps;
-}
-
-const char* ModplugXMMS::Bool2OnOff(bool aValue)
-{
- if(aValue)
- return "on";
- else
- return "off";
-}
-
-void ModplugXMMS::SetModProps(const Settings& aModProps)
+void ModplugXMMS::SetModProps(const ModplugSettings& aModProps)
 {
 mModProps = aModProps;
 
@@ -550,29 +472,4 @@
 );
 CSoundFile::SetResamplingMode(mModProps.mResamplingMode);
 mPreampFactor = exp(mModProps.mPreampLevel);
-
- aud_set_bool (MODPLUG_CFGID, "Surround", mModProps.mSurround);
- aud_set_bool (MODPLUG_CFGID, "Oversampling", mModProps.mOversamp);
- aud_set_bool (MODPLUG_CFGID, "Megabass", mModProps.mMegabass);
- aud_set_bool (MODPLUG_CFGID, "NoiseReduction", mModProps.mNoiseReduction);
- aud_set_bool (MODPLUG_CFGID, "VolumeRamp", mModProps.mVolumeRamp);
- aud_set_bool (MODPLUG_CFGID, "Reverb", mModProps.mReverb);
- aud_set_bool (MODPLUG_CFGID, "FastInfo", mModProps.mFastinfo);
- aud_set_bool (MODPLUG_CFGID, "UseFileName", mModProps.mUseFilename);
- aud_set_bool (MODPLUG_CFGID, "GrabAmigaMOD", mModProps.mGrabAmigaMOD);
- aud_set_bool (MODPLUG_CFGID, "PreAmp", mModProps.mPreamp);
- aud_set_double (MODPLUG_CFGID, "PreAmpLevel", mModProps.mPreampLevel);
- aud_set_int (MODPLUG_CFGID, "Channels", mModProps.mChannels);
- aud_set_int (MODPLUG_CFGID, "Bits", mModProps.mBits);
- aud_set_int (MODPLUG_CFGID, "Frequency", mModProps.mFrequency);
- aud_set_int (MODPLUG_CFGID, "ResamplineMode", mModProps.mResamplingMode);
- aud_set_int (MODPLUG_CFGID, "ReverbDepth", mModProps.mReverbDepth);
- aud_set_int (MODPLUG_CFGID, "ReverbDelay", mModProps.mReverbDelay);
- aud_set_int (MODPLUG_CFGID, "BassAmount", mModProps.mBassAmount);
- aud_set_int (MODPLUG_CFGID, "BassRange", mModProps.mBassRange);
- aud_set_int (MODPLUG_CFGID, "SurroundDepth", mModProps.mSurroundDepth);
- aud_set_int (MODPLUG_CFGID, "SurroundDelay", mModProps.mSurroundDelay);
- aud_set_int (MODPLUG_CFGID, "LoopCount", mModProps.mLoopCount);
 }
-
-ModplugXMMS gModplugXMMS;

audacious-plugins-3.3.4.tar.bz2/src/modplug/modplugbmp.h -> audacious-plugins-3.4.2.tar.bz2/src/modplug/modplugbmp.h Changed

@@ -11,10 +11,11 @@
 #include <string>
 
 extern "C" {
-#include <libaudcore/audstrings.h>
-#include "plugin.h"
+#include <audacious/plugin.h>
 }
 
+#include "settings.h"
+
 /* Module files have their magic deep inside the file, at offset 1080; source: http://www.onicos.com/staff/iz/formats/mod.html and information by Michael Doering from UADE */
 #define MOD_MAGIC_PROTRACKER4 "M.K." // Protracker 4 channel
 #define MOD_MAGIC_PROTRACKER4X "M!K!" // Protracker 4 channel
@@ -39,51 +40,17 @@
 #define MTM_MAGIC "\x4D\x54\x4D\x10"
 #define PSM_MAGIC "PSM "
 
-#define MODPLUG_CFGID "modplug"
-#define MODPLUG_CONVERT str_to_utf8
-
 class CSoundFile;
 class Archive;
 
 class ModplugXMMS
 {
 public:
- struct Settings
- {
- bool_t mSurround;
- bool_t mOversamp;
- bool_t mMegabass;
- bool_t mNoiseReduction;
- bool_t mVolumeRamp;
- bool_t mReverb;
- bool_t mFastinfo;
- bool_t mUseFilename;
- bool_t mGrabAmigaMOD;
- bool_t mPreamp;
-
- int mChannels;
- int mBits;
- int mFrequency;
- int mResamplingMode;
-
- int mReverbDepth;
- int mReverbDelay;
- int mBassAmount;
- int mBassRange;
- int mSurroundDepth;
- int mSurroundDelay;
- float mPreampLevel;
- int mLoopCount;
- };
-
 ModplugXMMS();
 ~ModplugXMMS();
 
- void Init();
 bool CanPlayFileFromVFS(const std::string& aFilename, VFSFile *file);
 
- void CloseConfigureBox();
-
 bool PlayFile(const std::string& aFilename, InputPlayback *data);
 void Stop(InputPlayback *data);
 void mseek (InputPlayback * playback, int time);
@@ -91,38 +58,26 @@
 
 Tuple* GetSongTuple(const std::string& aFilename);
 
- void SetInputPlugin(InputPlugin& aInPlugin);
-
- const Settings& GetModProps();
- void SetModProps(const Settings& aModProps);
+ void SetModProps(const ModplugSettings& aModProps);
 
 private:
- InputPlugin* mInPlug;
-
 unsigned char* mBuffer;
 uint32_t mBufSize;
 
 pthread_mutex_t mutex;
 int seek_time;
- bool mPaused;
-
- Settings mModProps;
+ bool stop_flag;
 
- int mFormat;
+ ModplugSettings mModProps;
 
 uint32_t mBufTime; //milliseconds
 
 CSoundFile* mSoundFile;
 Archive* mArchive;
 
- char mModName[100];
-
 float mPreampFactor;
 
 void PlayLoop(InputPlayback *);
- const char* Bool2OnOff(bool aValue);
 };
 
-extern ModplugXMMS gModplugXMMS;
-
 #endif //included

audacious-plugins-3.3.4.tar.bz2/src/modplug/plugin.cxx -> audacious-plugins-3.4.2.tar.bz2/src/modplug/plugin.cxx Changed

audacious-plugins-3.3.4.tar.bz2/src/modplug/plugin.h -> audacious-plugins-3.4.2.tar.bz2/src/modplug/plugin.h Changed

audacious-plugins-3.3.4.tar.bz2/src/modplug/plugin_main.c -> audacious-plugins-3.4.2.tar.bz2/src/modplug/plugin_main.c Changed

@@ -1,18 +1,244 @@
-#include <audacious/i18n.h>
+/*
+ * Modplug Audacious Plugin
+ *
+ * Configuration GUI contributed in part by Vladimir Strakh.
+ *
+ * This source code is public domain.
+ */
 
-#include "config.h"
 #include "plugin.h"
 
+#include <audacious/i18n.h>
+#include <audacious/misc.h>
+#include <audacious/plugin.h>
+#include <audacious/preferences.h>
+
+#define ARRAY_LEN(x) (sizeof (x) / sizeof (x)[0])
+
+#define MODPLUG_CFGID "modplug"
+
 static const char * fmts[] =
 { "amf", "ams", "dbm", "dbf", "dsm", "far", "mdl", "stm", "ult", "mt2",
 "mod", "s3m", "dmf", "umx", "it", "669", "xm", "mtm", "psm", "ft2",
 NULL };
 
+static const char * const modplug_defaults[] = {
+ "Bits", "16",
+ "Channels", "2",
+ "ResamplingMode", "3", /* SRCMODE_POLYPHASE */
+ "Frequency", "44100",
+
+ "Reverb", "FALSE",
+ "ReverbDepth", "30",
+ "ReverbDelay", "100",
+
+ "Megabass", "FALSE",
+ "BassAmount", "40",
+ "BassRange", "30",
+
+ "Surround", "TRUE",
+ "SurroundDepth", "20",
+ "SurroundDelay", "20",
+
+ "PreAmp", "FALSE",
+ "PreAmpLevel", "0",
+
+ "Oversampling", "TRUE",
+ "NoiseReduction", "TRUE",
+ "GrabAmigaMOD", "TRUE",
+ "LoopCount", "0",
+
+ NULL
+};
+
+static ModplugSettings modplug_settings;
+
+static const PreferencesWidget quality_widgets[] = {
+ {WIDGET_LABEL, N_("Resolution")},
+ {WIDGET_RADIO_BTN, N_("8-bit"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mBits, .data = {.radio_btn = {8}}},
+ {WIDGET_RADIO_BTN, N_("16-bit"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mBits, .data = {.radio_btn = {16}}},
+ {WIDGET_LABEL, N_("Channels")},
+ {WIDGET_RADIO_BTN, N_("Mono"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mChannels, .data = {.radio_btn = {1}}},
+ {WIDGET_RADIO_BTN, N_("Stereo"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mChannels, .data = {.radio_btn = {2}}},
+ {WIDGET_LABEL, N_("Resampling")},
+ {WIDGET_RADIO_BTN, N_("Nearest (fastest)"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mResamplingMode, .data = {.radio_btn = {0}}},
+ {WIDGET_RADIO_BTN, N_("Linear (fast)"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mResamplingMode, .data = {.radio_btn = {1}}},
+ {WIDGET_RADIO_BTN, N_("Spline (good)"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mResamplingMode, .data = {.radio_btn = {2}}},
+ {WIDGET_RADIO_BTN, N_("Polyphase (best)"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mResamplingMode, .data = {.radio_btn = {3}}},
+ {WIDGET_LABEL, N_("Sampling rate")},
+ {WIDGET_RADIO_BTN, N_("22 kHz"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mFrequency, .data = {.radio_btn = {22050}}},
+ {WIDGET_RADIO_BTN, N_("44 kHz"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mFrequency, .data = {.radio_btn = {44100}}},
+ {WIDGET_RADIO_BTN, N_("48 kHz"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mFrequency, .data = {.radio_btn = {48000}}},
+ {WIDGET_RADIO_BTN, N_("96 kHz"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mFrequency, .data = {.radio_btn = {96000}}}
+};
+
+static PreferencesWidget reverb_fields[] = {
+ {WIDGET_SPIN_BTN, N_("Level:"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mReverbDepth, .data = {.spin_btn = {0, 100, 1, "%"}}},
+ {WIDGET_SPIN_BTN, N_("Delay:"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mReverbDelay, .data = {.spin_btn = {40, 200, 1, N_("ms")}}}
+};
+
+static PreferencesWidget bass_fields[] = {
+ {WIDGET_SPIN_BTN, N_("Level:"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mBassAmount, .data = {.spin_btn = {0, 100, 1, "%"}}},
+ {WIDGET_SPIN_BTN, N_("Cutoff:"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mBassRange, .data = {.spin_btn = {10, 100, 1, N_("Hz")}}}
+};
+
+static PreferencesWidget surround_fields[] = {
+ {WIDGET_SPIN_BTN, N_("Level:"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mSurroundDepth, .data = {.spin_btn = {0, 100, 1, "%"}}},
+ {WIDGET_SPIN_BTN, N_("Delay:"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mSurroundDelay, .data = {.spin_btn = {5, 40, 1, N_("ms")}}}
+};
+
+static PreferencesWidget preamp_fields[] = {
+ {WIDGET_SPIN_BTN, N_("Volume:"), .cfg_type = VALUE_FLOAT,
+ .cfg = & modplug_settings.mPreampLevel, .data = {.spin_btn = {-3, 3, 0.1}}},
+};
+
+static const PreferencesWidget effects_widgets[] = {
+ {WIDGET_LABEL, N_("Reverb")},
+ {WIDGET_CHK_BTN, N_("Enable"), .cfg_type = VALUE_BOOLEAN,
+ .cfg = & modplug_settings.mReverb},
+ {WIDGET_TABLE, .child = TRUE, .data = {.table = {reverb_fields, ARRAY_LEN (reverb_fields)}}},
+ {WIDGET_LABEL, N_("Bass Boost")},
+ {WIDGET_CHK_BTN, N_("Enable"), .cfg_type = VALUE_BOOLEAN,
+ .cfg = & modplug_settings.mMegabass },
+ {WIDGET_TABLE, .child = TRUE, .data = {.table = {bass_fields, ARRAY_LEN (bass_fields)}}},
+ {WIDGET_LABEL, N_("Surround")},
+ {WIDGET_CHK_BTN, N_("Enable"), .cfg_type = VALUE_BOOLEAN,
+ .cfg = & modplug_settings.mSurround },
+ {WIDGET_TABLE, .child = TRUE, .data = {.table = {surround_fields, ARRAY_LEN (surround_fields)}}},
+ {WIDGET_LABEL, N_("Preamp")},
+ {WIDGET_CHK_BTN, N_("Enable"), .cfg_type = VALUE_BOOLEAN,
+ .cfg = & modplug_settings.mPreamp },
+ {WIDGET_TABLE, .child = TRUE, .data = {.table = {preamp_fields, ARRAY_LEN (preamp_fields)}}}
+};
+
+static const PreferencesWidget misc_widgets[] = {
+ {WIDGET_LABEL, N_("Miscellaneous")},
+ {WIDGET_CHK_BTN, N_("Oversample"), .cfg_type = VALUE_BOOLEAN,
+ .cfg = & modplug_settings.mOversamp},
+ {WIDGET_CHK_BTN, N_("Noise reduction"), .cfg_type = VALUE_BOOLEAN,
+ .cfg = & modplug_settings.mNoiseReduction},
+ {WIDGET_CHK_BTN, N_("Play Amiga MODs"), .cfg_type = VALUE_BOOLEAN,
+ .cfg = & modplug_settings.mGrabAmigaMOD},
+ {WIDGET_LABEL, N_("Repeat")},
+ {WIDGET_SPIN_BTN, N_("Repeat count:"), .cfg_type = VALUE_INT,
+ .cfg = & modplug_settings.mLoopCount, .data = {.spin_btn = {-1, 100, 1}}},
+ {WIDGET_LABEL, N_("To repeat forever, set the repeat count to -1.")}
+};
+
+static const PreferencesWidget modplug_columns[] = {
+ {WIDGET_BOX, .data = {.box = {quality_widgets, ARRAY_LEN (quality_widgets)}}},
+ {WIDGET_SEPARATOR},
+ {WIDGET_BOX, .data = {.box = {effects_widgets, ARRAY_LEN (effects_widgets)}}},
+ {WIDGET_SEPARATOR},
+ {WIDGET_BOX, .data = {.box = {misc_widgets, ARRAY_LEN (misc_widgets)}}}
+};
+
+static const PreferencesWidget modplug_widgets[] = {
+ {WIDGET_BOX, .data = {.box = {modplug_columns, ARRAY_LEN (modplug_columns), .horizontal = TRUE}}}
+};
+
+static void modplug_settings_load ()
+{
+ aud_config_set_defaults (MODPLUG_CFGID, modplug_defaults);
+
+ modplug_settings.mBits = aud_get_int (MODPLUG_CFGID, "Bits");
+ modplug_settings.mChannels = aud_get_int (MODPLUG_CFGID, "Channels");
+ modplug_settings.mResamplingMode = aud_get_int (MODPLUG_CFGID, "ResamplingMode");
+ modplug_settings.mFrequency = aud_get_int (MODPLUG_CFGID, "Frequency");
+
+ modplug_settings.mReverb = aud_get_bool (MODPLUG_CFGID, "Reverb");
+ modplug_settings.mReverbDepth = aud_get_int (MODPLUG_CFGID, "ReverbDepth");
+ modplug_settings.mReverbDelay = aud_get_int (MODPLUG_CFGID, "ReverbDelay");
+
+ modplug_settings.mMegabass = aud_get_bool (MODPLUG_CFGID, "Megabass");
+ modplug_settings.mBassAmount = aud_get_int (MODPLUG_CFGID, "BassAmount");
+ modplug_settings.mBassRange = aud_get_int (MODPLUG_CFGID, "BassRange");
+
+ modplug_settings.mSurround = aud_get_bool (MODPLUG_CFGID, "Surround");
+ modplug_settings.mSurroundDepth = aud_get_int (MODPLUG_CFGID, "SurroundDepth");
+ modplug_settings.mSurroundDelay = aud_get_int (MODPLUG_CFGID, "SurroundDelay");
+
+ modplug_settings.mPreamp = aud_get_bool (MODPLUG_CFGID, "PreAmp");
+ modplug_settings.mPreampLevel = aud_get_double (MODPLUG_CFGID, "PreAmpLevel");
+
+ modplug_settings.mOversamp = aud_get_bool (MODPLUG_CFGID, "Oversampling");
+ modplug_settings.mNoiseReduction = aud_get_bool (MODPLUG_CFGID, "NoiseReduction");
+ modplug_settings.mGrabAmigaMOD = aud_get_bool (MODPLUG_CFGID, "GrabAmigaMOD");
+ modplug_settings.mLoopCount = aud_get_int (MODPLUG_CFGID, "LoopCount");
+}
+
+static void modplug_settings_save ()
+{
+ aud_set_int (MODPLUG_CFGID, "Bits", modplug_settings.mBits);
+ aud_set_int (MODPLUG_CFGID, "Channels", modplug_settings.mChannels);
+ aud_set_int (MODPLUG_CFGID, "ResamplingMode", modplug_settings.mResamplingMode);
+ aud_set_int (MODPLUG_CFGID, "Frequency", modplug_settings.mFrequency);
+
+ aud_set_bool (MODPLUG_CFGID, "Reverb", modplug_settings.mReverb);
+ aud_set_int (MODPLUG_CFGID, "ReverbDepth", modplug_settings.mReverbDepth);
+ aud_set_int (MODPLUG_CFGID, "ReverbDelay", modplug_settings.mReverbDelay);
+
+ aud_set_bool (MODPLUG_CFGID, "Megabass", modplug_settings.mMegabass);
+ aud_set_int (MODPLUG_CFGID, "BassAmount", modplug_settings.mBassAmount);
+ aud_set_int (MODPLUG_CFGID, "BassRange", modplug_settings.mBassRange);
+
+ aud_set_bool (MODPLUG_CFGID, "Surround", modplug_settings.mSurround);
+ aud_set_int (MODPLUG_CFGID, "SurroundDepth", modplug_settings.mSurroundDepth);
+ aud_set_int (MODPLUG_CFGID, "SurroundDelay", modplug_settings.mSurroundDelay);
+
+ aud_set_bool (MODPLUG_CFGID, "PreAmp", modplug_settings.mPreamp);
+ aud_set_double (MODPLUG_CFGID, "PreAmpLevel", modplug_settings.mPreampLevel);
+
+ aud_set_bool (MODPLUG_CFGID, "Oversampling", modplug_settings.mOversamp);
+ aud_set_bool (MODPLUG_CFGID, "NoiseReduction", modplug_settings.mNoiseReduction);
+ aud_set_bool (MODPLUG_CFGID, "GrabAmigaMOD", modplug_settings.mGrabAmigaMOD);
+ aud_set_int (MODPLUG_CFGID, "LoopCount", modplug_settings.mLoopCount);
+}
+
+static bool_t modplug_init (void)
+{
+ modplug_settings_load ();
+ InitSettings (& modplug_settings);
+ return TRUE;
+}
+
+static void modplug_settings_apply (void)
+{
+ InitSettings (& modplug_settings);
+ modplug_settings_save ();
+}
+
+static const PluginPreferences modplug_prefs = {
+ .widgets = modplug_widgets,
+ .n_widgets = ARRAY_LEN (modplug_widgets),
+ .init = modplug_settings_load,
+ .apply = modplug_settings_apply
+};
+
 AUD_INPUT_PLUGIN
 (
 .name = N_("ModPlug (Module Player)"),
 .domain = PACKAGE,
- .init = Init,
+ .prefs = &modplug_prefs,
+ .init = modplug_init,
 .play = PlayFile,
 .stop = Stop,
 .pause = Pause,

audacious-plugins-3.4.2.tar.bz2/src/modplug/settings.h Added

audacious-plugins-3.3.4.tar.bz2/src/mpg123/mpg123.c -> audacious-plugins-3.4.2.tar.bz2/src/mpg123/mpg123.c Changed

@@ -19,10 +19,6 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */
 
-/* libmpg123 API uses off_t, so config.h must come before all other headers to
- * define _FILE_OFFSET_BITS for large file support */
-#include "config.h"
-
 #include <pthread.h>
 #include <string.h>
 
@@ -43,6 +39,8 @@
 /* Define to read all frame headers when calculating file length */
 /* #define FULL_SCAN */
 
+#define DECODE_OPTIONS (MPG123_QUIET | MPG123_GAPLESS | MPG123_SEEKBUFFER | MPG123_FUZZY)
+
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 
 static ssize_t replace_read (void * file, void * buffer, size_t length)
@@ -105,10 +103,28 @@
 	if (! strncmp (fname, "mms://", 6))
 		return FALSE;
 
+	bool_t is_streaming = vfs_is_streaming (file);
+
+	/* Some MP3s begin with enormous ID3 tags, which fill up the whole probe
+	 * buffer and thus hide any MP3 content. As a workaround, assume that an
+	 * ID3 tag means an MP3 file. --jlindgren */
+	if (! is_streaming)
+	{
+		char id3buf[3];
+		if (vfs_fread (id3buf, 1, 3, file) != 3)
+			return FALSE;
+
+		if (! memcmp (id3buf, "ID3", 3))
+			return TRUE;
+
+		if (vfs_fseek (file, 0, SEEK_SET) < 0)
+			return FALSE;
+	}
+
 	mpg123_handle * dec = mpg123_new (NULL, NULL);
-	mpg123_param (dec, MPG123_ADD_FLAGS, MPG123_QUIET, 0);
+	mpg123_param (dec, MPG123_ADD_FLAGS, DECODE_OPTIONS, 0);
 
-	if (vfs_is_streaming (file))
+	if (is_streaming)
 		mpg123_replace_reader_handle (dec, replace_read, replace_lseek_dummy, NULL);
 	else
 		mpg123_replace_reader_handle (dec, replace_read, replace_lseek, NULL);
@@ -169,7 +185,7 @@
 	struct mpg123_frameinfo info;
 	char scratch[32];
 
-	mpg123_param (decoder, MPG123_ADD_FLAGS, MPG123_QUIET, 0);
+	mpg123_param (decoder, MPG123_ADD_FLAGS, DECODE_OPTIONS, 0);
 
 	if (stream)
 		mpg123_replace_reader_handle (decoder, replace_read, replace_lseek_dummy, NULL);
@@ -319,9 +335,7 @@
 	data->set_data (data, & ctx);
 
 	ctx.decoder = mpg123_new (NULL, NULL);
-	mpg123_param (ctx.decoder, MPG123_ADD_FLAGS, MPG123_QUIET, 0);
-	mpg123_param (ctx.decoder, MPG123_ADD_FLAGS, MPG123_GAPLESS, 0);
-	mpg123_param (ctx.decoder, MPG123_ADD_FLAGS, MPG123_SEEKBUFFER, 0);
+	mpg123_param (ctx.decoder, MPG123_ADD_FLAGS, DECODE_OPTIONS, 0);
 
 	if (ctx.stream)
 		mpg123_replace_reader_handle (ctx.decoder, replace_read, replace_lseek_dummy, NULL);
@@ -372,6 +386,8 @@
 		goto cleanup;
 	}
 
+	data->output->flush (start_time);
+
 	if (pause)
 		data->output->pause (TRUE);
 
@@ -385,7 +401,7 @@
 	pthread_mutex_unlock (& mutex);
 
 	int64_t frames_played = 0;
-	int64_t frames_total = (stop_time - start_time) * ctx.rate / 1000;
+	int64_t frames_total = (int64_t) (stop_time - start_time) * ctx.rate / 1000;
 
 	while (1)
 	{
@@ -399,8 +415,7 @@
 
 		if (ctx.seek >= 0)
 		{
-			if (mpg123_seek (ctx.decoder, (int64_t) ctx.seek * ctx.rate / 1000,
-			 SEEK_SET) < 0)
+			if (mpg123_seek (ctx.decoder, (int64_t) ctx.seek * ctx.rate / 1000, SEEK_SET) < 0)
 			{
 				fprintf (stderr, "mpg123 error in %s: %s\n", filename,
 				 mpg123_strerror (ctx.decoder));
@@ -408,7 +423,7 @@
 			else
 			{
 				data->output->flush (ctx.seek);
-				frames_played = (ctx.seek - start_time) * ctx.rate / 1000;
+				frames_played = (int64_t) (ctx.seek - start_time) * ctx.rate / 1000;
 				outbuf_size = 0;
 			}

audacious-plugins-3.3.4.tar.bz2/src/mpris2/Makefile -> audacious-plugins-3.4.2.tar.bz2/src/mpris2/Makefile Changed

audacious-plugins-3.3.4.tar.bz2/src/mpris2/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/mpris2/plugin.c Changed

@@ -28,16 +28,14 @@
 #include <audacious/plugin.h>
 #include <libaudcore/hook.h>
 
-#include "config.h"
 #include "object-core.h"
 #include "object-player.h"
 
-static GDBusConnection * bus;
 static GObject * object_core, * object_player;
 static char * last_title, * last_artist, * last_album, * last_file;
 static int last_length;
 static const char * image_file;
-static GVariantType * metadata_type;
+static bool_t recheck_image;
 static int update_timer;
 
 static bool_t quit_cb (MprisMediaPlayer2 * object, GDBusMethodInvocation * call,
@@ -73,7 +71,7 @@
 
 /* pointer comparison works for pooled strings */
 if (title == last_title && artist == last_artist && album == last_album &&
- file == last_file && length == last_length)
+ file == last_file && length == last_length && ! recheck_image)
 {
 str_unref (title);
 str_unref (artist);
@@ -82,11 +80,12 @@
 return;
 }
 
- if (file != last_file)
+ if (file != last_file || recheck_image)
 {
 if (image_file)
 aud_art_unref (last_file);
- image_file = file ? aud_art_get_file (file) : NULL;
+ image_file = file ? aud_art_request_file (file) : NULL;
+ recheck_image = FALSE;
 }
 
 str_unref (last_title);
@@ -156,13 +155,16 @@
 GVariant * var = g_variant_new_variant (str);
 elems[nelems ++] = g_variant_new_dict_entry (key, var);
 
- if (! metadata_type)
- metadata_type = g_variant_type_new ("{sv}");
-
- GVariant * array = g_variant_new_array (metadata_type, elems, nelems);
+ GVariant * array = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), elems, nelems);
 g_object_set (object, "metadata", array, NULL);
 }
 
+static void update_image (void * data, GObject * object)
+{
+ recheck_image = TRUE;
+ update_metadata (data, object);
+}
+
 static void volume_changed (GObject * object)
 {
 double vol;
@@ -225,9 +227,7 @@
 static bool_t play_cb (MprisMediaPlayer2Player * object, GDBusMethodInvocation *
 call, void * unused)
 {
- if (! aud_drct_get_playing () || aud_drct_get_paused ())
- aud_drct_play ();
-
+ aud_drct_play ();
 mpris_media_player2_player_complete_play (object, call);
 return TRUE;
 }
@@ -235,11 +235,7 @@
 static bool_t play_pause_cb (MprisMediaPlayer2Player * object,
 GDBusMethodInvocation * call, void * unused)
 {
- if (aud_drct_get_playing () && ! aud_drct_get_paused ())
- aud_drct_pause ();
- else
- aud_drct_play ();
-
+ aud_drct_play_pause ();
 mpris_media_player2_player_complete_play_pause (object, call);
 return TRUE;
 }
@@ -255,9 +251,7 @@
 static bool_t seek_cb (MprisMediaPlayer2Player * object,
 GDBusMethodInvocation * call, int64_t offset, void * unused)
 {
- if (aud_drct_get_playing ())
- aud_drct_seek (aud_drct_get_time () + offset / 1000);
-
+ aud_drct_seek (aud_drct_get_time () + offset / 1000);
 mpris_media_player2_player_complete_seek (object, call);
 return TRUE;
 }
@@ -293,6 +287,8 @@
 hook_dissociate ("playlist position", (HookFunction) update_metadata);
 hook_dissociate ("playlist update", (HookFunction) update_metadata);
 
+ hook_dissociate ("current art ready", (HookFunction) update_image);
+
 hook_dissociate ("playback ready", (HookFunction) emit_seek);
 hook_dissociate ("playback seek", (HookFunction) emit_seek);
 
@@ -302,7 +298,6 @@
 update_timer = 0;
 }
 
- g_dbus_connection_close_sync (bus, NULL, NULL);
 g_object_unref (object_core);
 g_object_unref (object_player);
 
@@ -318,18 +313,12 @@
 str_unref (last_file);
 last_title = last_artist = last_album = last_file = NULL;
 last_length = 0;
-
- if (metadata_type)
- {
- g_variant_type_free (metadata_type);
- metadata_type = NULL;
- }
 }
 
 bool_t mpris2_init (void)
 {
 GError * error = NULL;
- bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, & error);
+ GDBusConnection * bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, & error);
 
 if (! bus)
 {
@@ -379,6 +368,8 @@
 hook_associate ("playlist position", (HookFunction) update_metadata, object_player);
 hook_associate ("playlist update", (HookFunction) update_metadata, object_player);
 
+ hook_associate ("current art ready", (HookFunction) update_image, object_player);
+
 hook_associate ("playback ready", (HookFunction) emit_seek, object_player);
 hook_associate ("playback seek", (HookFunction) emit_seek, object_player);

audacious-plugins-3.3.4.tar.bz2/src/neon/neon.c -> audacious-plugins-3.4.2.tar.bz2/src/neon/neon.c Changed

@@ -37,7 +37,6 @@
 #include <ne_request.h>
 #include <ne_auth.h>
 
-#include "config.h"
 #include "debug.h"
 #include "rb.h"
 #include "cert_verification.h"
@@ -528,10 +527,9 @@
 guint proxy_port = 0;
 
 gboolean use_proxy = aud_get_bool (NULL, "use_proxy");
- gboolean proxy_use_auth = aud_get_bool (NULL, "proxy_use_auth");
+ gboolean use_proxy_auth = aud_get_bool (NULL, "use_proxy_auth");
 
- if (use_proxy)
- {
+ if (use_proxy) {
 proxy_host = aud_get_string (NULL, "proxy_host");
 proxy_port = aud_get_int (NULL, "proxy_port");
 }
@@ -568,7 +566,7 @@
 _DEBUG("<%p> Using proxy: %s:%d", handle, proxy_host, proxy_port);
 ne_session_proxy(handle->session, proxy_host, proxy_port);
 
- if (proxy_use_auth) {
+ if (use_proxy_auth) {
 _DEBUG("<%p> Using proxy authentication", handle);
 ne_add_proxy_auth(handle->session, NE_AUTH_BASIC, neon_proxy_auth_cb, (void *)handle);
 }

audacious-plugins-3.3.4.tar.bz2/src/neon/neon.h -> audacious-plugins-3.4.2.tar.bz2/src/neon/neon.h Changed

audacious-plugins-3.3.4.tar.bz2/src/notify/event.c -> audacious-plugins-3.4.2.tar.bz2/src/notify/event.c Changed

@@ -2,7 +2,7 @@
 * event.c
 *
 * Copyright (C) 2010 Maximilian Bogner <max@mbogner.de>
- * Copyright (C) 2011 John Lindgren <john.lindgren@tds.net>
+ * Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -18,98 +18,160 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <glib.h>
-#include <string.h>
+#include "event.h"
 
 #include <audacious/drct.h>
 #include <audacious/i18n.h>
 #include <audacious/playlist.h>
+#include <audacious/misc.h>
 #include <libaudcore/hook.h>
 #include <libaudgui/libaudgui-gtk.h>
 
-#include "config.h"
-#include "event.h"
 #include "osd.h"
 
-static gchar * last_title = NULL, * last_message = NULL;
+static char * last_title = NULL, * last_message = NULL; /* pooled */
+static GdkPixbuf * last_pixbuf = NULL;
 
-static void clear (void)
+static void clear_cache (void)
 {
- g_free (last_title);
+ str_unref (last_title);
 last_title = NULL;
- g_free (last_message);
+ str_unref (last_message);
 last_message = NULL;
+
+ if (last_pixbuf)
+ {
+ g_object_unref (last_pixbuf);
+ last_pixbuf = NULL;
+ }
 }
 
-static void update (void * unused, void * explicit)
+static bool_t get_album_art (void)
 {
- if (! aud_drct_get_playing () || ! aud_drct_get_ready ())
- {
- if (GPOINTER_TO_INT (explicit))
- osd_show (_("Stopped"), _("Audacious is not playing."), NULL, NULL);
+ if (last_pixbuf)
+ return FALSE;
+
+ last_pixbuf = audgui_pixbuf_request_current ();
+ if (! last_pixbuf)
+ return FALSE;
 
+ audgui_pixbuf_scale_within (& last_pixbuf, 96);
+ return TRUE;
+}
+
+static void show_stopped (void)
+{
+ osd_show (_("Stopped"), _("Audacious is not playing."), "audacious", NULL);
+}
+
+static void show_playing (void)
+{
+ if (last_title && last_message)
+ osd_show (last_title, last_message, "audio-x-generic", last_pixbuf);
+}
+
+static void playback_update (void)
+{
+ if (! aud_drct_get_playing () || ! aud_drct_get_ready ())
 return;
- }
 
- gint list = aud_playlist_get_playing ();
- gint entry = aud_playlist_get_position (list);
+ int list = aud_playlist_get_playing ();
+ int entry = aud_playlist_get_position (list);
 
- gchar * title, * artist, * album;
+ char * title, * artist, * album;
 aud_playlist_entry_describe (list, entry, & title, & artist, & album, FALSE);
 
- gchar * message;
+ char * message;
 if (artist)
 {
 if (album)
- message = g_strdup_printf ("%s\n%s", artist, album);
+ message = str_printf ("%s\n%s", artist, album);
 else
- message = g_strdup (artist);
+ message = str_ref (artist);
 }
 else if (album)
- message = g_strdup (album);
+ message = str_ref (album);
 else
- message = g_strdup ("");
+ message = str_get ("");
 
- if (! GPOINTER_TO_INT (explicit) && last_title && last_message && ! strcmp
- (title, last_title) && ! strcmp (message, last_message))
+ str_unref (artist);
+ str_unref (album);
+
+ /* pointer comparison works for pooled strings */
+ if (title == last_title && message == last_message)
 {
- g_free (message);
- goto FREE;
+ str_unref (title);
+ str_unref (message);
+ return;
 }
 
- GdkPixbuf * pb = audgui_pixbuf_for_current ();
- if (pb)
- audgui_pixbuf_scale_within (& pb, 96);
+ str_unref (last_title);
+ last_title = title;
+ str_unref (last_message);
+ last_message = message;
 
- osd_show (title, message, "audio-x-generic", pb);
+ get_album_art ();
+ show_playing ();
+}
 
- if (pb)
- g_object_unref (pb);
+static void art_ready (void)
+{
+ if (aud_drct_get_playing () && get_album_art ())
+ show_playing ();
+}
 
- clear ();
- last_title = g_strdup (title);
- last_message = message;
+static void playback_paused (void)
+{
+ if (aud_get_bool ("notify", "resident"))
+ show_playing ();
+}
 
-FREE:
- str_unref (title);
- str_unref (artist);
- str_unref (album);
+static void playback_stopped (void)
+{
+ clear_cache ();
+
+ if (aud_get_bool ("notify", "resident"))
+ show_stopped ();
+}
+
+static void force_show (void)
+{
+ if (aud_drct_get_playing ())
+ show_playing ();
+ else
+ show_stopped ();
 }
 
 void event_init (void)
 {
- update (NULL, GINT_TO_POINTER (FALSE));
- hook_associate ("aosd toggle", (HookFunction) update, GINT_TO_POINTER (TRUE));
- hook_associate ("playback ready", (HookFunction) update, GINT_TO_POINTER (FALSE));
- hook_associate ("playlist update", (HookFunction) update, GINT_TO_POINTER (FALSE));
- hook_associate ("playback stop", (HookFunction) clear, NULL);
+ if (aud_drct_get_playing ())
+ playback_update ();
+ else
+ playback_stopped ();
+
+ hook_associate ("playback begin", (HookFunction) clear_cache, NULL);
+ hook_associate ("playback ready", (HookFunction) playback_update, NULL);
+ hook_associate ("playlist update", (HookFunction) playback_update, NULL);
+ hook_associate ("current art ready", (HookFunction) art_ready, NULL);
+ hook_associate ("playback pause", (HookFunction) playback_paused, NULL);
+ hook_associate ("playback unpause", (HookFunction) playback_paused, NULL);
+ hook_associate ("playback stop", (HookFunction) playback_stopped, NULL);
+
+ hook_associate ("aosd toggle", (HookFunction) force_show, NULL);
 }
 
 void event_uninit (void)
 {
- hook_dissociate ("aosd toggle", (HookFunction) update);
- hook_dissociate ("playback ready", (HookFunction) update);
- hook_dissociate ("playlist update", (HookFunction) update);
- hook_dissociate ("playback stop", (HookFunction) clear);
- clear ();
+ hook_dissociate ("playback begin", (HookFunction) clear_cache);
+ hook_dissociate ("playback ready", (HookFunction) playback_update);
+ hook_dissociate ("playlist update", (HookFunction) playback_update);
+ hook_dissociate ("current art ready", (HookFunction) art_ready);
+ hook_dissociate ("playback pause", (HookFunction) playback_paused);
+ hook_dissociate ("playback unpause", (HookFunction) playback_paused);
+ hook_dissociate ("playback stop", (HookFunction) playback_stopped);
+
+ hook_dissociate ("aosd toggle", (HookFunction) force_show);
+
+ clear_cache ();
+ osd_hide ();
 }

audacious-plugins-3.3.4.tar.bz2/src/notify/event.h -> audacious-plugins-3.4.2.tar.bz2/src/notify/event.h Changed

audacious-plugins-3.3.4.tar.bz2/src/notify/notify.c -> audacious-plugins-3.4.2.tar.bz2/src/notify/notify.c Changed

@@ -2,6 +2,7 @@
 * notify.c
 *
 * Copyright (C) 2010 Maximilian Bogner <max@mbogner.de>
+ * Copyright (C) 2013 John Lindgren and Jean-Alexandre Anglès d'Auriac
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -17,25 +18,21 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <glib.h>
 #include <gtk/gtk.h>
 
+#include <libnotify/notify.h>
+
 #include <audacious/i18n.h>
 #include <audacious/plugin.h>
-#include <audacious/debug.h>
+#include <audacious/preferences.h>
+#include <audacious/misc.h>
 
-#include "config.h"
 #include "event.h"
-#include "osd.h"
-
-gboolean plugin_init (void);
-void plugin_cleanup (void);
 
 static const char plugin_about[] =
- N_("Based on libnotify-aosd by Maximilian Bogner:\n"
- "http://www.mbogner.de/projects/libnotify-aosd/\n\n"
+ N_("Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
- "Copyright (C) 2011 John Lindgren\n\n"
+ "Copyright (C) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n\n"
 "This plugin is free software: you can redistribute it and/or modify "
 "it under the terms of the GNU General Public License as published by "
 "the Free Software Foundation, either version 3 of the License, or "
@@ -47,37 +44,55 @@
 "You should have received a copy of the GNU General Public License "
 "along with this program. If not, see <http://www.gnu.org/licenses/>.");
 
-AUD_GENERAL_PLUGIN
-(
- .name = N_("Desktop Notifications"),
- .domain = PACKAGE,
- .about_text = plugin_about,
- .init = plugin_init,
- .cleanup = plugin_cleanup
-)
-
-short plugin_active = 0;
+static const char * const notify_defaults[] = {
+ "actions", "TRUE",
+ "resident", "FALSE",
+ NULL
+};
 
-gboolean plugin_init (void)
+static bool_t plugin_init (void)
 {
- AUDDBG("started!\n");
- if(!osd_init()) {
- AUDDBG("osd_init failed!\n");
+ aud_config_set_defaults ("notify", notify_defaults);
+
+ if (! notify_init ("Audacious"))
 return FALSE;
- }
- event_init();
 
- plugin_active = 1;
+ event_init();
 return TRUE;
 }
 
+static void plugin_cleanup (void)
+{
+ event_uninit ();
+ notify_uninit ();
+}
 
-void plugin_cleanup() {
- if(plugin_active) {
- AUDDBG("started!\n");
- event_uninit();
- osd_uninit();
- plugin_active = 0;
- AUDDBG("done!\n");
- }
+static void plugin_reinit (void)
+{
+ event_uninit ();
+ event_init ();
 }
+
+static const PreferencesWidget prefs_widgets[] = {
+ {WIDGET_CHK_BTN, N_("Show playback controls"),
+ .cfg_type = VALUE_BOOLEAN, .csect = "notify", .cname = "actions",
+ .callback = plugin_reinit},
+ {WIDGET_CHK_BTN, N_("Always show notification"),
+ .cfg_type = VALUE_BOOLEAN, .csect = "notify", .cname = "resident",
+ .callback = plugin_reinit}
+};
+
+static const PluginPreferences plugin_prefs = {
+ .widgets = prefs_widgets,
+ .n_widgets = G_N_ELEMENTS (prefs_widgets)
+};
+
+AUD_GENERAL_PLUGIN
+(
+ .name = N_("Desktop Notifications"),
+ .domain = PACKAGE,
+ .about_text = plugin_about,
+ .prefs = & plugin_prefs,
+ .init = plugin_init,
+ .cleanup = plugin_cleanup
+)

audacious-plugins-3.3.4.tar.bz2/src/notify/osd.c -> audacious-plugins-3.4.2.tar.bz2/src/notify/osd.c Changed

@@ -2,6 +2,7 @@
 * osd.c
 *
 * Copyright (C) 2010 Maximilian Bogner <max@mbogner.de>
+ * Copyright (C) 2013 John Lindgren and Jean-Alexandre Anglès d'Auriac
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -17,61 +18,93 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <glib.h>
-#include <audacious/debug.h>
-#include <libnotify/notify.h>
-
 #include "osd.h"
 
-NotifyNotification *notification = NULL;
+#include <libnotify/notify.h>
 
-gboolean osd_init() {
- notification = NULL;
- return notify_init ("Audacious");
+#include <audacious/i18n.h>
+#include <audacious/drct.h>
+#include <audacious/misc.h>
+
+static void show_cb (void)
+{
+ aud_interface_show (TRUE);
 }
 
-void osd_uninit (void)
+static void osd_setup (NotifyNotification *notification)
 {
- if (notification)
- {
- g_object_unref (notification);
- notification = NULL;
- }
+ bool_t resident = aud_get_bool ("notify", "resident");
+
+ notify_notification_set_hint (notification, "desktop-entry",
+ g_variant_new_string ("audacious"));
+
+ notify_notification_set_hint (notification, "action-icons", g_variant_new_boolean (TRUE));
+ notify_notification_set_hint (notification, "resident", g_variant_new_boolean (resident));
+ notify_notification_set_hint (notification, "transient", g_variant_new_boolean (! resident));
 
- notify_uninit();
+ notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
+ notify_notification_set_timeout (notification, resident ?
+ NOTIFY_EXPIRES_NEVER : NOTIFY_EXPIRES_DEFAULT);
 }
 
-void osd_closed_handler(NotifyNotification *notification2, gpointer data) {
- if(notification != NULL) {
- g_object_unref(notification);
- notification = NULL;
- AUDDBG("notification unrefed!\n");
- }
+void osd_setup_buttons (NotifyNotification *notification)
+{
+ notify_notification_clear_actions (notification);
+
+ if (! aud_get_bool ("notify", "actions"))
+ return;
+
+ notify_notification_add_action (notification, "default", _("Show"),
+ NOTIFY_ACTION_CALLBACK (show_cb), NULL, NULL);
+
+ bool_t playing = aud_drct_get_playing ();
+ bool_t paused = aud_drct_get_paused ();
+
+ if (playing && ! paused)
+ notify_notification_add_action (notification, "media-playback-pause",
+ _("Pause"), NOTIFY_ACTION_CALLBACK (aud_drct_pause), NULL, NULL);
+ else
+ notify_notification_add_action (notification, "media-playback-start",
+ _("Play"), NOTIFY_ACTION_CALLBACK (aud_drct_play), NULL, NULL);
+
+ if (playing)
+ notify_notification_add_action (notification, "media-skip-forward",
+ _("Next"), NOTIFY_ACTION_CALLBACK (aud_drct_pl_next), NULL, NULL);
 }
 
-void osd_show (const gchar * title, const gchar * _message, const gchar * icon,
- GdkPixbuf * pb)
+static NotifyNotification * notification = NULL;
+
+void osd_show (const char * title, const char * _message, const char * icon,
+ GdkPixbuf * pixbuf)
 {
- gchar * message = g_markup_escape_text (_message, -1);
- GError *error = NULL;
-
- if(notification == NULL) {
- notification = notify_notification_new(title, message, pb == NULL ? icon : NULL);
- g_signal_connect(notification, "closed", G_CALLBACK(osd_closed_handler), NULL);
- AUDDBG("new osd created! (notification=%p)\n", (void *) notification);
- } else {
- if(notify_notification_update(notification, title, message, pb == NULL ? icon : NULL)) {
- AUDDBG("old osd updated! (notification=%p)\n", (void *) notification);
- } else {
- AUDDBG("could not update old osd! (notification=%p)\n", (void *) notification);
- }
+ char * message = g_markup_escape_text (_message, -1);
+
+ if (pixbuf)
+ icon = NULL;
+
+ if (notification)
+ notify_notification_update (notification, title, message, icon);
+ else
+ {
+ notification = notify_notification_new (title, message, icon);
+ osd_setup (notification);
 }
 
- if(pb != NULL)
- notify_notification_set_icon_from_pixbuf(notification, pb);
+ if (pixbuf)
+ notify_notification_set_image_from_pixbuf (notification, pixbuf);
 
- if(!notify_notification_show(notification, &error))
- AUDDBG("%s!\n", error->message);
+ osd_setup_buttons (notification);
+ notify_notification_show (notification, NULL);
 
 g_free (message);
 }
+
+void osd_hide (void)
+{
+ if (! notification)
+ return;
+
+ notify_notification_close (notification, NULL);
+ g_object_unref (notification);
+ notification = NULL;
+}

audacious-plugins-3.3.4.tar.bz2/src/notify/osd.h -> audacious-plugins-3.4.2.tar.bz2/src/notify/osd.h Changed

audacious-plugins-3.3.4.tar.bz2/src/oss4/oss.h -> audacious-plugins-3.4.2.tar.bz2/src/oss4/oss.h Changed

audacious-plugins-3.3.4.tar.bz2/src/pls/pls.c -> audacious-plugins-3.4.2.tar.bz2/src/pls/pls.c Changed

audacious-plugins-3.3.4.tar.bz2/src/psf/Makefile -> audacious-plugins-3.4.2.tar.bz2/src/psf/Makefile Changed

audacious-plugins-3.3.4.tar.bz2/src/psf/ao.h -> audacious-plugins-3.4.2.tar.bz2/src/psf/ao.h Changed

@@ -4,11 +4,11 @@
 // Fake ao.h to set up the general Audio Overload style environment
 //
 
-#include "../../config.h"
-
 #ifndef __AO_H
 #define __AO_H
 
+#include <stdint.h>
+
 #define AO_SUCCESS					1
 #define AO_FAIL						0
 #define AO_FAIL_DECOMPRESSION		-1
@@ -16,6 +16,14 @@
 #define MAX_DISP_INFO_LENGTH		256
 #define AUDIO_RATE					(44100)
 
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
 enum
 {
 	COMMAND_NONE = 0,
@@ -29,143 +37,6 @@
 	COMMAND_JUMP
 };
 
-/* Compiler defines for Xcode */
-#ifndef WORDS_BIGENDIAN
-	#define LSB_FIRST	1
-#endif
-
-typedef unsigned char ao_bool;
-
-#ifdef __GNUC__
-#include <stddef.h>	// get NULL
-#include <stdbool.h>
-
-#ifndef nil
-#define nil NULL
-#endif
-
-#ifndef TRUE
-#define TRUE (1)
-#endif
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#define xmalloc(a) malloc(a)
-
-#endif
-
-#ifdef _MSC_VER
-#include <stddef.h>	// get NULL
-#include <wchar.h> // for off_t
-
-#ifndef nil
-#define nil NULL
-#endif
-
-#ifndef TRUE
-#define TRUE (1)
-#endif
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#define true (1)
-#define false (0)
-
-#define xmalloc(a) malloc(a)
-
-#define strcasecmp _strcmpi
-
-#endif
-
-typedef unsigned char		uint8;
-typedef unsigned char		UINT8;
-typedef signed char			int8;
-typedef signed char			INT8;
-typedef unsigned short		uint16;
-typedef unsigned short		UINT16;
-typedef signed short		int16;
-typedef signed short		INT16;
-typedef signed int			int32;
-typedef unsigned int		uint32;
-#ifdef LONG_IS_64BIT
-typedef signed long int64;
-typedef unsigned long uint64;
-#else
-typedef signed long long	int64;
-typedef unsigned long long	uint64;
-#endif
-
-#ifdef WIN32
-#ifndef _BASETSD_H
-typedef signed int			INT32;
-typedef unsigned int		UINT32;
-typedef signed long long	INT64;
-typedef unsigned long long	UINT64;
-#endif
-#else
-typedef signed int			INT32;
-typedef unsigned int		UINT32;
-#ifdef LONG_IS_64BIT
-typedef signed long INT64;
-typedef unsigned long UINT64;
-#else
-typedef signed long long	INT64;
-typedef unsigned long long	UINT64;
-#endif
-#endif
-
-#ifndef INLINE
-#if defined(_MSC_VER)
-#define INLINE __forceinline
-#elif defined(__GNUC__)
-#define INLINE __inline__
-#elif defined(_MWERKS_)
-#define INLINE inline
-#elif defined(__powerc)
-#define INLINE inline
-#else
-#define INLINE
-#endif
-#endif
-
-#if LSB_FIRST
-#define LE16(x) (x)
-#define LE32(x) (x)
-
-#ifndef __ENDIAN__ /* Mac OS X Endian header has this function in it */
-static unsigned long INLINE Endian32_Swap(unsigned long addr)
-{
-	unsigned long res = (((addr&0xff000000)>>24) |
-		 ((addr&0x00ff0000)>>8) |
-		 ((addr&0x0000ff00)<<8) |
-		 ((addr&0x000000ff)<<24));
-
-	return res;
-}
-#endif
-
-#else
-
-static unsigned short INLINE LE16(unsigned short x)
-{
-	unsigned short res = (((x & 0xFF00) >> 8) | ((x & 0xFF) << 8));
-	return res;
-}
-
-static unsigned long INLINE LE32(unsigned long addr)
-{
-	unsigned long res = (((addr&0xff000000)>>24) |
-		 ((addr&0x00ff0000)>>8) |
-		 ((addr&0x0000ff00)<<8) |
-		 ((addr&0x000000ff)<<24));
-
-	return res;
-}
-
-#endif
-
-int ao_get_lib(char *filename, uint8 **buffer, uint64 *length);
+int ao_get_lib(char *filename, uint8_t **buffer, uint64_t *length);
 
 #endif // AO_H

audacious-plugins-3.3.4.tar.bz2/src/psf/corlett.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/corlett.c Changed

@@ -79,47 +79,50 @@
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
+#include <strings.h>
+
+#include <glib.h>
+#include <zlib.h>
 
 #include "ao.h"
 #include "corlett.h"
 
-#include <zlib.h>
-#include <stdlib.h>
+#define LE32(x) GUINT32_FROM_LE(x)
 
 #define DECOMP_MAX_SIZE		((32 * 1024 * 1024) + 12)
 
-int corlett_decode(uint8 *input, uint32 input_len, uint8 **output, uint64 *size, corlett_t **c)
+int corlett_decode(uint8_t *input, uint32_t input_len, uint8_t **output, uint64_t *size, corlett_t **c)
 {
-	uint32 *buf;
-	uint32 res_area, comp_crc, actual_crc;
-	uint8 *decomp_dat, *tag_dec;
+	uint32_t *buf;
+	uint32_t res_area, comp_crc, actual_crc;
+	uint8_t *decomp_dat, *tag_dec;
 	uLongf decomp_length, comp_length;
-	
+
 	// 32-bit pointer to data
-	buf = (uint32 *)input;
-	
+	buf = (uint32_t *)input;
+
 	// Check we have a PSF format file.
 	if ((input[0] != 'P') || (input[1] != 'S') || (input[2] != 'F'))
 	{
 		return AO_FAIL;
 	}
-	
+
 	// Get our values
 	res_area = LE32(buf[1]);
 	comp_length = LE32(buf[2]);
 	comp_crc = LE32(buf[3]);
-		
+
 	if (comp_length > 0)
 	{
 		// Check length
 		if (input_len < comp_length + 16)
 			return AO_FAIL;
-	
+
 		// Check CRC is correct
 		actual_crc = crc32(0, (unsigned char *)&buf[4+(res_area/4)], comp_length);
 		if (actual_crc != comp_crc)
 			return AO_FAIL;
-	
+
 		// Decompress data if any
 		decomp_dat = malloc(DECOMP_MAX_SIZE);
 		decomp_length = DECOMP_MAX_SIZE;
@@ -128,7 +131,7 @@
 			free(decomp_dat);
 			return AO_FAIL;
 		}
-	 	
+
 		// Resize memory buffer to what we actually need
 		decomp_dat = realloc(decomp_dat, (size_t)decomp_length + 1);
 	}
@@ -157,7 +160,7 @@
 	// set reserved section pointer
 	(*c)->res_section = &buf[4];
 	(*c)->res_size = res_area;
-	
+
 	// Return it
 	if (output != NULL && size != NULL)
 	{
@@ -171,19 +174,19 @@
 	input_len -= (comp_length + 16 + res_area);
 	if (input_len < 5)
 		return AO_SUCCESS;
-		
+
 //	printf("\n\nNew corlett: input len %d\n", input_len);
-	
+
 	tag_dec = input + (comp_length + res_area + 16);
 	if ((tag_dec[0] == '[') && (tag_dec[1] == 'T') && (tag_dec[2] == 'A') && (tag_dec[3] == 'G') && (tag_dec[4] == ']'))
 	{
 		int l, num_tags, data;
-		
+
 		// Tags found!
 		tag_dec += 5;
 		input_len -= 5;
 
-		data = false;
+		data = FALSE;
 		num_tags = 0;
 		l = 0;
 		while (input_len && (num_tags < MAX_UNKNOWN_TAGS))
@@ -193,7 +196,7 @@
 				if ((*tag_dec == 0xA) || (*tag_dec == 0x00))
 				{
 					(*c)->tag_data[num_tags][l] = 0;
-					data = false;
+					data = FALSE;
 					num_tags++;
 					l = 0;
 				}
@@ -208,22 +211,22 @@
 				{
 					(*c)->tag_name[num_tags][l] = 0;
 					l = 0;
-					data = true;
+					data = TRUE;
 				}
 				else
 				{
 					(*c)->tag_name[num_tags][l++] = *tag_dec;
 				}
 			}
-			
+
 			tag_dec++;
 			input_len--;
 		}
-		
-		
+
+
 		// Now, process that tag array into what we expect
 		for (num_tags = 0; num_tags < MAX_UNKNOWN_TAGS; num_tags++)
-		{			
+		{
 			// See if tag belongs in one of the special fields we have
 			if (!strcasecmp((*c)->tag_name[num_tags], "_lib"))
 			{
@@ -329,15 +332,15 @@
 			}
 		}
 	}
-	
+
 	// Bingo
 	return AO_SUCCESS;
 }
 
-uint32 psfTimeToMS(char *str)
+uint32_t psfTimeToMS(char *str)
 {
 	int x, c=0;
-	uint32 acc=0;
+	uint32_t acc=0;
 	char s[100];
 
 	strncpy(s,str,100);
@@ -352,11 +355,11 @@
 		}
 		else if (s[x]==':')
 		{
-			if(c==0) 
+			if(c==0)
 			{
 				acc+=atoi(s+x+1)*10;
 			}
-			else if(c==1) 
+			else if(c==1)
 			{
 				acc+=atoi(s+x+(x?1:0))*10*60;
 			}
@@ -367,14 +370,14 @@
 		else if (x==0)
 		{
 			if(c==0)
-			{ 
+			{
 				acc+=atoi(s+x)*10;
 			}
-			else if(c==1) 
+			else if(c==1)
 			{
 				acc+=atoi(s+x)*10*60;
 			}
-			else if(c==2) 
+			else if(c==2)
 			{
 				acc+=atoi(s+x)*10*60*60;
 			}

audacious-plugins-3.3.4.tar.bz2/src/psf/corlett.h -> audacious-plugins-3.4.2.tar.bz2/src/psf/corlett.h Changed

audacious-plugins-3.3.4.tar.bz2/src/psf/cpuintrf.h -> audacious-plugins-3.4.2.tar.bz2/src/psf/cpuintrf.h Changed

@@ -10,7 +10,7 @@
 
 #define CLEAR_LINE		0		/* clear (a fired, held or pulsed) line */
 #define ASSERT_LINE 1 /* assert an interrupt immediately */
-#define HOLD_LINE 2 /* hold interrupt line until enable is true */
+#define HOLD_LINE 2 /* hold interrupt line until enable is TRUE */
 #define PULSE_LINE		3		/* pulse interrupt line for one instruction */
 
 #define MAX_REGS		64		/* maximum number of register of any CPU */
@@ -44,7 +44,7 @@
 * the names from the enum a CPU core defines for it's registers,
 * to get or set the contents of the memory pointed to by a stack pointer.
 * You can specify the n'th element on the stack by (REG_SP_CONTENTS-n),
- * ie. lower negative values. The actual element size (UINT16 or UINT32)
+ * ie. lower negative values. The actual element size (uint16_t or uint32_t)
 * depends on the CPU core.
 * This is also used to replace the cpu_geturnpc() function.
 */
@@ -542,8 +542,8 @@
 
 #define Z80_VECTOR(device,state) (((device)<<8)|(state))
 
-#ifndef INLINE
-#define INLINE 		inline
+#ifndef inline
+#define inline 		inline
 #endif
 
 #include <string.h>
@@ -631,7 +631,7 @@
 	/* --- the following bits of info are returned as pointers to data or functions --- */
 	CPUINFO_PTR_FIRST = 0x10000,
 
-	CPUINFO_PTR_SET_INFO = CPUINFO_PTR_FIRST,			/* R/O: void (*set_info)(UINT32 state, INT64 data, void *ptr) */
+	CPUINFO_PTR_SET_INFO = CPUINFO_PTR_FIRST,			/* R/O: void (*set_info)(uint32_t state, int64_t data, void *ptr) */
 	CPUINFO_PTR_GET_CONTEXT,							/* R/O: void (*get_context)(void *buffer) */
 	CPUINFO_PTR_SET_CONTEXT,							/* R/O: void (*set_context)(void *buffer) */
 	CPUINFO_PTR_INIT,									/* R/O: void (*init)(void) */

audacious-plugins-3.3.4.tar.bz2/src/psf/eng_protos.h -> audacious-plugins-3.4.2.tar.bz2/src/psf/eng_protos.h Changed

@@ -1,20 +1,20 @@
 #include <audacious/plugin.h>
 
-int32 psf2_start(uint8 *, uint32 length);
-int32 psf2_execute(InputPlayback *playback);
-int32 psf2_stop(void);
-int32 psf2_command(int32, int32);
-int32 psf2_fill_info(Tuple *);
-int psf2_seek(uint32);
+int32_t psf2_start(uint8_t *, uint32_t length);
+int32_t psf2_execute(InputPlayback *playback);
+int32_t psf2_stop(void);
+int32_t psf2_command(int32_t, int32_t);
+int32_t psf2_fill_info(Tuple *);
+int psf2_seek(uint32_t);
 
-int32 psf_start(uint8 *buffer, uint32 length);
-int32 psf_execute(InputPlayback *playback);
-int psf_seek(uint32);
-int32 psf_stop(void);
+int32_t psf_start(uint8_t *buffer, uint32_t length);
+int32_t psf_execute(InputPlayback *playback);
+int psf_seek(uint32_t);
+int32_t psf_stop(void);
 
-int32 spx_start(uint8 *buffer, uint32 length);
-int32 spx_execute(InputPlayback *playback);
-int spx_seek(uint32);
-int32 spx_stop(void);
+int32_t spx_start(uint8_t *buffer, uint32_t length);
+int32_t spx_execute(InputPlayback *playback);
+int spx_seek(uint32_t);
+int32_t spx_stop(void);
 
 extern bool_t stop_flag;

audacious-plugins-3.3.4.tar.bz2/src/psf/eng_psf.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/eng_psf.c Changed

@@ -27,6 +27,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <strings.h>
+
+#include <glib.h>
 
 #include "ao.h"
 #include "eng_protos.h"
@@ -39,37 +42,38 @@
 #include "peops/registers.h"
 #include "peops/spu.h"
 
-
 #include "corlett.h"
 
 #define DEBUG_LOADER	(0)
 
+#define LE32(x) GUINT32_FROM_LE(x)
+
 static corlett_t	*c = NULL;
 static char 		psfby[256];
 int			psf_refresh = -1;
 
 
 // main RAM
-extern uint32 psx_ram[((2*1024*1024)/4)+4];
-extern uint32 psx_scratch[0x400];
-extern uint32 initial_ram[((2*1024*1024)/4)+4];
-extern uint32 initial_scratch[0x400];
-static uint32 initialPC, initialGP, initialSP;
+extern uint32_t psx_ram[((2*1024*1024)/4)+4];
+extern uint32_t psx_scratch[0x400];
+extern uint32_t initial_ram[((2*1024*1024)/4)+4];
+extern uint32_t initial_scratch[0x400];
+static uint32_t initialPC, initialGP, initialSP;
 
 extern void mips_init( void );
 extern void mips_reset( void *param );
 extern int mips_execute( int cycles );
-extern void mips_set_info(UINT32 state, union cpuinfo *info);
+extern void mips_set_info(uint32_t state, union cpuinfo *info);
 extern void psx_hw_init(void);
 extern void psx_hw_slice(void);
 extern void psx_hw_frame(void);
-extern void setlength(int32 stop, int32 fade);
+extern void setlength(int32_t stop, int32_t fade);
 
-int32 psf_start(uint8 *buffer, uint32 length)
+int32_t psf_start(uint8_t *buffer, uint32_t length)
 {
-	uint8 *file, *lib_decoded, *lib_raw_file, *alib_decoded;
-	uint32 offset, plength, PC, SP, GP, lengthMS, fadeMS;
-	uint64 file_len, lib_len, lib_raw_length, alib_len;
+	uint8_t *file, *lib_decoded, *lib_raw_file, *alib_decoded;
+	uint32_t offset, plength, PC, SP, GP, lengthMS, fadeMS;
+	uint64_t file_len, lib_len, lib_raw_length, alib_len;
 	corlett_t *lib;
 	int i;
 	union cpuinfo mipsinfo;
@@ -122,7 +126,7 @@
 	// Get the library file, if any
 	if (c->lib[0] != 0)
 	{
-		uint64 tmp_length;
+		uint64_t tmp_length;
 
 		#if DEBUG_LOADER
 		printf("Loading library: %s\n", c->lib);
@@ -218,7 +222,7 @@
 	{
 		if (c->libaux[i][0] != 0)
 		{
-			uint64 tmp_length;
+			uint64_t tmp_length;
 
 			#if DEBUG_LOADER
 			printf("Loading aux library: %s\n", c->libaux[i]);
@@ -370,7 +374,7 @@
 	return AO_SUCCESS;
 }
 
-int32 psf_execute(InputPlayback *playback)
+int32_t psf_execute(InputPlayback *playback)
 {
 	int i;
 
@@ -386,7 +390,7 @@
 	return AO_SUCCESS;
 }
 
-int32 psf_stop(void)
+int32_t psf_stop(void)
 {
 	SPUclose();
 	free(c);

audacious-plugins-3.3.4.tar.bz2/src/psf/eng_psf2.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/eng_psf2.c Changed

@@ -45,6 +45,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <strings.h>
+
+#include <glib.h>
 #include <zlib.h>
 
 #include "ao.h"
@@ -67,32 +70,34 @@
 #define ELF32_R_SYM(val) ((val) >> 8)
 #define ELF32_R_TYPE(val) ((val) & 0xff)
 
+#define LE32(x) GUINT32_FROM_LE(x)
+
 static corlett_t	*c = NULL;
 
 // main RAM
-extern uint32 psx_ram[(2*1024*1024)/4];
-extern uint32 initial_ram[(2*1024*1024)/4];
-static uint32 initialPC, initialSP;
-static uint32 loadAddr, lengthMS, fadeMS;
-
-static uint8 *filesys[MAX_FS];
-static uint8 *lib_raw_file;
-static uint32 fssize[MAX_FS];
+extern uint32_t psx_ram[(2*1024*1024)/4];
+extern uint32_t initial_ram[(2*1024*1024)/4];
+static uint32_t initialPC, initialSP;
+static uint32_t loadAddr, lengthMS, fadeMS;
+
+static uint8_t *filesys[MAX_FS];
+static uint8_t *lib_raw_file;
+static uint32_t fssize[MAX_FS];
 static int num_fs;
 
 extern void mips_init( void );
 extern void mips_reset( void *param );
 extern int mips_execute( int cycles );
-extern void mips_set_info(UINT32 state, union cpuinfo *info);
+extern void mips_set_info(uint32_t state, union cpuinfo *info);
 extern void psx_hw_init(void);
 extern void ps2_hw_slice(void);
 extern void ps2_hw_frame(void);
-extern void setlength2(int32 stop, int32 fade);
+extern void setlength2(int32_t stop, int32_t fade);
 
-static void do_iopmod(uint8 *start, uint32 offset)
+static void do_iopmod(uint8_t *start, uint32_t offset)
 {
 	#if DEBUG_LOADER
-	uint32 nameoffs, saddr, heap, tsize, dsize, bsize, vers2;
+	uint32_t nameoffs, saddr, heap, tsize, dsize, bsize, vers2;
 
 	nameoffs = start[offset] | start[offset+1]<<8 | start[offset+2]<<16 | start[offset+3]<<24;
 
@@ -108,12 +113,12 @@
 	#endif
 }
 
-uint32 psf2_load_elf(uint8 *start, uint32 len)
+uint32_t psf2_load_elf(uint8_t *start, uint32_t len)
 {
-	uint32 entry, shoff, shentsize, shnum;
-	uint32 type, addr, offset, size, shent;
-//	uint32 phoff, phentsize, phnum, shstrndx, name, flags;
-	uint32 totallen;
+	uint32_t entry, shoff, shentsize, shnum;
+	uint32_t type, addr, offset, size, shent;
+//	uint32_t phoff, phentsize, phnum, shstrndx, name, flags;
+	uint32_t totallen;
 	int i, rec;
 //	FILE *f;
 
@@ -185,8 +190,8 @@
 			case 9:			// REL: short relocation data
 		 		for (rec = 0; rec < (size/8); rec++)
 				{
-					uint32 offs, info, target, temp, val, vallo;
-					static uint32 hi16offs = 0, hi16target = 0;
+					uint32_t offs, info, target, temp, val, vallo;
+					static uint32_t hi16offs = 0, hi16target = 0;
 
 					offs = start[offset+(rec*8)] | start[offset+1+(rec*8)]<<8 | start[offset+2+(rec*8)]<<16 | start[offset+3+(rec*8)]<<24;
 					info = start[offset+4+(rec*8)] | start[offset+5+(rec*8)]<<8 | start[offset+6+(rec*8)]<<16 | start[offset+7+(rec*8)]<<24;
@@ -266,12 +271,12 @@
 	return entry;
 }
 
-static uint32 load_file_ex(uint8 *top, uint8 *start, uint32 len, char *file, uint8 *buf, uint32 buflen)
+static uint32_t load_file_ex(uint8_t *top, uint8_t *start, uint32_t len, char *file, uint8_t *buf, uint32_t buflen)
 {
-	int32 numfiles, i, j;
-	uint8 *cptr;
-	uint32 offs, uncomp, bsize, cofs, uofs;
-	uint32 X;
+	int32_t numfiles, i, j;
+	uint8_t *cptr;
+	uint32_t offs, uncomp, bsize, cofs, uofs;
+	uint32_t X;
 	uLongf dlength;
 	int uerr;
 	char matchname[512], *remainder;
@@ -316,7 +321,7 @@
 			uofs = 0;
 			for (j = 0; j < X; j++)
 			{
-				uint32 usize;
+				uint32_t usize;
 
 				usize = top[offs+(j*4)] | top[offs+1+(j*4)]<<8 | top[offs+2+(j*4)]<<16 | top[offs+3+(j*4)]<<24;
 
@@ -344,22 +349,22 @@
 	return 0xffffffff;
 }
 
-static uint32 load_file(int fs, char *file, uint8 *buf, uint32 buflen)
+static uint32_t load_file(int fs, char *file, uint8_t *buf, uint32_t buflen)
 {
 	return load_file_ex(filesys[fs], filesys[fs], fssize[fs], file, buf, buflen);
 }
 
 #if 0
-static dump_files(int fs, uint8 *buf, uint32 buflen)
+static dump_files(int fs, uint8_t *buf, uint32_t buflen)
 {
-	int32 numfiles, i, j;
-	uint8 *cptr;
-	uint32 offs, uncomp, bsize, cofs, uofs;
-	uint32 X;
+	int32_t numfiles, i, j;
+	uint8_t *cptr;
+	uint32_t offs, uncomp, bsize, cofs, uofs;
+	uint32_t X;
 	uLongf dlength;
 	int uerr;
-	uint8 *start;
-	uint32 len;
+	uint8_t *start;
+	uint32_t len;
 	FILE *f;
 	char tfn[128];
 
@@ -388,7 +393,7 @@
 			uofs = 0;
 			for (j = 0; j < X; j++)
 			{
-				uint32 usize;
+				uint32_t usize;
 
 				usize = start[offs+(j*4)] | start[offs+1+(j*4)]<<8 | start[offs+2+(j*4)]<<16 | start[offs+3+(j*4)]<<24;
 
@@ -423,10 +428,10 @@
 #endif
 
 // find a file on our filesystems
-uint32 psf2_load_file(char *file, uint8 *buf, uint32 buflen)
+uint32_t psf2_load_file(char *file, uint8_t *buf, uint32_t buflen)
 {
 	int i;
-	uint32 flen;
+	uint32_t flen;
 
 	for (i = 0; i < num_fs; i++)
 	{
@@ -440,12 +445,12 @@
 	return 0xffffffff;
 }
 
-int32 psf2_start(uint8 *buffer, uint32 length)
+int32_t psf2_start(uint8_t *buffer, uint32_t length)
 {
-	uint8 *file, *lib_decoded;
-	uint32 irx_len;
-	uint64 file_len, lib_raw_length, lib_len;
-	uint8 *buf;
+	uint8_t *file, *lib_decoded;
+	uint32_t irx_len;
+	uint64_t file_len, lib_raw_length, lib_len;
+	uint8_t *buf;
 	union cpuinfo mipsinfo;
 	corlett_t *lib;
 
@@ -469,13 +474,13 @@
 	#endif
 
 	num_fs = 1;
-	filesys[0] = (uint8 *)c->res_section;
+	filesys[0] = (uint8_t *)c->res_section;
 	fssize[0] = c->res_size;
 
 	// Get the library file, if any
 	if (c->lib[0] != 0)
 	{
-		uint64 tmp_length;
+		uint64_t tmp_length;
 
 		#if DEBUG_LOADER
 		printf("Loading library: %s\n", c->lib);
@@ -500,13 +505,13 @@
 		#endif
 
 		num_fs++;
-		filesys[1] = (uint8 *)lib->res_section;
+		filesys[1] = (uint8_t *)lib->res_section;
 		fssize[1] = lib->res_size;
 	}
 
 	// dump all files
 	#if 0
-	buf = (uint8 *)malloc(16*1024*1024);
+	buf = (uint8_t *)malloc(16*1024*1024);
 	dump_files(0, buf, 16*1024*1024);
 	if (c->lib[0] != 0)
 		dump_files(1, buf, 16*1024*1024);
@@ -514,7 +519,7 @@
 	#endif
 
 	// load psf2.irx, which kicks everything off
-	buf = (uint8 *)malloc(512*1024);
+	buf = (uint8_t *)malloc(512*1024);
 	irx_len = psf2_load_file("psf2.irx", buf, 512*1024);
 
 	if (irx_len != 0xffffffff)
@@ -559,7 +564,7 @@
 	mips_set_info(CPUINFO_INT_REGISTER + MIPS_R5, &mipsinfo);
 	psx_ram[1] = LE32(0x80000008);
 
-	buf = (uint8 *)&psx_ram[2];
+	buf = (uint8_t *)&psx_ram[2];
 	strcpy((char *)buf, "aofile:/");
 
 	psx_ram[0] = LE32(FUNCT_HLECALL);
@@ -574,7 +579,7 @@
 	return AO_SUCCESS;
 }
 
-int32 psf2_execute(InputPlayback *playback)
+int32_t psf2_execute(InputPlayback *playback)
 {
 	int i;
 
@@ -592,7 +597,7 @@
 	return AO_SUCCESS;
 }
 
-int32 psf2_stop(void)
+int32_t psf2_stop(void)
 {
 	SPU2close();
 	if (c->lib[0] != 0)
@@ -604,10 +609,10 @@
 	return AO_SUCCESS;
 }
 
-int32 psf2_command(int32 command, int32 parameter)
+int32_t psf2_command(int32_t command, int32_t parameter)
 {
 	union cpuinfo mipsinfo;
-	uint32 lengthMS, fadeMS;
+	uint32_t lengthMS, fadeMS;
 
 	switch (command)
 	{
@@ -656,12 +661,12 @@
 	return AO_FAIL;
 }
 
-uint32 psf2_get_loadaddr(void)
+uint32_t psf2_get_loadaddr(void)
 {
 	return loadAddr;
 }
 
-void psf2_set_loadaddr(uint32 new)
+void psf2_set_loadaddr(uint32_t new)
 {
 	loadAddr = new;
 }

audacious-plugins-3.3.4.tar.bz2/src/psf/eng_spx.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/eng_spx.c Changed

@@ -51,17 +51,17 @@
 extern int SPUclose(void);
 extern void SPUinjectRAMImage(unsigned short *source);
 
-extern void setlength(int32 stop, int32 fade);
+extern void setlength(int32_t stop, int32_t fade);
 
-static uint8 *start_of_file, *song_ptr;
-static uint32 cur_tick, cur_event, num_events, next_tick, end_tick;
+static uint8_t *start_of_file, *song_ptr;
+static uint32_t cur_tick, cur_event, num_events, next_tick, end_tick;
 static int old_fmt;
 static char name[128], song[128], company[128];
 
-int32 spx_start(uint8 *buffer, uint32 length)
+int32_t spx_start(uint8_t *buffer, uint32_t length)
 {
 	int i;
-	uint16 reg;
+	uint16_t reg;
 
 	if (strncmp((char *)buffer, "SPU", 3) && strncmp((char *)buffer, "SPX", 3))
 	{
@@ -123,12 +123,12 @@
 	return AO_SUCCESS;
 }
 
-extern int SPUasync(uint32 cycles, void *data);
+extern int SPUasync(uint32_t cycles, void *data);
 static void spx_tick(void)
 {
-	uint32 time, reg, size;
-	uint16 rdata;
-	uint8 opcode;
+	uint32_t time, reg, size;
+	uint16_t rdata;
+	uint8_t opcode;
 
 	if (old_fmt)
 	{
@@ -212,7 +212,7 @@
 	cur_tick++;
 }
 
-int32 spx_execute(InputPlayback *playback)
+int32_t spx_execute(InputPlayback *playback)
 {
 	int i, run = 1;
 
@@ -236,7 +236,7 @@
 	return AO_SUCCESS;
 }
 
-int32 spx_stop(void)
+int32_t spx_stop(void)
 {
 	SPUclose();

audacious-plugins-3.3.4.tar.bz2/src/psf/osd_cpu.h -> audacious-plugins-3.4.2.tar.bz2/src/psf/osd_cpu.h Changed

@@ -2,15 +2,7 @@
 *																			 *
 *	Define size independent data types and operations.						 *
 *																			 *
-* The following types must be supported by all platforms:					 *
-*																			 *
-*	UINT8 - Unsigned 8-bit Integer		INT8 - Signed 8-bit integer *
-*	UINT16 - Unsigned 16-bit Integer	INT16 - Signed 16-bit integer *
-*	UINT32 - Unsigned 32-bit Integer	INT32 - Signed 32-bit integer *
-*	UINT64 - Unsigned 64-bit Integer	INT64 - Signed 64-bit integer *
-*																			 *
-*																			 *
-* The macro names for the artithmatic operations are composed as follows: *
+* The macro names for the arithmetic operations are composed as follows: *
 *																			 *
 * XXX_R_A_B, where XXX - 3 letter operation code (ADD, SUB, etc.)			 *
 *					 R - The type	of the result							 *
@@ -25,14 +17,14 @@
 #ifndef OSD_CPU_H
 #define OSD_CPU_H
 
-#include "ao.h"
+#include <stdint.h>
 
 /* Combine two 32-bit integers into a 64-bit integer */
-#define COMBINE_64_32_32(A,B) ((((UINT64)(A))<<32) | (UINT32)(B))
+#define COMBINE_64_32_32(A,B) ((((uint64_t)(A))<<32) | (uint32_t)(B))
 #define COMBINE_U64_U32_U32(A,B) COMBINE_64_32_32(A,B)
 
 /* Return upper 32 bits of a 64-bit integer */
-#define HI32_32_64(A)		 (((UINT64)(A)) >> 32)
+#define HI32_32_64(A)		 (((uint64_t)(A)) >> 32)
 #define HI32_U32_U64(A)		 HI32_32_64(A)
 
 /* Return lower 32 bits of a 64-bit integer */
@@ -40,17 +32,17 @@
 #define LO32_U32_U64(A)		 LO32_32_64(A)
 
 #define DIV_64_64_32(A,B)	 ((A)/(B))
-#define DIV_U64_U64_U32(A,B) ((A)/(UINT32)(B))
+#define DIV_U64_U64_U32(A,B) ((A)/(uint32_t)(B))
 
 #define MOD_32_64_32(A,B)	 ((A)%(B))
-#define MOD_U32_U64_U32(A,B) ((A)%(UINT32)(B))
+#define MOD_U32_U64_U32(A,B) ((A)%(uint32_t)(B))
 
-#define MUL_64_32_32(A,B)	 ((A)*(INT64)(B))
-#define MUL_U64_U32_U32(A,B) ((A)*(UINT64)(UINT32)(B))
+#define MUL_64_32_32(A,B)	 ((A)*(int64_t)(B))
+#define MUL_U64_U32_U32(A,B) ((A)*(uint64_t)(uint32_t)(B))
 
 
 /******************************************************************************
- * Union of UINT8, UINT16 and UINT32 in native endianess of the target
+ * Union of uint8_t, uint16_t and uint32_t in native endianess of the target
 * This is used to access bytes and words in a machine independent manner.
 * The upper bytes h2 and h3 normally contain zero (16 bit CPU cores)
 * thus PAIR.d can be used to pass arguments to the memory system
@@ -58,13 +50,13 @@
 ******************************************************************************/
 typedef union {
 #if LSB_FIRST
-	struct { UINT8 l,h,h2,h3; } b;
-	struct { UINT16 l,h; } w;
+	struct { uint8_t l,h,h2,h3; } b;
+	struct { uint16_t l,h; } w;
 #else
-	struct { UINT8 h3,h2,h,l; } b;
-	struct { UINT16 h,l; } w;
+	struct { uint8_t h3,h2,h,l; } b;
+	struct { uint16_t h,l; } w;
 #endif
-	UINT32 d;
+	uint32_t d;
 }	PAIR;
 
 #endif	/* defined OSD_CPU_H */

audacious-plugins-3.3.4.tar.bz2/src/psf/peops/adsr.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/peops/adsr.c Changed

@@ -61,7 +61,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-static INLINE void StartADSR(int ch) // MIX ADSR
+static inline void StartADSR(int ch) // MIX ADSR
 {
 s_chan[ch].ADSRX.lVolume=1; // and init some adsr vars
 s_chan[ch].ADSRX.State=0;
@@ -70,8 +70,8 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-static INLINE int MixADSR(int ch) // MIX ADSR
-{ 
+static inline int MixADSR(int ch) // MIX ADSR
+{
 static const int sexytable[8]=
 	{0,4,6,8,9,10,11,12};
 
@@ -86,7 +86,7 @@
 s_chan[ch].ADSRX.EnvelopeVol-=RateTable[(4*(s_chan[ch].ADSRX.ReleaseRate^0x1F))-0x0C + 32];
 }
 
- if(s_chan[ch].ADSRX.EnvelopeVol<0) 
+ if(s_chan[ch].ADSRX.EnvelopeVol<0)
 {
 s_chan[ch].ADSRX.EnvelopeVol=0;
 s_chan[ch].bOn=0;
@@ -102,7 +102,7 @@
 {
 if(s_chan[ch].ADSRX.AttackModeExp)
 {
- if(s_chan[ch].ADSRX.EnvelopeVol<0x60000000) 
+ if(s_chan[ch].ADSRX.EnvelopeVol<0x60000000)
 s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.AttackRate^0x7F)-0x10 + 32];
 else
 s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.AttackRate^0x7F)-0x18 + 32];
@@ -112,7 +112,7 @@
 s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.AttackRate^0x7F)-0x10 + 32];
 }
 
- if(s_chan[ch].ADSRX.EnvelopeVol<0) 
+ if(s_chan[ch].ADSRX.EnvelopeVol<0)
 {
 s_chan[ch].ADSRX.EnvelopeVol=0x7FFFFFFF;
 s_chan[ch].ADSRX.State=1;
@@ -142,7 +142,7 @@
 {
 if(s_chan[ch].ADSRX.SustainModeExp)
 {
- if(s_chan[ch].ADSRX.EnvelopeVol<0x60000000) 
+ if(s_chan[ch].ADSRX.EnvelopeVol<0x60000000)
 s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.SustainRate^0x7F)-0x10 + 32];
 else
 s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.SustainRate^0x7F)-0x18 + 32];
@@ -152,7 +152,7 @@
 s_chan[ch].ADSRX.EnvelopeVol+=RateTable[(s_chan[ch].ADSRX.SustainRate^0x7F)-0x10 + 32];
 }
 
- if(s_chan[ch].ADSRX.EnvelopeVol<0) 
+ if(s_chan[ch].ADSRX.EnvelopeVol<0)
 {
 s_chan[ch].ADSRX.EnvelopeVol=0x7FFFFFFF;
 }
@@ -164,7 +164,7 @@
 else
 s_chan[ch].ADSRX.EnvelopeVol-=RateTable[((s_chan[ch].ADSRX.SustainRate^0x7F))-0x0F + 32];
 
- if(s_chan[ch].ADSRX.EnvelopeVol<0) 
+ if(s_chan[ch].ADSRX.EnvelopeVol<0)
 {
 s_chan[ch].ADSRX.EnvelopeVol=0;
 }
@@ -185,7 +185,7 @@
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
 First, here is an extract from doomed's SPU doc, which explains the basics
-of the SPU "volume envelope": 
+of the SPU "volume envelope":
 
 *** doomed doc extract start ***
 
@@ -259,7 +259,7 @@
 read.
 -- James' Note: return range: 0 -> 32767
 
-*** doomed doc extract end *** 
+*** doomed doc extract end ***
 
 By using a small PSX proggie to visualise the envelope as it was played,
 the following results for envelope timing were obtained:
@@ -315,7 +315,7 @@
 Substituting, we get: k = 0.00146
 
 Further info on logarithmic nature:
- frames to decay to sustain level 3 = 3 * frames to decay to 
+ frames to decay to sustain level 3 = 3 * frames to decay to
 sustain level 9
 
 Also no. of frames to 25% volume = roughly 1.85 * no. of frames to
@@ -377,7 +377,7 @@
 ------------------------------------
 
 
-Other notes: 
+Other notes:
 
 Log stuff not figured out. You may get some clues from the "Decay rate"
 stuff above. For emu purposes it may not be important - use linear
@@ -415,7 +415,7 @@
 lT=s_chan[ch].ADSR.lTime- // -> how much time is past?
 s_chan[ch].ADSR.ReleaseStartTime;
 l1=s_chan[ch].ADSR.ReleaseTime;
- 
+
 if(lT<l1) // -> we still have to release
 {
 v=v-((v*lT)/l1); // --> calc new volume
@@ -428,12 +428,12 @@
 v=0;s_chan[ch].bOn=0;s_chan[ch].ADSR.ReleaseVol=0;s_chan[ch].bNoise=0;
 }
 }
- else 
+ else
 {//--------------------------------------------------// not in release phase:
 v=1024;
 lT=s_chan[ch].ADSR.lTime;
 l1=s_chan[ch].ADSR.AttackTime;
- 
+
 if(lT<l1) // attack
 { // no exp mode used (yet)
 // if(s_chan[ch].ADSR.AttackModeExp)
@@ -479,13 +479,13 @@
 }
 }
 
- //----------------------------------------------------// 
+ //----------------------------------------------------//
 // ok, done for this channel, so increase time
 
- s_chan[ch].ADSR.lTime+=1; // 1 = 1.020408f ms; 
+ s_chan[ch].ADSR.lTime+=1; // 1 = 1.020408f ms;
 
 if(v>1024) v=1024; // adjust volume
- if(v<0) v=0; 
+ if(v<0) v=0;
 s_chan[ch].ADSR.lVolume=v; // store act volume
 
 return v; // return the volume factor

audacious-plugins-3.3.4.tar.bz2/src/psf/peops/adsr.h -> audacious-plugins-3.4.2.tar.bz2/src/psf/peops/adsr.h Changed

audacious-plugins-3.3.4.tar.bz2/src/psf/peops/dma.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/peops/dma.c Changed

audacious-plugins-3.3.4.tar.bz2/src/psf/peops/externals.h -> audacious-plugins-3.4.2.tar.bz2/src/psf/peops/externals.h Changed

audacious-plugins-3.3.4.tar.bz2/src/psf/peops/reverb.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/peops/reverb.c Changed

@@ -51,7 +51,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-static INLINE s64 g_buffer(int iOff) // get_buffer content helper: takes care about wraps
+static inline s64 g_buffer(int iOff) // get_buffer content helper: takes care about wraps
 {
 s16 * p=(s16 *)spuMem;
 iOff=(iOff*4)+rvb.CurrAddr;
@@ -62,7 +62,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-static INLINE void s_buffer(int iOff,int iVal) // set_buffer content helper: takes care about wraps and clipping
+static inline void s_buffer(int iOff,int iVal) // set_buffer content helper: takes care about wraps and clipping
 {
 s16 * p=(s16 *)spuMem;
 iOff=(iOff*4)+rvb.CurrAddr;
@@ -75,7 +75,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-static INLINE void s_buffer1(int iOff,int iVal) // set_buffer (+1 sample) content helper: takes care about wraps and clipping
+static inline void s_buffer1(int iOff,int iVal) // set_buffer (+1 sample) content helper: takes care about wraps and clipping
 {
 s16 * p=(s16 *)spuMem;
 iOff=(iOff*4)+rvb.CurrAddr+1;
@@ -85,7 +85,7 @@
 *(p+iOff)=(s16)BFLIP16((s16)iVal);
 }
 
-static INLINE void MixREVERBLeftRight(s32 *oleft, s32 *oright, s32 inleft, s32 inright)
+static inline void MixREVERBLeftRight(s32 *oleft, s32 *oright, s32 inleft, s32 inright)
 {
 static s32 downbuf[2][8];
 static s32 upbuf[2][8];
@@ -113,7 +113,7 @@
 if(spuCtrl&0x80) // -> reverb on? oki
 {
 int ACC0,ACC1,FB_A0,FB_A1,FB_B0,FB_B1;
- s32 INPUT_SAMPLE_L=0; 
+ s32 INPUT_SAMPLE_L=0;
 s32 INPUT_SAMPLE_R=0;
 
 for(x=0;x<8;x++)
@@ -140,7 +140,7 @@
 s_buffer1(rvb.IIR_DEST_A1, IIR_A1);
 s_buffer1(rvb.IIR_DEST_B0, IIR_B0);
 s_buffer1(rvb.IIR_DEST_B1, IIR_B1);
- 
+
 ACC0 = ((g_buffer(rvb.ACC_SRC_A0) * rvb.ACC_COEF_A)>>15) +
 ((g_buffer(rvb.ACC_SRC_B0) * rvb.ACC_COEF_B)>>15) +
 ((g_buffer(rvb.ACC_SRC_C0) * rvb.ACC_COEF_C)>>15) +
@@ -157,10 +157,10 @@
 
 s_buffer(rvb.MIX_DEST_A0, ACC0 - ((FB_A0 * rvb.FB_ALPHA)>>15));
 s_buffer(rvb.MIX_DEST_A1, ACC1 - ((FB_A1 * rvb.FB_ALPHA)>>15));
- 
+
 s_buffer(rvb.MIX_DEST_B0, ((rvb.FB_ALPHA * ACC0)>>15) - ((FB_A0 * (int)(rvb.FB_ALPHA^0xFFFF8000))>>15) - ((FB_B0 * rvb.FB_X)>>15));
 s_buffer(rvb.MIX_DEST_B1, ((rvb.FB_ALPHA * ACC1)>>15) - ((FB_A1 * (int)(rvb.FB_ALPHA^0xFFFF8000))>>15) - ((FB_B1 * rvb.FB_X)>>15));
- 
+
 rvb.iRVBLeft = (g_buffer(rvb.MIX_DEST_A0)+g_buffer(rvb.MIX_DEST_B0))/3;
 rvb.iRVBRight = (g_buffer(rvb.MIX_DEST_A1)+g_buffer(rvb.MIX_DEST_B1))/3;

audacious-plugins-3.3.4.tar.bz2/src/psf/peops/spu.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/peops/spu.c Changed

@@ -5,7 +5,7 @@
 copyright : (C) 2002 by Pete Bernert
 email : BlackDove@addcom.de
 ***************************************************************************/
- 
+
 /***************************************************************************
 * *
 * This program is free software; you can redistribute it and/or modify *
@@ -15,7 +15,7 @@
 * additional informations. *
 * *
 ***************************************************************************/
- 
+
 //*************************************************************************//
 // History of changes:
 //
@@ -107,9 +107,9 @@
 static u8 * pSpuIrq=0;
 static u8 * pSpuBuffer;
 
-// user settings 
+// user settings
 static int iVolume;
- 
+
 // MAIN infos struct for each channel
 
 static SPUCHAN s_chan[MAXCHAN+1]; // channel + 1 infos (1 is security for fmod handling)
@@ -119,11 +119,11 @@
 
 static u16 spuCtrl=0; // some vars to store psx reg infos
 static u16 spuStat=0;
-static u16 spuIrq=0; 
+static u16 spuIrq=0;
 static u32 spuAddr=0xffffffff; // address into spu mem
 static int bSPUIsOpen=0;
 
-static const int f[5][2] = { 
+static const int f[5][2] = {
 			{ 0, 0 },
 { 60, 0 },
 { 115, -52 },
@@ -140,7 +140,7 @@
 
 // dirty inline func includes
 
-#include "../peops/reverb.c" 
+#include "../peops/reverb.c"
 #include "../peops/adsr.c"
 
 // Try this to increase speed.
@@ -161,18 +161,18 @@
 // START SOUND... called by main thread to setup a new sound on a channel
 ////////////////////////////////////////////////////////////////////////
 
-static INLINE void StartSound(int ch)
+static inline void StartSound(int ch)
 {
 StartADSR(ch);
 
 s_chan[ch].pCurr=s_chan[ch].pStart; // set sample start
- 
+
 s_chan[ch].s_1=0; // init mixing vars
 s_chan[ch].s_2=0;
 s_chan[ch].iSBPos=28;
 
 s_chan[ch].bNew=0; // init channel flags
- s_chan[ch].bStop=0; 
+ s_chan[ch].bStop=0;
 s_chan[ch].bOn=1;
 
 s_chan[ch].SB[29]=0; // init our interpolation helpers
@@ -237,7 +237,7 @@
 
 temp--;
 //--------------------------------------------------//
- //- main channel loop -// 
+ //- main channel loop -//
 //--------------------------------------------------//
 {
 for(ch=0;ch<MAXCHAN;ch++) // loop em all.
@@ -278,14 +278,14 @@
 s_1=s_chan[ch].s_1;
 s_2=s_chan[ch].s_2;
 
- predict_nr=(int)*start;start++; 
+ predict_nr=(int)*start;start++;
 shift_factor=predict_nr&0xf;
 predict_nr >>= 4;
 flags=(int)*start;start++;
 
- // -------------------------------------- // 
+ // -------------------------------------- //
 	 // Decode new samples into s_chan[ch].SB[0 through 27]
- for (nSample=0;nSample<28;start++) 
+ for (nSample=0;nSample<28;start++)
 {
 d=(int)*start;
 s=((d&0xf)<<12);
@@ -299,12 +299,12 @@
 s_chan[ch].SB[nSample++]=fa;
 
 if(s&0x8000) s|=0xffff0000;
- fa=(s>>shift_factor); 
+ fa=(s>>shift_factor);
 fa=fa + ((s_1 * f[predict_nr][0])>>6) + ((s_2 * f[predict_nr][1])>>6);
 s_2=s_1;s_1=fa;
 
 s_chan[ch].SB[nSample++]=fa;
- } 
+ }
 
 //////////////////////////////////////////// irq check
 
@@ -312,8 +312,8 @@
 {
 if((pSpuIrq > start-16 && // irq address reached?
 pSpuIrq <= start) ||
- ((flags&1) && // special: irq on looping addr, when stop/loop flag is set 
- (pSpuIrq > s_chan[ch].pLoop-16 && 
+ ((flags&1) && // special: irq on looping addr, when stop/loop flag is set
+ (pSpuIrq > s_chan[ch].pLoop-16 &&
 pSpuIrq <= s_chan[ch].pLoop)))
 {
 		 //extern s32 spuirqvoodoo;
@@ -327,7 +327,7 @@
 		 //}
 }
 }
- 
+
 //////////////////////////////////////////// flag handler
 
 if((flags&4) && (!s_chan[ch].bIgnoreLoop))
@@ -349,7 +349,7 @@
 
 s_chan[ch].pCurr=start; // store values for next cycle
 s_chan[ch].s_1=s_1;
- s_chan[ch].s_2=s_2; 
+ s_chan[ch].s_2=s_2;
 
 ////////////////////////////////////////////
 }
@@ -388,11 +388,11 @@
 // mmm... depending on the noise freq we allow bigger/smaller changes to the previous val
 fa=s_chan[ch].iOldNoise+((fa-s_chan[ch].iOldNoise)/((0x001f-((spuCtrl&0x3f00)>>9))+1));
 if(fa>32767L) fa=32767L;
- if(fa<-32767L) fa=-32767L; 
+ if(fa<-32767L) fa=-32767L;
 s_chan[ch].iOldNoise=fa;
 
 } //----------------------------------------
- else // NO NOISE (NORMAL SAMPLE DATA) HERE 
+ else // NO NOISE (NORMAL SAMPLE DATA) HERE
 {
 int vl, vr, gpos;
 vl = (s_chan[ch].spos >> 6) & ~3;
@@ -412,8 +412,8 @@
 
 if(NP>0x3fff) NP=0x3fff;
 if(NP<0x1) NP=0x1;
- 
-	 // mmmm... if I do this, all is screwed 
+
+	 // mmmm... if I do this, all is screwed
 	 // s_chan[ch+1].iRawPitch=NP;
 
 NP=(44100L*NP)/(4096L); // calc frequency
@@ -426,9 +426,9 @@
 		// mmmm... set up freq decoding positions?
 		// s_chan[ch+1].iSBPos=28;
 		// s_chan[ch+1].spos=0x10000L;
- } 
+ }
 else
- { 
+ {
 //////////////////////////////////////////////
 // ok, left/right sound volume (psx volume goes from 0 ... 0x3fff)
 	 int tmpl,tmpr;
@@ -451,10 +451,10 @@
 	 }
 }
 
- s_chan[ch].spos += s_chan[ch].sinc; 
- ENDX: ; 
+ s_chan[ch].spos += s_chan[ch].sinc;
+ ENDX: ;
 }
- } 
+ }
 
 ///////////////////////////////////////////////////////
 // mix all channels (including reverb) into one buffer
@@ -466,7 +466,7 @@
 if(decaybegin!=~0) // Is anyone REALLY going to be playing a song
 		 // for 13 hours?
 {
- if(sampcount>=decayend) 
+ if(sampcount>=decayend)
 {
 	 psf2_update(NULL, 0, data);
 	 return(0);
@@ -484,7 +484,7 @@
 //{
 // static double asl=0;
 // static double asr=0;
- 
+
 // asl+=(sl-asl)/5;
 // asr+=(sl-asr)/5;
 
@@ -552,7 +552,7 @@
 ////////////////////////////////////////////////////////////////////////
 // SPUINIT: this func will be called first by the main emu
 ////////////////////////////////////////////////////////////////////////
- 
+
 int SPUinit(void)
 {
 spuMemC=(u8*)spuMem; // just small setup
@@ -573,7 +573,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 void SetupStreams(void)
-{ 
+{
 int i;
 
 pSpuBuffer=(u8*)malloc(32768); // alloc mixing buffer
@@ -594,7 +594,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 void RemoveStreams(void)
-{ 
+{
 free(pSpuBuffer); // free mixing buffer
 pSpuBuffer=NULL;
 
@@ -614,17 +614,17 @@
 ////////////////////////////////////////////////////////////////////////
 // SPUOPEN: called by main emu after init
 ////////////////////////////////////////////////////////////////////////
- 
+
 int SPUopen(void)
 {
 if(bSPUIsOpen) return 0; // security for some stupid main emus
- spuIrq=0; 
+ spuIrq=0;
 
 spuStat=spuCtrl=0;
 spuAddr=0xffffffff;
 dwNoiseVal=1;
 
- spuMemC=(u8*)spuMem; 
+ spuMemC=(u8*)spuMem;
 memset((void *)s_chan,0,(MAXCHAN+1)*sizeof(SPUCHAN));
 pSpuIrq=0;

audacious-plugins-3.3.4.tar.bz2/src/psf/peops2/dma.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/peops2/dma.c Changed

@@ -35,7 +35,7 @@
 #include "../peops2/registers.h"
 //#include "debug.h"
 
-extern uint32 psx_ram[(2*1024*1024)/4];
+extern uint32_t psx_ram[(2*1024*1024)/4];
 
 ////////////////////////////////////////////////////////////////////////
 // READ DMA (many values)
@@ -55,7 +55,7 @@
   }
 
  spuAddr2[0]+=0x20; //?????
- 
+
 
  iSpuAsyncWait=0;
 
@@ -110,7 +110,7 @@
    spuAddr2[0]++;                                      // inc spu addr
    if(spuAddr2[0]>0xfffff) spuAddr2[0]=0;              // wrap
   }
- 
+
  iSpuAsyncWait=0;
 
  // got from J.F. and Kanodin... is it needed?
@@ -128,7 +128,7 @@
    spuAddr2[1]++;                                      // inc spu addr
    if(spuAddr2[1]>0xfffff) spuAddr2[1]=0;              // wrap
   }
- 
+
  iSpuAsyncWait=0;
 
  // got from J.F. and Kanodin... is it needed?
@@ -139,7 +139,7 @@
 // INTERRUPTS
 ////////////////////////////////////////////////////////////////////////
 
-void InterruptDMA4(void) 
+void InterruptDMA4(void)
 {
 // taken from linuzappz NULL spu2
 //	spu2Rs16(CORE0_ATTR)&= ~0x30;
@@ -150,13 +150,13 @@
  regArea[(PS2_C0_ADMAS)>>1]=0;
  spuStat2[0]|=0x80;
 }
-                       
-EXPORT_GCC void CALLBACK SPU2interruptDMA4(void) 
+
+EXPORT_GCC void CALLBACK SPU2interruptDMA4(void)
 {
  InterruptDMA4();
 }
 
-void InterruptDMA7(void) 
+void InterruptDMA7(void)
 {
 // taken from linuzappz NULL spu2
 //	spu2Rs16(CORE1_ATTR)&= ~0x30;
@@ -168,7 +168,7 @@
  spuStat2[1]|=0x80;
 }
 
-EXPORT_GCC void CALLBACK SPU2interruptDMA7(void) 
+EXPORT_GCC void CALLBACK SPU2interruptDMA7(void)
 {
  InterruptDMA7();
 }

audacious-plugins-3.3.4.tar.bz2/src/psf/peops2/externals.h -> audacious-plugins-3.4.2.tar.bz2/src/psf/peops2/externals.h Changed

@@ -35,23 +35,23 @@
 
 #include "ao.h"
 
-typedef int8 s8;
-typedef int16 s16;
-typedef int32 s32;
-typedef int64 s64;
+typedef int8_t s8;
+typedef int16_t s16;
+typedef int32_t s32;
+typedef int64_t s64;
 
-typedef uint8 u8;
-typedef uint16 u16;
-typedef uint32 u32;
-typedef uint64 u64;
+typedef uint8_t u8;
+typedef uint16_t u16;
+typedef uint32_t u32;
+typedef uint64_t u64;
 
 #if LSB_FIRST
-static INLINE u16 BFLIP16(u16 x)
+static inline u16 BFLIP16(u16 x)
 {
 return x;
 }
 #else
-static INLINE u16 BFLIP16(u16 x)
+static inline u16 BFLIP16(u16 x)
 {
 return( ((x>>8)&0xFF)| ((x&0xFF)<<8) );
 }
@@ -73,16 +73,16 @@
 
 // sound buffer sizes
 // 400 ms complete sound buffer
-#define SOUNDSIZE 76800
+#define SOUNDSIZE 76800
 // 137 ms test buffer... if less than that is buffered, a new upload will happen
-#define TESTSIZE 26304
+#define TESTSIZE 26304
 
 // num of channels
 #define MAXCHAN 48
 #define HLFCHAN 24
 
 // ~ 1 ms of data (was 45)
-#define NSSIZE 	1
+#define NSSIZE 	1
 //45
 
 ///////////////////////////////////////////////////////////
@@ -377,4 +377,4 @@
 
 #endif
 
-#endif // PEOPS2_EXTERNALS
+#endif // PEOPS2_EXTERNALS

audacious-plugins-3.3.4.tar.bz2/src/psf/peops2/registers.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/peops2/registers.c Changed

audacious-plugins-3.3.4.tar.bz2/src/psf/peops2/spu.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/peops2/spu.c Changed

audacious-plugins-3.3.4.tar.bz2/src/psf/peops2/xa.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/peops2/xa.c Changed

audacious-plugins-3.3.4.tar.bz2/src/psf/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/plugin.c Changed

@@ -35,7 +35,6 @@
 #include <audacious/plugin.h>
 
 #include "ao.h"
-#include "config.h"
 #include "corlett.h"
 #include "eng_protos.h"
 
@@ -48,10 +47,10 @@
 } PSFEngine;
 
 typedef struct {
- int32 (*start)(uint8 *buffer, uint32 length);
- int32 (*stop)(void);
- int32 (*seek)(uint32);
- int32 (*execute)(InputPlayback *data);
+ int32_t (*start)(uint8_t *buffer, uint32_t length);
+ int32_t (*stop)(void);
+ int32_t (*seek)(uint32_t);
+ int32_t (*execute)(InputPlayback *data);
 } PSFEngineFunctors;
 
 static PSFEngineFunctors psf_functor_map[ENG_COUNT] = {
@@ -61,7 +60,7 @@
 {spx_start, spx_stop, psf_seek, spx_execute},
 };
 
-static PSFEngine psf_probe(uint8 *buffer)
+static PSFEngine psf_probe(uint8_t *buffer)
 {
 	if (!memcmp(buffer, "PSF\x01", 4))
 		return ENG_PSF1;
@@ -79,19 +78,18 @@
 }
 
 /* ao_get_lib: called to load secondary files */
-static char *path;
+static const char *dirpath;
 
-int ao_get_lib(char *filename, uint8 **buffer, uint64 *length)
+int ao_get_lib(char *filename, uint8_t **buffer, uint64_t *length)
 {
 	void *filebuf;
 	int64_t size;
 
-	char *dirpath = dirname(path);
 	SPRINTF(path2, "%s/%s", dirpath, filename);
 	vfs_file_get_contents(path2, &filebuf, &size);
 
 	*buffer = filebuf;
-	*length = (uint64)size;
+	*length = (uint64_t)size;
 
 	return AO_SUCCESS;
 }
@@ -141,7 +139,10 @@
 	PSFEngineFunctors *f;
 	bool_t error = FALSE;
 
-	path = strdup(filename);
+	char dirbuf[strlen (filename) + 1];
+	strcpy (dirbuf, filename);
+	dirpath = dirname (dirbuf);
+
 	vfs_file_get_contents (filename, & buffer, & size);
 
 	eng = psf_probe(buffer);
@@ -193,8 +194,8 @@
 	stop_flag = TRUE;
 	pthread_mutex_unlock (& mutex);
 
+	dirpath = NULL;
 	free(buffer);
-	free(path);
 
 	return ! error;
 }
@@ -244,7 +245,7 @@
 
 int psf2_is_our_fd(const char *filename, VFSFile *file)
 {
-	uint8 magic[4];
+	uint8_t magic[4];
 	if (vfs_fread(magic, 1, 4, file) < 4)
 		return FALSE;

audacious-plugins-3.3.4.tar.bz2/src/psf/psx.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/psx.c Changed

@@ -61,16 +61,16 @@
 #define CAUSE_CE2 ( 2L << 28 )
 #define CAUSE_BD ( 1L << 31 )
 
-extern void psx_bios_hle(uint32 pc);
-extern void psx_iop_call(uint32 pc, uint32 callnum);
-extern uint8 program_read_byte_32le(offs_t address);
-extern uint16 program_read_word_32le(offs_t address);
-extern uint32 program_read_dword_32le(offs_t address);
-extern void program_write_byte_32le(offs_t address, uint8 data);
-extern void program_write_word_32le(offs_t address, uint16 data);
-extern void program_write_dword_32le(offs_t address, uint32 data);
+extern void psx_bios_hle(uint32_t pc);
+extern void psx_iop_call(uint32_t pc, uint32_t callnum);
+extern uint8_t program_read_byte_32le(offs_t address);
+extern uint16_t program_read_word_32le(offs_t address);
+extern uint32_t program_read_dword_32le(offs_t address);
+extern void program_write_byte_32le(offs_t address, uint8_t data);
+extern void program_write_word_32le(offs_t address, uint16_t data);
+extern void program_write_dword_32le(offs_t address, uint32_t data);
 
-static UINT8 mips_reg_layout[] =
+static uint8_t mips_reg_layout[] =
 {
 	MIPS_PC, -1,
 	MIPS_DELAYV, MIPS_DELAYR, -1,
@@ -146,7 +146,7 @@
 	0
 };
 
-static UINT8 mips_win_layout[] = {
+static uint8_t mips_win_layout[] = {
 	45, 0,35,13,	/* register window (top right) */
 	 0, 0,44,13,	/* disassembler window (left, upper) */
 	 0,14,44, 8,	/* memory #1 window (left, middle) */
@@ -158,15 +158,15 @@
 
 typedef struct
 {
-	UINT32 op;
-	UINT32 pc;
-	UINT32 prevpc;
-	UINT32 delayv;
-	UINT32 delayr;
-	UINT32 hi;
-	UINT32 lo;
-	UINT32 r[ 32 ];
-	UINT32 cp0r[ 32 ];
+	uint32_t op;
+	uint32_t pc;
+	uint32_t prevpc;
+	uint32_t delayv;
+	uint32_t delayr;
+	uint32_t hi;
+	uint32_t lo;
+	uint32_t r[ 32 ];
+	uint32_t cp0r[ 32 ];
 	PAIR cp2cr[ 32 ];
 	PAIR cp2dr[ 32 ];
 	int (*irq_callback)(int irqline);
@@ -176,7 +176,7 @@
 
 static int mips_ICount = 0;
 
-static UINT32 mips_mtc0_writemask[]=
+static uint32_t mips_mtc0_writemask[]=
 {
 	0xffffffff, /* INDEX */
 	0x00000000, /* RANDOM */
@@ -226,10 +226,10 @@
 static inline void GTELOG(const char *a, ...) {}
 #endif
 
-static UINT32 getcp2dr( int n_reg );
-static void setcp2dr( int n_reg, UINT32 n_value );
-static UINT32 getcp2cr( int n_reg );
-static void setcp2cr( int n_reg, UINT32 n_value );
+static uint32_t getcp2dr( int n_reg );
+static void setcp2dr( int n_reg, uint32_t n_value );
+static uint32_t getcp2cr( int n_reg );
+static void setcp2cr( int n_reg, uint32_t n_value );
 static void docop2( int gteop );
 static void mips_exception( int exception );
 
@@ -242,7 +242,7 @@
 #endif
 }
 
-static inline void mips_set_cp0r( int reg, UINT32 value )
+static inline void mips_set_cp0r( int reg, uint32_t value )
 {
 	mipscpu.cp0r[ reg ] = value;
 	if( reg == CP0_SR || reg == CP0_CAUSE )
@@ -269,7 +269,7 @@
 	}
 }
 
-static inline void mips_delayed_branch( UINT32 n_adr )
+static inline void mips_delayed_branch( uint32_t n_adr )
 {
 	if( ( n_adr & ( ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
 	{
@@ -306,7 +306,7 @@
 	}
 }
 
-static inline void mips_load( UINT32 n_r, UINT32 n_v )
+static inline void mips_load( uint32_t n_r, uint32_t n_v )
 {
 	mips_advance_pc();
 	if( n_r != 0 )
@@ -315,7 +315,7 @@
 	}
 }
 
-static inline void mips_delayed_load( UINT32 n_r, UINT32 n_v )
+static inline void mips_delayed_load( uint32_t n_r, uint32_t n_v )
 {
 	if( mipscpu.delayr == REGPC )
 	{
@@ -400,7 +400,7 @@
 
 int mips_execute( int cycles )
 {
-	UINT32 n_res;
+	uint32_t n_res;
 
 	mips_ICount = cycles;
 	do
@@ -450,7 +450,7 @@
 				mips_load( INS_RD( mipscpu.op ), mipscpu.r[ INS_RT( mipscpu.op ) ] >> INS_SHAMT( mipscpu.op ) );
 				break;
 			case FUNCT_SRA:
-				mips_load( INS_RD( mipscpu.op ), (INT32)mipscpu.r[ INS_RT( mipscpu.op ) ] >> INS_SHAMT( mipscpu.op ) );
+				mips_load( INS_RD( mipscpu.op ), (int32_t)mipscpu.r[ INS_RT( mipscpu.op ) ] >> INS_SHAMT( mipscpu.op ) );
 				break;
 			case FUNCT_SLLV:
 				mips_load( INS_RD( mipscpu.op ), mipscpu.r[ INS_RT( mipscpu.op ) ] << ( mipscpu.r[ INS_RS( mipscpu.op ) ] & 31 ) );
@@ -459,7 +459,7 @@
 				mips_load( INS_RD( mipscpu.op ), mipscpu.r[ INS_RT( mipscpu.op ) ] >> ( mipscpu.r[ INS_RS( mipscpu.op ) ] & 31 ) );
 				break;
 			case FUNCT_SRAV:
-				mips_load( INS_RD( mipscpu.op ), (INT32)mipscpu.r[ INS_RT( mipscpu.op ) ] >> ( mipscpu.r[ INS_RS( mipscpu.op ) ] & 31 ) );
+				mips_load( INS_RD( mipscpu.op ), (int32_t)mipscpu.r[ INS_RT( mipscpu.op ) ] >> ( mipscpu.r[ INS_RS( mipscpu.op ) ] & 31 ) );
 				break;
 			case FUNCT_JR:
 				if( INS_RD( mipscpu.op ) != 0 )
@@ -523,8 +523,8 @@
 				}
 				else
 				{
-					INT64 n_res64;
-					n_res64 = MUL_64_32_32( (INT32)mipscpu.r[ INS_RS( mipscpu.op ) ], (INT32)mipscpu.r[ INS_RT( mipscpu.op ) ] );
+					int64_t n_res64;
+					n_res64 = MUL_64_32_32( (int32_t)mipscpu.r[ INS_RS( mipscpu.op ) ], (int32_t)mipscpu.r[ INS_RT( mipscpu.op ) ] );
 					mips_advance_pc();
 					mipscpu.lo = LO32_32_64( n_res64 );
 					mipscpu.hi = HI32_32_64( n_res64 );
@@ -537,7 +537,7 @@
 				}
 				else
 				{
-					UINT64 n_res64;
+					uint64_t n_res64;
 					n_res64 = MUL_U64_U32_U32( mipscpu.r[ INS_RS( mipscpu.op ) ], mipscpu.r[ INS_RT( mipscpu.op ) ] );
 					mips_advance_pc();
 					mipscpu.lo = LO32_U32_U64( n_res64 );
@@ -551,12 +551,12 @@
 				}
 				else
 				{
-					UINT32 n_div;
-					UINT32 n_mod;
+					uint32_t n_div;
+					uint32_t n_mod;
 					if( mipscpu.r[ INS_RT( mipscpu.op ) ] != 0 )
 					{
-						n_div = (INT32)mipscpu.r[ INS_RS( mipscpu.op ) ] / (INT32)mipscpu.r[ INS_RT( mipscpu.op ) ];
-						n_mod = (INT32)mipscpu.r[ INS_RS( mipscpu.op ) ] % (INT32)mipscpu.r[ INS_RT( mipscpu.op ) ];
+						n_div = (int32_t)mipscpu.r[ INS_RS( mipscpu.op ) ] / (int32_t)mipscpu.r[ INS_RT( mipscpu.op ) ];
+						n_mod = (int32_t)mipscpu.r[ INS_RS( mipscpu.op ) ] % (int32_t)mipscpu.r[ INS_RT( mipscpu.op ) ];
 						mips_advance_pc();
 						mipscpu.lo = n_div;
 						mipscpu.hi = n_mod;
@@ -574,8 +574,8 @@
 				}
 				else
 				{
-					UINT32 n_div;
-					UINT32 n_mod;
+					uint32_t n_div;
+					uint32_t n_mod;
 					if( mipscpu.r[ INS_RT( mipscpu.op ) ] != 0 )
 					{
 						n_div = mipscpu.r[ INS_RS( mipscpu.op ) ] / mipscpu.r[ INS_RT( mipscpu.op ) ];
@@ -593,7 +593,7 @@
 			case FUNCT_ADD:
 				{
 					n_res = mipscpu.r[ INS_RS( mipscpu.op ) ] + mipscpu.r[ INS_RT( mipscpu.op ) ];
-					if( (INT32)( ~( mipscpu.r[ INS_RS( mipscpu.op ) ] ^ mipscpu.r[ INS_RT( mipscpu.op ) ] ) & ( mipscpu.r[ INS_RS( mipscpu.op ) ] ^ n_res ) ) < 0 )
+					if( (int32_t)( ~( mipscpu.r[ INS_RS( mipscpu.op ) ] ^ mipscpu.r[ INS_RT( mipscpu.op ) ] ) & ( mipscpu.r[ INS_RS( mipscpu.op ) ] ^ n_res ) ) < 0 )
 					{
 						mips_exception( EXC_OVF );
 					}
@@ -608,7 +608,7 @@
 				break;
 			case FUNCT_SUB:
 				n_res = mipscpu.r[ INS_RS( mipscpu.op ) ] - mipscpu.r[ INS_RT( mipscpu.op ) ];
-				if( (INT32)( ( mipscpu.r[ INS_RS( mipscpu.op ) ] ^ mipscpu.r[ INS_RT( mipscpu.op ) ] ) & ( mipscpu.r[ INS_RS( mipscpu.op ) ] ^ n_res ) ) < 0 )
+				if( (int32_t)( ( mipscpu.r[ INS_RS( mipscpu.op ) ] ^ mipscpu.r[ INS_RT( mipscpu.op ) ] ) & ( mipscpu.r[ INS_RS( mipscpu.op ) ] ^ n_res ) ) < 0 )
 				{
 					mips_exception( EXC_OVF );
 				}
@@ -633,7 +633,7 @@
 				mips_load( INS_RD( mipscpu.op ), ~( mipscpu.r[ INS_RS( mipscpu.op ) ] | mipscpu.r[ INS_RT( mipscpu.op ) ] ) );
 				break;
 			case FUNCT_SLT:
-				mips_load( INS_RD( mipscpu.op ), (INT32)mipscpu.r[ INS_RS( mipscpu.op ) ] < (INT32)mipscpu.r[ INS_RT( mipscpu.op ) ] );
+				mips_load( INS_RD( mipscpu.op ), (int32_t)mipscpu.r[ INS_RS( mipscpu.op ) ] < (int32_t)mipscpu.r[ INS_RT( mipscpu.op ) ] );
 				break;
 			case FUNCT_SLTU:
 				mips_load( INS_RD( mipscpu.op ), mipscpu.r[ INS_RS( mipscpu.op ) ] < mipscpu.r[ INS_RT( mipscpu.op ) ] );
@@ -647,7 +647,7 @@
 			switch( INS_RT( mipscpu.op ) )
 			{
 			case RT_BLTZ:
-				if( (INT32)mipscpu.r[ INS_RS( mipscpu.op ) ] < 0 )
+				if( (int32_t)mipscpu.r[ INS_RS( mipscpu.op ) ] < 0 )
 				{
 					mips_delayed_branch( mipscpu.pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) ) << 2 ) );
 				}
@@ -657,7 +657,7 @@
 				}
 				break;
 			case RT_BGEZ:
-				if( (INT32)mipscpu.r[ INS_RS( mipscpu.op ) ] >= 0 )
+				if( (int32_t)mipscpu.r[ INS_RS( mipscpu.op ) ] >= 0 )
 				{
 					mips_delayed_branch( mipscpu.pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) ) << 2 ) );
 				}
@@ -668,7 +668,7 @@
 				break;
 			case RT_BLTZAL:
 				n_res = mipscpu.pc + 8;
-				if( (INT32)mipscpu.r[ INS_RS( mipscpu.op ) ] < 0 )
+				if( (int32_t)mipscpu.r[ INS_RS( mipscpu.op ) ] < 0 )
 				{
 					mips_delayed_branch( mipscpu.pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) ) << 2 ) );
 				}
@@ -680,7 +680,7 @@
 				break;
 			case RT_BGEZAL:
 				n_res = mipscpu.pc + 8;
-				if( (INT32)mipscpu.r[ INS_RS( mipscpu.op ) ] >= 0 )
+				if( (int32_t)mipscpu.r[ INS_RS( mipscpu.op ) ] >= 0 )
 				{
 					mips_delayed_branch( mipscpu.pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) ) << 2 ) );
 				}
@@ -725,7 +725,7 @@
 			{
 				mips_exception( EXC_RI );
 			}
-			else if( (INT32)mipscpu.r[ INS_RS( mipscpu.op ) ] <= 0 )
+			else if( (int32_t)mipscpu.r[ INS_RS( mipscpu.op ) ] <= 0 )
 			{
 				mips_delayed_branch( mipscpu.pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) ) << 2 ) );
 			}
@@ -739,7 +739,7 @@
 			{
 				mips_exception( EXC_RI );
 			}
-			else if( (INT32)mipscpu.r[ INS_RS( mipscpu.op ) ] > 0 )
+			else if( (int32_t)mipscpu.r[ INS_RS( mipscpu.op ) ] > 0 )
 			{
 				mips_delayed_branch( mipscpu.pc + 4 + ( MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) ) << 2 ) );
 			}
@@ -750,10 +750,10 @@
 			break;
 		case OP_ADDI:
 			{
-				UINT32 n_imm;
+				uint32_t n_imm;
 				n_imm = MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				n_res = mipscpu.r[ INS_RS( mipscpu.op ) ] + n_imm;
-				if( (INT32)( ~( mipscpu.r[ INS_RS( mipscpu.op ) ] ^ n_imm ) & ( mipscpu.r[ INS_RS( mipscpu.op ) ] ^ n_res ) ) < 0 )
+				if( (int32_t)( ~( mipscpu.r[ INS_RS( mipscpu.op ) ] ^ n_imm ) & ( mipscpu.r[ INS_RS( mipscpu.op ) ] ^ n_res ) ) < 0 )
 				{
 					mips_exception( EXC_OVF );
 				}
@@ -775,10 +775,10 @@
 			}
 			break;
 		case OP_SLTI:
-			mips_load( INS_RT( mipscpu.op ), (INT32)mipscpu.r[ INS_RS( mipscpu.op ) ] < MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) ) );
+			mips_load( INS_RT( mipscpu.op ), (int32_t)mipscpu.r[ INS_RS( mipscpu.op ) ] < MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) ) );
 			break;
 		case OP_SLTIU:
-			mips_load( INS_RT( mipscpu.op ), mipscpu.r[ INS_RS( mipscpu.op ) ] < (UINT32)MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) ) );
+			mips_load( INS_RT( mipscpu.op ), mipscpu.r[ INS_RS( mipscpu.op ) ] < (uint32_t)MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) ) );
 			break;
 		case OP_ANDI:
 			mips_load( INS_RT( mipscpu.op ), mipscpu.r[ INS_RS( mipscpu.op ) ] & INS_IMMEDIATE( mipscpu.op ) );
@@ -1027,7 +1027,7 @@
 			}
 			else if( ( mipscpu.cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1041,7 +1041,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1064,7 +1064,7 @@
 			}
 			else if( ( mipscpu.cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 1 ) ) != 0 )
 				{
@@ -1078,7 +1078,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 1 ) ) != 0 )
 				{
@@ -1101,7 +1101,7 @@
 			}
 			else if( ( mipscpu.cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1113,13 +1113,13 @@
 					switch( n_adr & 3 )
 					{
 					case 0:
-						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0x00ffffff ) | ( (UINT32)program_read_byte_32le( n_adr + 3 ) << 24 );
+						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0x00ffffff ) | ( (uint32_t)program_read_byte_32le( n_adr + 3 ) << 24 );
 						break;
 					case 1:
-						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0x0000ffff ) | ( (UINT32)program_read_word_32le( n_adr + 1 ) << 16 );
+						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0x0000ffff ) | ( (uint32_t)program_read_word_32le( n_adr + 1 ) << 16 );
 						break;
 					case 2:
-						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0x000000ff ) | ( (UINT32)program_read_byte_32le( n_adr - 1 ) << 8 ) | ( (UINT32)program_read_word_32le( n_adr ) << 16 );
+						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0x000000ff ) | ( (uint32_t)program_read_byte_32le( n_adr - 1 ) << 8 ) | ( (uint32_t)program_read_word_32le( n_adr ) << 16 );
 						break;
 					default:
 						n_res = program_read_dword_32le( n_adr - 3 );
@@ -1130,7 +1130,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1142,13 +1142,13 @@
 					switch( n_adr & 3 )
 					{
 					case 0:
-						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0x00ffffff ) | ( (UINT32)program_read_byte_32le( n_adr ) << 24 );
+						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0x00ffffff ) | ( (uint32_t)program_read_byte_32le( n_adr ) << 24 );
 						break;
 					case 1:
-						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0x0000ffff ) | ( (UINT32)program_read_word_32le( n_adr - 1 ) << 16 );
+						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0x0000ffff ) | ( (uint32_t)program_read_word_32le( n_adr - 1 ) << 16 );
 						break;
 					case 2:
-						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0x000000ff ) | ( (UINT32)program_read_word_32le( n_adr - 2 ) << 8 ) | ( (UINT32)program_read_byte_32le( n_adr ) << 24 );
+						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0x000000ff ) | ( (uint32_t)program_read_word_32le( n_adr - 2 ) << 8 ) | ( (uint32_t)program_read_byte_32le( n_adr ) << 24 );
 						break;
 					default:
 						n_res = program_read_dword_32le( n_adr - 3 );
@@ -1168,7 +1168,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 #if 0
 				if( ( n_adr & ( ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
@@ -1194,7 +1194,7 @@
 			}
 			else if( ( mipscpu.cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1208,7 +1208,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1231,7 +1231,7 @@
 			}
 			else if( ( mipscpu.cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 1 ) ) != 0 )
 				{
@@ -1245,7 +1245,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 1 ) ) != 0 )
 				{
@@ -1268,7 +1268,7 @@
 			}
 			else if( ( mipscpu.cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1286,7 +1286,7 @@
 						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0xffff0000 ) | program_read_word_32le( n_adr - 2 );
 						break;
 					case 1:
-						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0xff000000 ) | program_read_word_32le( n_adr - 1 ) | ( (UINT32)program_read_byte_32le( n_adr + 1 ) << 16 );
+						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0xff000000 ) | program_read_word_32le( n_adr - 1 ) | ( (uint32_t)program_read_byte_32le( n_adr + 1 ) << 16 );
 						break;
 					default:
 						n_res = program_read_dword_32le( n_adr );
@@ -1297,7 +1297,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1315,7 +1315,7 @@
 						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0xffff0000 ) | program_read_word_32le( n_adr );
 						break;
 					case 1:
-						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0xff000000 ) | program_read_byte_32le( n_adr ) | ( (UINT32)program_read_word_32le( n_adr + 1 ) << 8 );
+						n_res = ( mipscpu.r[ INS_RT( mipscpu.op ) ] & 0xff000000 ) | program_read_byte_32le( n_adr ) | ( (uint32_t)program_read_word_32le( n_adr + 1 ) << 8 );
 						break;
 					default:
 						n_res = program_read_dword_32le( n_adr );
@@ -1335,7 +1335,7 @@
 			}
 			else if( ( mipscpu.cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1350,7 +1350,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1374,7 +1374,7 @@
 			}
 			else if( ( mipscpu.cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 1 ) ) != 0 )
 				{
@@ -1389,7 +1389,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 1 ) ) != 0 )
 				{
@@ -1414,7 +1414,7 @@
 			}
 			else if( ( mipscpu.cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1445,7 +1445,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1487,7 +1487,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if(0) // ( n_adr & ( ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
 				{
@@ -1511,7 +1511,7 @@
 			}
 			else if( ( mipscpu.cp0r[ CP0_SR ] & ( SR_RE | SR_KUC ) ) == ( SR_RE | SR_KUC ) )
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1541,7 +1541,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) ) != 0 )
 				{
@@ -1591,7 +1591,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
 				{
@@ -1627,7 +1627,7 @@
 			}
 			else
 			{
-				UINT32 n_adr;
+				uint32_t n_adr;
 				n_adr = mipscpu.r[ INS_RS( mipscpu.op ) ] + MIPS_WORD_EXTEND( INS_IMMEDIATE( mipscpu.op ) );
 				if( ( n_adr & ( ( ( mipscpu.cp0r[ CP0_SR ] & SR_KUC ) << 30 ) | 3 ) ) != 0 )
 				{
@@ -1672,7 +1672,7 @@
 
 static void set_irq_line( int irqline, int state )
 {
-	UINT32 ip;
+	uint32_t ip;
 
 	switch( irqline )
 	{
@@ -1850,15 +1850,15 @@
 #define ZSF4 ( mipscpu.cp2cr[ 30 ].w.l )
 #define FLAG ( mipscpu.cp2cr[ 31 ].d )
 
-static UINT32 getcp2dr( int n_reg )
+static uint32_t getcp2dr( int n_reg )
 {
 	if( n_reg == 1 || n_reg == 3 || n_reg == 5 || n_reg == 8 || n_reg == 9 || n_reg == 10 || n_reg == 11 )
 	{
-		mipscpu.cp2dr[ n_reg ].d = (INT32)(INT16)mipscpu.cp2dr[ n_reg ].d;
+		mipscpu.cp2dr[ n_reg ].d = (int32_t)(int16_t)mipscpu.cp2dr[ n_reg ].d;
 	}
 	else if( n_reg == 17 || n_reg == 18 || n_reg == 19 )
 	{
-		mipscpu.cp2dr[ n_reg ].d = (UINT32)(UINT16)mipscpu.cp2dr[ n_reg ].d;
+		mipscpu.cp2dr[ n_reg ].d = (uint32_t)(uint16_t)mipscpu.cp2dr[ n_reg ].d;
 	}
 	else if( n_reg == 29 )
 	{
@@ -1868,7 +1868,7 @@
 	return mipscpu.cp2dr[ n_reg ].d;
 }
 
-static void setcp2dr( int n_reg, UINT32 n_value )
+static void setcp2dr( int n_reg, uint32_t n_value )
 {
 	GTELOG( "set CP2DR%u=%08x", n_reg, n_value );
 	mipscpu.cp2dr[ n_reg ].d = n_value;
@@ -1887,8 +1887,8 @@
 	}
 	else if( n_reg == 30 )
 	{
-		UINT32 n_lzcs = LZCS;
-		UINT32 n_lzcr = 0;
+		uint32_t n_lzcs = LZCS;
+		uint32_t n_lzcr = 0;
 
 		if( ( n_lzcs & 0x80000000 ) == 0 )
 		{
@@ -1903,19 +1903,19 @@
 	}
 }
 
-static UINT32 getcp2cr( int n_reg )
+static uint32_t getcp2cr( int n_reg )
 {
 	GTELOG( "get CP2CR%u=%08x", n_reg, mipscpu.cp2cr[ n_reg ].d );
 	return mipscpu.cp2cr[ n_reg ].d;
 }
 
-static void setcp2cr( int n_reg, UINT32 n_value )
+static void setcp2cr( int n_reg, uint32_t n_value )
 {
 	GTELOG( "set CP2CR%u=%08x", n_reg, n_value );
 	mipscpu.cp2cr[ n_reg ].d = n_value;
 }
 
-static inline INT32 LIM( INT32 n_value, INT32 n_max, INT32 n_min, UINT32 n_flag )
+static inline int32_t LIM( int32_t n_value, int32_t n_max, int32_t n_min, uint32_t n_flag )
 {
 	if( n_value > n_max )
 	{
@@ -1930,7 +1930,7 @@
 	return n_value;
 }
 
-static inline INT64 BOUNDS( INT64 n_value, INT64 n_max, int n_maxflag, INT64 n_min, int n_minflag )
+static inline int64_t BOUNDS( int64_t n_value, int64_t n_max, int n_maxflag, int64_t n_min, int n_minflag )
 {
 	if( n_value > n_max )
 	{
@@ -1943,9 +1943,9 @@
 	return n_value;
 }
 
-#define A1( a ) BOUNDS( ( a ), 0x7fffffff, 30, -(INT64)0x80000000, ( 1 << 27 ) )
-#define A2( a ) BOUNDS( ( a ), 0x7fffffff, 29, -(INT64)0x80000000, ( 1 << 26 ) )
-#define A3( a ) BOUNDS( ( a ), 0x7fffffff, 28, -(INT64)0x80000000, ( 1 << 25 ) )
+#define A1( a ) BOUNDS( ( a ), 0x7fffffff, 30, -(int64_t)0x80000000, ( 1 << 27 ) )
+#define A2( a ) BOUNDS( ( a ), 0x7fffffff, 29, -(int64_t)0x80000000, ( 1 << 26 ) )
+#define A3( a ) BOUNDS( ( a ), 0x7fffffff, 28, -(int64_t)0x80000000, ( 1 << 25 ) )
 #define Lm_B1( a, l ) LIM( ( a ), 0x7fff, -0x8000 * !l, ( 1 << 31 ) | ( 1 << 24 ) )
 #define Lm_B2( a, l ) LIM( ( a ), 0x7fff, -0x8000 * !l, ( 1 << 31 ) | ( 1 << 23 ) )
 #define Lm_B3( a, l ) LIM( ( a ), 0x7fff, -0x8000 * !l, ( 1 << 22 ) )
@@ -1954,7 +1954,7 @@
 #define Lm_C3( a ) LIM( ( a ), 0x00ff, 0x0000, ( 1 << 19 ) )
 #define Lm_D( a ) LIM( ( a ), 0xffff, 0x0000, ( 1 << 31 ) | ( 1 << 18 ) )
 
-static inline UINT32 Lm_E( UINT32 n_z )
+static inline uint32_t Lm_E( uint32_t n_z )
 {
 	if( n_z <= H / 2 )
 	{
@@ -1968,7 +1968,7 @@
 	return n_z;
 }
 
-#define F( a ) BOUNDS( ( a ), 0x7fffffff, ( 1 << 31 ) | ( 1 << 16 ), -(INT64)0x80000000, ( 1 << 31 ) | ( 1 << 15 ) )
+#define F( a ) BOUNDS( ( a ), 0x7fffffff, ( 1 << 31 ) | ( 1 << 16 ), -(int64_t)0x80000000, ( 1 << 31 ) | ( 1 << 15 ) )
 #define Lm_G1( a ) LIM( ( a ), 0x3ff, -0x400, ( 1 << 31 ) | ( 1 << 14 ) )
 #define Lm_G2( a ) LIM( ( a ), 0x3ff, -0x400, ( 1 << 31 ) | ( 1 << 13 ) )
 #define Lm_H( a ) LIM( ( a ), 0xfff, 0x000, ( 1 << 12 ) )
@@ -1979,26 +1979,26 @@
 	int n_v;
 	int n_lm;
 	int n_pass;
-	UINT16 n_v1;
-	UINT16 n_v2;
-	UINT16 n_v3;
-	const UINT16 **p_n_mx;
-	const UINT32 **p_n_cv;
-	static const UINT16 n_zm = 0;
-	static const UINT32 n_zc = 0;
-	static const UINT16 *p_n_vx[] = { &VX0, &VX1, &VX2 };
-	static const UINT16 *p_n_vy[] = { &VY0, &VY1, &VY2 };
-	static const UINT16 *p_n_vz[] = { &VZ0, &VZ1, &VZ2 };
-	static const UINT16 *p_n_rm[] = { &R11, &R12, &R13, &R21, &R22, &R23, &R31, &R32, &R33 };
-	static const UINT16 *p_n_lm[] = { &L11, &L12, &L13, &L21, &L22, &L23, &L31, &L32, &L33 };
-	static const UINT16 *p_n_cm[] = { &LR1, &LR2, &LR3, &LG1, &LG2, &LG3, &LB1, &LB2, &LB3 };
-	static const UINT16 *p_n_zm[] = { &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm };
-	static const UINT16 **p_p_n_mx[] = { p_n_rm, p_n_lm, p_n_cm, p_n_zm };
-	static const UINT32 *p_n_tr[] = { &TRX, &TRY, &TRZ };
-	static const UINT32 *p_n_bk[] = { &RBK, &GBK, &BBK };
-	static const UINT32 *p_n_fc[] = { &RFC, &GFC, &BFC };
-	static const UINT32 *p_n_zc[] = { &n_zc, &n_zc, &n_zc };
-	static const UINT32 **p_p_n_cv[] = { p_n_tr, p_n_bk, p_n_fc, p_n_zc };
+	uint16_t n_v1;
+	uint16_t n_v2;
+	uint16_t n_v3;
+	const uint16_t **p_n_mx;
+	const uint32_t **p_n_cv;
+	static const uint16_t n_zm = 0;
+	static const uint32_t n_zc = 0;
+	static const uint16_t *p_n_vx[] = { &VX0, &VX1, &VX2 };
+	static const uint16_t *p_n_vy[] = { &VY0, &VY1, &VY2 };
+	static const uint16_t *p_n_vz[] = { &VZ0, &VZ1, &VZ2 };
+	static const uint16_t *p_n_rm[] = { &R11, &R12, &R13, &R21, &R22, &R23, &R31, &R32, &R33 };
+	static const uint16_t *p_n_lm[] = { &L11, &L12, &L13, &L21, &L22, &L23, &L31, &L32, &L33 };
+	static const uint16_t *p_n_cm[] = { &LR1, &LR2, &LR3, &LG1, &LG2, &LG3, &LB1, &LB2, &LB3 };
+	static const uint16_t *p_n_zm[] = { &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm, &n_zm };
+	static const uint16_t **p_p_n_mx[] = { p_n_rm, p_n_lm, p_n_cm, p_n_zm };
+	static const uint32_t *p_n_tr[] = { &TRX, &TRY, &TRZ };
+	static const uint32_t *p_n_bk[] = { &RBK, &GBK, &BBK };
+	static const uint32_t *p_n_fc[] = { &RFC, &GFC, &BFC };
+	static const uint32_t *p_n_zc[] = { &n_zc, &n_zc, &n_zc };
+	static const uint32_t **p_p_n_cv[] = { p_n_tr, p_n_bk, p_n_fc, p_n_zc };
 
 	switch( GTE_FUNCT( gteop ) )
 	{
@@ -2008,22 +2008,22 @@
 			GTELOG( "RTPS" );
 			FLAG = 0;
 
-			MAC1 = A1( ( ( (INT64)(INT32)TRX << 12 ) + ( (INT16)R11 * (INT16)VX0 ) + ( (INT16)R12 * (INT16)VY0 ) + ( (INT16)R13 * (INT16)VZ0 ) ) >> 12 );
-			MAC2 = A2( ( ( (INT64)(INT32)TRY << 12 ) + ( (INT16)R21 * (INT16)VX0 ) + ( (INT16)R22 * (INT16)VY0 ) + ( (INT16)R23 * (INT16)VZ0 ) ) >> 12 );
-			MAC3 = A3( ( ( (INT64)(INT32)TRZ << 12 ) + ( (INT16)R31 * (INT16)VX0 ) + ( (INT16)R32 * (INT16)VY0 ) + ( (INT16)R33 * (INT16)VZ0 ) ) >> 12 );
-			IR1 = Lm_B1( (INT32)MAC1, 0 );
-			IR2 = Lm_B2( (INT32)MAC2, 0 );
-			IR3 = Lm_B3( (INT32)MAC3, 0 );
+			MAC1 = A1( ( ( (int64_t)(int32_t)TRX << 12 ) + ( (int16_t)R11 * (int16_t)VX0 ) + ( (int16_t)R12 * (int16_t)VY0 ) + ( (int16_t)R13 * (int16_t)VZ0 ) ) >> 12 );
+			MAC2 = A2( ( ( (int64_t)(int32_t)TRY << 12 ) + ( (int16_t)R21 * (int16_t)VX0 ) + ( (int16_t)R22 * (int16_t)VY0 ) + ( (int16_t)R23 * (int16_t)VZ0 ) ) >> 12 );
+			MAC3 = A3( ( ( (int64_t)(int32_t)TRZ << 12 ) + ( (int16_t)R31 * (int16_t)VX0 ) + ( (int16_t)R32 * (int16_t)VY0 ) + ( (int16_t)R33 * (int16_t)VZ0 ) ) >> 12 );
+			IR1 = Lm_B1( (int32_t)MAC1, 0 );
+			IR2 = Lm_B2( (int32_t)MAC2, 0 );
+			IR3 = Lm_B3( (int32_t)MAC3, 0 );
 			SZ0 = SZ1;
 			SZ1 = SZ2;
 			SZ2 = SZ3;
-			SZ3 = Lm_D( (INT32)MAC3 );
+			SZ3 = Lm_D( (int32_t)MAC3 );
 			SXY0 = SXY1;
 			SXY1 = SXY2;
-			SX2 = Lm_G1( F( (INT64)(INT32)OFX + ( (INT64)(INT16)IR1 * ( ( (UINT32)H << 16 ) / Lm_E( SZ3 ) ) ) ) >> 16 );
-			SY2 = Lm_G2( F( (INT64)(INT32)OFY + ( (INT64)(INT16)IR2 * ( ( (UINT32)H << 16 ) / Lm_E( SZ3 ) ) ) ) >> 16 );
-			MAC0 = F( (INT64)(INT32)DQB + ( (INT64)(INT16)DQA * ( ( (UINT32)H << 16 ) / Lm_E( SZ3 ) ) ) );
-			IR0 = Lm_H( (INT32)MAC0 >> 12 );
+			SX2 = Lm_G1( F( (int64_t)(int32_t)OFX + ( (int64_t)(int16_t)IR1 * ( ( (uint32_t)H << 16 ) / Lm_E( SZ3 ) ) ) ) >> 16 );
+			SY2 = Lm_G2( F( (int64_t)(int32_t)OFY + ( (int64_t)(int16_t)IR2 * ( ( (uint32_t)H << 16 ) / Lm_E( SZ3 ) ) ) ) >> 16 );
+			MAC0 = F( (int64_t)(int32_t)DQB + ( (int64_t)(int16_t)DQA * ( ( (uint32_t)H << 16 ) / Lm_E( SZ3 ) ) ) );
+			IR0 = Lm_H( (int32_t)MAC0 >> 12 );
 			return;
 		}
 		break;
@@ -2035,7 +2035,7 @@
 			GTELOG( "NCLIP" );
 			FLAG = 0;
 
-			MAC0 = F( ( (INT64)(INT16)SX0 * (INT16)SY1 ) + ( (INT16)SX1 * (INT16)SY2 ) + ( (INT16)SX2 * (INT16)SY0 ) - ( (INT16)SX0 * (INT16)SY2 ) - ( (INT16)SX1 * (INT16)SY0 ) - ( (INT16)SX2 * (INT16)SY1 ) );
+			MAC0 = F( ( (int64_t)(int16_t)SX0 * (int16_t)SY1 ) + ( (int16_t)SX1 * (int16_t)SY2 ) + ( (int16_t)SX2 * (int16_t)SY0 ) - ( (int16_t)SX0 * (int16_t)SY2 ) - ( (int16_t)SX1 * (int16_t)SY0 ) - ( (int16_t)SX2 * (int16_t)SY1 ) );
 			return;
 		}
 		break;
@@ -2046,12 +2046,12 @@
 			n_sf = 12 * GTE_SF( gteop );
 			FLAG = 0;
 
-			MAC1 = A1( ( ( (INT64)(INT32)D2 * (INT16)IR3 ) - ( (INT64)(INT32)D3 * (INT16)IR2 ) ) >> n_sf );
-			MAC2 = A2( ( ( (INT64)(INT32)D3 * (INT16)IR1 ) - ( (INT64)(INT32)D1 * (INT16)IR3 ) ) >> n_sf );
-			MAC3 = A3( ( ( (INT64)(INT32)D1 * (INT16)IR2 ) - ( (INT64)(INT32)D2 * (INT16)IR1 ) ) >> n_sf );
-			IR1 = Lm_B1( (INT32)MAC1, 0 );
-			IR2 = Lm_B2( (INT32)MAC2, 0 );
-			IR3 = Lm_B3( (INT32)MAC3, 0 );
+			MAC1 = A1( ( ( (int64_t)(int32_t)D2 * (int16_t)IR3 ) - ( (int64_t)(int32_t)D3 * (int16_t)IR2 ) ) >> n_sf );
+			MAC2 = A2( ( ( (int64_t)(int32_t)D3 * (int16_t)IR1 ) - ( (int64_t)(int32_t)D1 * (int16_t)IR3 ) ) >> n_sf );
+			MAC3 = A3( ( ( (int64_t)(int32_t)D1 * (int16_t)IR2 ) - ( (int64_t)(int32_t)D2 * (int16_t)IR1 ) ) >> n_sf );
+			IR1 = Lm_B1( (int32_t)MAC1, 0 );
+			IR2 = Lm_B2( (int32_t)MAC2, 0 );
+			IR3 = Lm_B3( (int32_t)MAC3, 0 );
 			return;
 		}
 		break;
@@ -2061,24 +2061,24 @@
 			GTELOG( "DPCS" );
 			FLAG = 0;
 
-			MAC1 = A1( ( ( (INT64)R << 16 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)RFC - ( R << 4 ), 0 ) ) ) ) >> 12 );
-			MAC2 = A2( ( ( (INT64)G << 16 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)GFC - ( G << 4 ), 0 ) ) ) ) >> 12 );
-			MAC3 = A3( ( ( (INT64)B << 16 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)BFC - ( B << 4 ), 0 ) ) ) ) >> 12 );
-			IR1 = Lm_B1( (INT32)MAC1, 0 );
-			IR2 = Lm_B2( (INT32)MAC2, 0 );
-			IR3 = Lm_B3( (INT32)MAC3, 0 );
+			MAC1 = A1( ( ( (int64_t)R << 16 ) + ( (int64_t)(int16_t)IR0 * ( Lm_B1( (int32_t)RFC - ( R << 4 ), 0 ) ) ) ) >> 12 );
+			MAC2 = A2( ( ( (int64_t)G << 16 ) + ( (int64_t)(int16_t)IR0 * ( Lm_B1( (int32_t)GFC - ( G << 4 ), 0 ) ) ) ) >> 12 );
+			MAC3 = A3( ( ( (int64_t)B << 16 ) + ( (int64_t)(int16_t)IR0 * ( Lm_B1( (int32_t)BFC - ( B << 4 ), 0 ) ) ) ) >> 12 );
+			IR1 = Lm_B1( (int32_t)MAC1, 0 );
+			IR2 = Lm_B2( (int32_t)MAC2, 0 );
+			IR3 = Lm_B3( (int32_t)MAC3, 0 );
 			CD0 = CD1;
 			CD1 = CD2;
 			CD2 = CODE;
 			R0 = R1;
 			R1 = R2;
-			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			R2 = Lm_C1( (int32_t)MAC1 >> 4 );
 			G0 = G1;
 			G1 = G2;
-			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			G2 = Lm_C2( (int32_t)MAC2 >> 4 );
 			B0 = B1;
 			B1 = B2;
-			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			B2 = Lm_C3( (int32_t)MAC3 >> 4 );
 			return;
 		}
 		break;
@@ -2088,24 +2088,24 @@
 			GTELOG( "INTPL" );
 			FLAG = 0;
 
-			MAC1 = A1( ( ( (INT64)(INT16)IR1 << 12 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)RFC - (INT16)IR1, 0 ) ) ) ) >> 12 );
-			MAC2 = A2( ( ( (INT64)(INT16)IR2 << 12 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)GFC - (INT16)IR2, 0 ) ) ) ) >> 12 );
-			MAC3 = A3( ( ( (INT64)(INT16)IR3 << 12 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)BFC - (INT16)IR3, 0 ) ) ) ) >> 12 );
-			IR1 = Lm_B1( (INT32)MAC1, 0 );
-			IR2 = Lm_B2( (INT32)MAC2, 0 );
-			IR3 = Lm_B3( (INT32)MAC3, 0 );
+			MAC1 = A1( ( ( (int64_t)(int16_t)IR1 << 12 ) + ( (int64_t)(int16_t)IR0 * ( Lm_B1( (int32_t)RFC - (int16_t)IR1, 0 ) ) ) ) >> 12 );
+			MAC2 = A2( ( ( (int64_t)(int16_t)IR2 << 12 ) + ( (int64_t)(int16_t)IR0 * ( Lm_B1( (int32_t)GFC - (int16_t)IR2, 0 ) ) ) ) >> 12 );
+			MAC3 = A3( ( ( (int64_t)(int16_t)IR3 << 12 ) + ( (int64_t)(int16_t)IR0 * ( Lm_B1( (int32_t)BFC - (int16_t)IR3, 0 ) ) ) ) >> 12 );
+			IR1 = Lm_B1( (int32_t)MAC1, 0 );
+			IR2 = Lm_B2( (int32_t)MAC2, 0 );
+			IR3 = Lm_B3( (int32_t)MAC3, 0 );
 			CD0 = CD1;
 			CD1 = CD2;
 			CD2 = CODE;
 			R0 = R1;
 			R1 = R2;
-			R2 = Lm_C1( (INT32)MAC1 );
+			R2 = Lm_C1( (int32_t)MAC1 );
 			G0 = G1;
 			G1 = G2;
-			G2 = Lm_C2( (INT32)MAC2 );
+			G2 = Lm_C2( (int32_t)MAC2 );
 			B0 = B1;
 			B1 = B2;
-			B2 = Lm_C3( (INT32)MAC3 );
+			B2 = Lm_C3( (int32_t)MAC3 );
 			return;
 		}
 		break;
@@ -2132,13 +2132,13 @@
 			n_lm = GTE_LM( gteop );
 			FLAG = 0;
 
-			MAC1 = A1( ( ( (INT64)(INT32)*p_n_cv[ 0 ] << 12 ) + ( (INT16)*p_n_mx[ 0 ] * (INT16)n_v1 ) + ( (INT16)*p_n_mx[ 1 ] * (INT16)n_v2 ) + ( (INT16)*p_n_mx[ 2 ] * (INT16)n_v3 ) ) >> n_sf );
-			MAC2 = A2( ( ( (INT64)(INT32)*p_n_cv[ 1 ] << 12 ) + ( (INT16)*p_n_mx[ 3 ] * (INT16)n_v1 ) + ( (INT16)*p_n_mx[ 4 ] * (INT16)n_v2 ) + ( (INT16)*p_n_mx[ 5 ] * (INT16)n_v3 ) ) >> n_sf );
-			MAC3 = A3( ( ( (INT64)(INT32)*p_n_cv[ 2 ] << 12 ) + ( (INT16)*p_n_mx[ 6 ] * (INT16)n_v1 ) + ( (INT16)*p_n_mx[ 7 ] * (INT16)n_v2 ) + ( (INT16)*p_n_mx[ 8 ] * (INT16)n_v3 ) ) >> n_sf );
-
-			IR1 = Lm_B1( (INT32)MAC1, n_lm );
-			IR2 = Lm_B2( (INT32)MAC2, n_lm );
-			IR3 = Lm_B3( (INT32)MAC3, n_lm );
+			MAC1 = A1( ( ( (int64_t)(int32_t)*p_n_cv[ 0 ] << 12 ) + ( (int16_t)*p_n_mx[ 0 ] * (int16_t)n_v1 ) + ( (int16_t)*p_n_mx[ 1 ] * (int16_t)n_v2 ) + ( (int16_t)*p_n_mx[ 2 ] * (int16_t)n_v3 ) ) >> n_sf );
+			MAC2 = A2( ( ( (int64_t)(int32_t)*p_n_cv[ 1 ] << 12 ) + ( (int16_t)*p_n_mx[ 3 ] * (int16_t)n_v1 ) + ( (int16_t)*p_n_mx[ 4 ] * (int16_t)n_v2 ) + ( (int16_t)*p_n_mx[ 5 ] * (int16_t)n_v3 ) ) >> n_sf );
+			MAC3 = A3( ( ( (int64_t)(int32_t)*p_n_cv[ 2 ] << 12 ) + ( (int16_t)*p_n_mx[ 6 ] * (int16_t)n_v1 ) + ( (int16_t)*p_n_mx[ 7 ] * (int16_t)n_v2 ) + ( (int16_t)*p_n_mx[ 8 ] * (int16_t)n_v3 ) ) >> n_sf );
+
+			IR1 = Lm_B1( (int32_t)MAC1, n_lm );
+			IR2 = Lm_B2( (int32_t)MAC2, n_lm );
+			IR3 = Lm_B3( (int32_t)MAC3, n_lm );
 			return;
 		}
 		break;
@@ -2148,36 +2148,36 @@
 			GTELOG( "NCDS" );
 			FLAG = 0;
 
-			MAC1 = A1( ( ( (INT64)(INT16)L11 * (INT16)VX0 ) + ( (INT16)L12 * (INT16)VY0 ) + ( (INT16)L13 * (INT16)VZ0 ) ) >> 12 );
-			MAC2 = A2( ( ( (INT64)(INT16)L21 * (INT16)VX0 ) + ( (INT16)L22 * (INT16)VY0 ) + ( (INT16)L23 * (INT16)VZ0 ) ) >> 12 );
-			MAC3 = A3( ( ( (INT64)(INT16)L31 * (INT16)VX0 ) + ( (INT16)L32 * (INT16)VY0 ) + ( (INT16)L33 * (INT16)VZ0 ) ) >> 12 );
-			IR1 = Lm_B1( (INT32)MAC1, 1 );
-			IR2 = Lm_B2( (INT32)MAC2, 1 );
-			IR3 = Lm_B3( (INT32)MAC3, 1 );
-			MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
-			MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
-			MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
-			IR1 = Lm_B1( (INT32)MAC1, 1 );
-			IR2 = Lm_B2( (INT32)MAC2, 1 );
-			IR3 = Lm_B3( (INT32)MAC3, 1 );
-			MAC1 = A1( ( ( ( (INT64)R << 4 ) * (INT16)IR1 ) + ( (INT16)IR0 * Lm_B1( (INT32)RFC - ( ( R * (INT16)IR1 ) >> 8 ), 0 ) ) ) >> 12 );
-			MAC2 = A2( ( ( ( (INT64)G << 4 ) * (INT16)IR2 ) + ( (INT16)IR0 * Lm_B2( (INT32)GFC - ( ( G * (INT16)IR2 ) >> 8 ), 0 ) ) ) >> 12 );
-			MAC3 = A3( ( ( ( (INT64)B << 4 ) * (INT16)IR3 ) + ( (INT16)IR0 * Lm_B3( (INT32)BFC - ( ( B * (INT16)IR3 ) >> 8 ), 0 ) ) ) >> 12 );
-			IR1 = Lm_B1( (INT32)MAC1, 1 );
-			IR2 = Lm_B2( (INT32)MAC2, 1 );
-			IR3 = Lm_B3( (INT32)MAC3, 1 );
+			MAC1 = A1( ( ( (int64_t)(int16_t)L11 * (int16_t)VX0 ) + ( (int16_t)L12 * (int16_t)VY0 ) + ( (int16_t)L13 * (int16_t)VZ0 ) ) >> 12 );
+			MAC2 = A2( ( ( (int64_t)(int16_t)L21 * (int16_t)VX0 ) + ( (int16_t)L22 * (int16_t)VY0 ) + ( (int16_t)L23 * (int16_t)VZ0 ) ) >> 12 );
+			MAC3 = A3( ( ( (int64_t)(int16_t)L31 * (int16_t)VX0 ) + ( (int16_t)L32 * (int16_t)VY0 ) + ( (int16_t)L33 * (int16_t)VZ0 ) ) >> 12 );
+			IR1 = Lm_B1( (int32_t)MAC1, 1 );
+			IR2 = Lm_B2( (int32_t)MAC2, 1 );
+			IR3 = Lm_B3( (int32_t)MAC3, 1 );
+			MAC1 = A1( ( ( (int64_t)RBK << 12 ) + ( (int16_t)LR1 * (int16_t)IR1 ) + ( (int16_t)LR2 * (int16_t)IR2 ) + ( (int16_t)LR3 * (int16_t)IR3 ) ) >> 12 );
+			MAC2 = A2( ( ( (int64_t)GBK << 12 ) + ( (int16_t)LG1 * (int16_t)IR1 ) + ( (int16_t)LG2 * (int16_t)IR2 ) + ( (int16_t)LG3 * (int16_t)IR3 ) ) >> 12 );
+			MAC3 = A3( ( ( (int64_t)BBK << 12 ) + ( (int16_t)LB1 * (int16_t)IR1 ) + ( (int16_t)LB2 * (int16_t)IR2 ) + ( (int16_t)LB3 * (int16_t)IR3 ) ) >> 12 );
+			IR1 = Lm_B1( (int32_t)MAC1, 1 );
+			IR2 = Lm_B2( (int32_t)MAC2, 1 );
+			IR3 = Lm_B3( (int32_t)MAC3, 1 );
+			MAC1 = A1( ( ( ( (int64_t)R << 4 ) * (int16_t)IR1 ) + ( (int16_t)IR0 * Lm_B1( (int32_t)RFC - ( ( R * (int16_t)IR1 ) >> 8 ), 0 ) ) ) >> 12 );
+			MAC2 = A2( ( ( ( (int64_t)G << 4 ) * (int16_t)IR2 ) + ( (int16_t)IR0 * Lm_B2( (int32_t)GFC - ( ( G * (int16_t)IR2 ) >> 8 ), 0 ) ) ) >> 12 );
+			MAC3 = A3( ( ( ( (int64_t)B << 4 ) * (int16_t)IR3 ) + ( (int16_t)IR0 * Lm_B3( (int32_t)BFC - ( ( B * (int16_t)IR3 ) >> 8 ), 0 ) ) ) >> 12 );
+			IR1 = Lm_B1( (int32_t)MAC1, 1 );
+			IR2 = Lm_B2( (int32_t)MAC2, 1 );
+			IR3 = Lm_B3( (int32_t)MAC3, 1 );
 			CD0 = CD1;
 			CD1 = CD2;
 			CD2 = CODE;
 			R0 = R1;
 			R1 = R2;
-			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			R2 = Lm_C1( (int32_t)MAC1 >> 4 );
 			G0 = G1;
 			G1 = G2;
-			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			G2 = Lm_C2( (int32_t)MAC2 >> 4 );
 			B0 = B1;
 			B1 = B2;
-			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			B2 = Lm_C3( (int32_t)MAC3 >> 4 );
 			return;
 		}
 		break;
@@ -2187,15 +2187,15 @@
 			GTELOG( "CDP" );
 			FLAG = 0;
 
-			MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
-			MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
-			MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
+			MAC1 = A1( ( ( (int64_t)RBK << 12 ) + ( (int16_t)LR1 * (int16_t)IR1 ) + ( (int16_t)LR2 * (int16_t)IR2 ) + ( (int16_t)LR3 * (int16_t)IR3 ) ) >> 12 );
+			MAC2 = A2( ( ( (int64_t)GBK << 12 ) + ( (int16_t)LG1 * (int16_t)IR1 ) + ( (int16_t)LG2 * (int16_t)IR2 ) + ( (int16_t)LG3 * (int16_t)IR3 ) ) >> 12 );
+			MAC3 = A3( ( ( (int64_t)BBK << 12 ) + ( (int16_t)LB1 * (int16_t)IR1 ) + ( (int16_t)LB2 * (int16_t)IR2 ) + ( (int16_t)LB3 * (int16_t)IR3 ) ) >> 12 );
 			IR1 = Lm_B1( MAC1, 1 );
 			IR2 = Lm_B2( MAC2, 1 );
 			IR3 = Lm_B3( MAC3, 1 );
-			MAC1 = A1( ( ( ( (INT64)R << 4 ) * (INT16)IR1 ) + ( (INT16)IR0 * Lm_B1( (INT32)RFC - ( ( R * (INT16)IR1 ) >> 8 ), 0 ) ) ) >> 12 );
-			MAC2 = A2( ( ( ( (INT64)G << 4 ) * (INT16)IR2 ) + ( (INT16)IR0 * Lm_B2( (INT32)GFC - ( ( G * (INT16)IR2 ) >> 8 ), 0 ) ) ) >> 12 );
-			MAC3 = A3( ( ( ( (INT64)B << 4 ) * (INT16)IR3 ) + ( (INT16)IR0 * Lm_B3( (INT32)BFC - ( ( B * (INT16)IR3 ) >> 8 ), 0 ) ) ) >> 12 );
+			MAC1 = A1( ( ( ( (int64_t)R << 4 ) * (int16_t)IR1 ) + ( (int16_t)IR0 * Lm_B1( (int32_t)RFC - ( ( R * (int16_t)IR1 ) >> 8 ), 0 ) ) ) >> 12 );
+			MAC2 = A2( ( ( ( (int64_t)G << 4 ) * (int16_t)IR2 ) + ( (int16_t)IR0 * Lm_B2( (int32_t)GFC - ( ( G * (int16_t)IR2 ) >> 8 ), 0 ) ) ) >> 12 );
+			MAC3 = A3( ( ( ( (int64_t)B << 4 ) * (int16_t)IR3 ) + ( (int16_t)IR0 * Lm_B3( (int32_t)BFC - ( ( B * (int16_t)IR3 ) >> 8 ), 0 ) ) ) >> 12 );
 			IR1 = Lm_B1( MAC1, 1 );
 			IR2 = Lm_B2( MAC2, 1 );
 			IR3 = Lm_B3( MAC3, 1 );
@@ -2204,13 +2204,13 @@
 			CD2 = CODE;
 			R0 = R1;
 			R1 = R2;
-			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			R2 = Lm_C1( (int32_t)MAC1 >> 4 );
 			G0 = G1;
 			G1 = G2;
-			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			G2 = Lm_C2( (int32_t)MAC2 >> 4 );
 			B0 = B1;
 			B1 = B2;
-			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			B2 = Lm_C3( (int32_t)MAC3 >> 4 );
 			return;
 		}
 		break;
@@ -2222,36 +2222,36 @@
 
 			for( n_v = 0; n_v < 3; n_v++ )
 			{
-				MAC1 = A1( ( ( (INT64)(INT16)L11 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L12 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L13 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
-				MAC2 = A2( ( ( (INT64)(INT16)L21 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L22 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L23 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
-				MAC3 = A3( ( ( (INT64)(INT16)L31 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L32 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L33 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
-				IR1 = Lm_B1( (INT32)MAC1, 1 );
-				IR2 = Lm_B2( (INT32)MAC2, 1 );
-				IR3 = Lm_B3( (INT32)MAC3, 1 );
-				MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
-				MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
-				MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
-				IR1 = Lm_B1( (INT32)MAC1, 1 );
-				IR2 = Lm_B2( (INT32)MAC2, 1 );
-				IR3 = Lm_B3( (INT32)MAC3, 1 );
-				MAC1 = A1( ( ( ( (INT64)R << 4 ) * (INT16)IR1 ) + ( (INT16)IR0 * Lm_B1( (INT32)RFC - ( ( R * (INT16)IR1 ) >> 8 ), 0 ) ) ) >> 12 );
-				MAC2 = A2( ( ( ( (INT64)G << 4 ) * (INT16)IR2 ) + ( (INT16)IR0 * Lm_B2( (INT32)GFC - ( ( G * (INT16)IR2 ) >> 8 ), 0 ) ) ) >> 12 );
-				MAC3 = A3( ( ( ( (INT64)B << 4 ) * (INT16)IR3 ) + ( (INT16)IR0 * Lm_B3( (INT32)BFC - ( ( B * (INT16)IR3 ) >> 8 ), 0 ) ) ) >> 12 );
-				IR1 = Lm_B1( (INT32)MAC1, 1 );
-				IR2 = Lm_B2( (INT32)MAC2, 1 );
-				IR3 = Lm_B3( (INT32)MAC3, 1 );
+				MAC1 = A1( ( ( (int64_t)(int16_t)L11 * (int16_t)*p_n_vx[ n_v ] ) + ( (int16_t)L12 * (int16_t)*p_n_vy[ n_v ] ) + ( (int16_t)L13 * (int16_t)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC2 = A2( ( ( (int64_t)(int16_t)L21 * (int16_t)*p_n_vx[ n_v ] ) + ( (int16_t)L22 * (int16_t)*p_n_vy[ n_v ] ) + ( (int16_t)L23 * (int16_t)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC3 = A3( ( ( (int64_t)(int16_t)L31 * (int16_t)*p_n_vx[ n_v ] ) + ( (int16_t)L32 * (int16_t)*p_n_vy[ n_v ] ) + ( (int16_t)L33 * (int16_t)*p_n_vz[ n_v ] ) ) >> 12 );
+				IR1 = Lm_B1( (int32_t)MAC1, 1 );
+				IR2 = Lm_B2( (int32_t)MAC2, 1 );
+				IR3 = Lm_B3( (int32_t)MAC3, 1 );
+				MAC1 = A1( ( ( (int64_t)RBK << 12 ) + ( (int16_t)LR1 * (int16_t)IR1 ) + ( (int16_t)LR2 * (int16_t)IR2 ) + ( (int16_t)LR3 * (int16_t)IR3 ) ) >> 12 );
+				MAC2 = A2( ( ( (int64_t)GBK << 12 ) + ( (int16_t)LG1 * (int16_t)IR1 ) + ( (int16_t)LG2 * (int16_t)IR2 ) + ( (int16_t)LG3 * (int16_t)IR3 ) ) >> 12 );
+				MAC3 = A3( ( ( (int64_t)BBK << 12 ) + ( (int16_t)LB1 * (int16_t)IR1 ) + ( (int16_t)LB2 * (int16_t)IR2 ) + ( (int16_t)LB3 * (int16_t)IR3 ) ) >> 12 );
+				IR1 = Lm_B1( (int32_t)MAC1, 1 );
+				IR2 = Lm_B2( (int32_t)MAC2, 1 );
+				IR3 = Lm_B3( (int32_t)MAC3, 1 );
+				MAC1 = A1( ( ( ( (int64_t)R << 4 ) * (int16_t)IR1 ) + ( (int16_t)IR0 * Lm_B1( (int32_t)RFC - ( ( R * (int16_t)IR1 ) >> 8 ), 0 ) ) ) >> 12 );
+				MAC2 = A2( ( ( ( (int64_t)G << 4 ) * (int16_t)IR2 ) + ( (int16_t)IR0 * Lm_B2( (int32_t)GFC - ( ( G * (int16_t)IR2 ) >> 8 ), 0 ) ) ) >> 12 );
+				MAC3 = A3( ( ( ( (int64_t)B << 4 ) * (int16_t)IR3 ) + ( (int16_t)IR0 * Lm_B3( (int32_t)BFC - ( ( B * (int16_t)IR3 ) >> 8 ), 0 ) ) ) >> 12 );
+				IR1 = Lm_B1( (int32_t)MAC1, 1 );
+				IR2 = Lm_B2( (int32_t)MAC2, 1 );
+				IR3 = Lm_B3( (int32_t)MAC3, 1 );
 				CD0 = CD1;
 				CD1 = CD2;
 				CD2 = CODE;
 				R0 = R1;
 				R1 = R2;
-				R2 = Lm_C1( (INT32)MAC1 >> 4 );
+				R2 = Lm_C1( (int32_t)MAC1 >> 4 );
 				G0 = G1;
 				G1 = G2;
-				G2 = Lm_C2( (INT32)MAC2 >> 4 );
+				G2 = Lm_C2( (int32_t)MAC2 >> 4 );
 				B0 = B1;
 				B1 = B2;
-				B2 = Lm_C3( (INT32)MAC3 >> 4 );
+				B2 = Lm_C3( (int32_t)MAC3 >> 4 );
 			}
 			return;
 		}
@@ -2262,36 +2262,36 @@
 			GTELOG( "NCCS" );
 			FLAG = 0;
 
-			MAC1 = A1( ( ( (INT64)(INT16)L11 * (INT16)VX0 ) + ( (INT16)L12 * (INT16)VY0 ) + ( (INT16)L13 * (INT16)VZ0 ) ) >> 12 );
-			MAC2 = A2( ( ( (INT64)(INT16)L21 * (INT16)VX0 ) + ( (INT16)L22 * (INT16)VY0 ) + ( (INT16)L23 * (INT16)VZ0 ) ) >> 12 );
-			MAC3 = A3( ( ( (INT64)(INT16)L31 * (INT16)VX0 ) + ( (INT16)L32 * (INT16)VY0 ) + ( (INT16)L33 * (INT16)VZ0 ) ) >> 12 );
-			IR1 = Lm_B1( (INT32)MAC1, 1 );
-			IR2 = Lm_B2( (INT32)MAC2, 1 );
-			IR3 = Lm_B3( (INT32)MAC3, 1 );
-			MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
-			MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
-			MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
-			IR1 = Lm_B1( (INT32)MAC1, 1 );
-			IR2 = Lm_B2( (INT32)MAC2, 1 );
-			IR3 = Lm_B3( (INT32)MAC3, 1 );
-			MAC1 = A1( ( (INT64)R * (INT16)IR1 ) >> 8 );
-			MAC2 = A2( ( (INT64)G * (INT16)IR2 ) >> 8 );
-			MAC3 = A3( ( (INT64)B * (INT16)IR3 ) >> 8 );
-			IR1 = Lm_B1( (INT32)MAC1, 1 );
-			IR2 = Lm_B2( (INT32)MAC2, 1 );
-			IR3 = Lm_B3( (INT32)MAC3, 1 );
+			MAC1 = A1( ( ( (int64_t)(int16_t)L11 * (int16_t)VX0 ) + ( (int16_t)L12 * (int16_t)VY0 ) + ( (int16_t)L13 * (int16_t)VZ0 ) ) >> 12 );
+			MAC2 = A2( ( ( (int64_t)(int16_t)L21 * (int16_t)VX0 ) + ( (int16_t)L22 * (int16_t)VY0 ) + ( (int16_t)L23 * (int16_t)VZ0 ) ) >> 12 );
+			MAC3 = A3( ( ( (int64_t)(int16_t)L31 * (int16_t)VX0 ) + ( (int16_t)L32 * (int16_t)VY0 ) + ( (int16_t)L33 * (int16_t)VZ0 ) ) >> 12 );
+			IR1 = Lm_B1( (int32_t)MAC1, 1 );
+			IR2 = Lm_B2( (int32_t)MAC2, 1 );
+			IR3 = Lm_B3( (int32_t)MAC3, 1 );
+			MAC1 = A1( ( ( (int64_t)RBK << 12 ) + ( (int16_t)LR1 * (int16_t)IR1 ) + ( (int16_t)LR2 * (int16_t)IR2 ) + ( (int16_t)LR3 * (int16_t)IR3 ) ) >> 12 );
+			MAC2 = A2( ( ( (int64_t)GBK << 12 ) + ( (int16_t)LG1 * (int16_t)IR1 ) + ( (int16_t)LG2 * (int16_t)IR2 ) + ( (int16_t)LG3 * (int16_t)IR3 ) ) >> 12 );
+			MAC3 = A3( ( ( (int64_t)BBK << 12 ) + ( (int16_t)LB1 * (int16_t)IR1 ) + ( (int16_t)LB2 * (int16_t)IR2 ) + ( (int16_t)LB3 * (int16_t)IR3 ) ) >> 12 );
+			IR1 = Lm_B1( (int32_t)MAC1, 1 );
+			IR2 = Lm_B2( (int32_t)MAC2, 1 );
+			IR3 = Lm_B3( (int32_t)MAC3, 1 );
+			MAC1 = A1( ( (int64_t)R * (int16_t)IR1 ) >> 8 );
+			MAC2 = A2( ( (int64_t)G * (int16_t)IR2 ) >> 8 );
+			MAC3 = A3( ( (int64_t)B * (int16_t)IR3 ) >> 8 );
+			IR1 = Lm_B1( (int32_t)MAC1, 1 );
+			IR2 = Lm_B2( (int32_t)MAC2, 1 );
+			IR3 = Lm_B3( (int32_t)MAC3, 1 );
 			CD0 = CD1;
 			CD1 = CD2;
 			CD2 = CODE;
 			R0 = R1;
 			R1 = R2;
-			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			R2 = Lm_C1( (int32_t)MAC1 >> 4 );
 			G0 = G1;
 			G1 = G2;
-			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			G2 = Lm_C2( (int32_t)MAC2 >> 4 );
 			B0 = B1;
 			B1 = B2;
-			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			B2 = Lm_C3( (int32_t)MAC3 >> 4 );
 			return;
 		}
 		break;
@@ -2301,15 +2301,15 @@
 			GTELOG( "CC" );
 			FLAG = 0;
 
-			MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
-			MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
-			MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
+			MAC1 = A1( ( ( (int64_t)RBK << 12 ) + ( (int16_t)LR1 * (int16_t)IR1 ) + ( (int16_t)LR2 * (int16_t)IR2 ) + ( (int16_t)LR3 * (int16_t)IR3 ) ) >> 12 );
+			MAC2 = A2( ( ( (int64_t)GBK << 12 ) + ( (int16_t)LG1 * (int16_t)IR1 ) + ( (int16_t)LG2 * (int16_t)IR2 ) + ( (int16_t)LG3 * (int16_t)IR3 ) ) >> 12 );
+			MAC3 = A3( ( ( (int64_t)BBK << 12 ) + ( (int16_t)LB1 * (int16_t)IR1 ) + ( (int16_t)LB2 * (int16_t)IR2 ) + ( (int16_t)LB3 * (int16_t)IR3 ) ) >> 12 );
 			IR1 = Lm_B1( MAC1, 1 );
 			IR2 = Lm_B2( MAC2, 1 );
 			IR3 = Lm_B3( MAC3, 1 );
-			MAC1 = A1( ( (INT64)R * (INT16)IR1 ) >> 8 );
-			MAC2 = A2( ( (INT64)G * (INT16)IR2 ) >> 8 );
-			MAC3 = A3( ( (INT64)B * (INT16)IR3 ) >> 8 );
+			MAC1 = A1( ( (int64_t)R * (int16_t)IR1 ) >> 8 );
+			MAC2 = A2( ( (int64_t)G * (int16_t)IR2 ) >> 8 );
+			MAC3 = A3( ( (int64_t)B * (int16_t)IR3 ) >> 8 );
 			IR1 = Lm_B1( MAC1, 1 );
 			IR2 = Lm_B2( MAC2, 1 );
 			IR3 = Lm_B3( MAC3, 1 );
@@ -2318,13 +2318,13 @@
 			CD2 = CODE;
 			R0 = R1;
 			R1 = R2;
-			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			R2 = Lm_C1( (int32_t)MAC1 >> 4 );
 			G0 = G1;
 			G1 = G2;
-			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			G2 = Lm_C2( (int32_t)MAC2 >> 4 );
 			B0 = B1;
 			B1 = B2;
-			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			B2 = Lm_C3( (int32_t)MAC3 >> 4 );
 			return;
 		}
 		break;
@@ -2334,30 +2334,30 @@
 			GTELOG( "NCS" );
 			FLAG = 0;
 
-			MAC1 = A1( ( ( (INT64)(INT16)L11 * (INT16)VX0 ) + ( (INT16)L12 * (INT16)VY0 ) + ( (INT16)L13 * (INT16)VZ0 ) ) >> 12 );
-			MAC2 = A2( ( ( (INT64)(INT16)L21 * (INT16)VX0 ) + ( (INT16)L22 * (INT16)VY0 ) + ( (INT16)L23 * (INT16)VZ0 ) ) >> 12 );
-			MAC3 = A3( ( ( (INT64)(INT16)L31 * (INT16)VX0 ) + ( (INT16)L32 * (INT16)VY0 ) + ( (INT16)L33 * (INT16)VZ0 ) ) >> 12 );
-			IR1 = Lm_B1( (INT32)MAC1, 1 );
-			IR2 = Lm_B2( (INT32)MAC2, 1 );
-			IR3 = Lm_B3( (INT32)MAC3, 1 );
-			MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
-			MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
-			MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
-			IR1 = Lm_B1( (INT32)MAC1, 1 );
-			IR2 = Lm_B2( (INT32)MAC2, 1 );
-			IR3 = Lm_B3( (INT32)MAC3, 1 );
+			MAC1 = A1( ( ( (int64_t)(int16_t)L11 * (int16_t)VX0 ) + ( (int16_t)L12 * (int16_t)VY0 ) + ( (int16_t)L13 * (int16_t)VZ0 ) ) >> 12 );
+			MAC2 = A2( ( ( (int64_t)(int16_t)L21 * (int16_t)VX0 ) + ( (int16_t)L22 * (int16_t)VY0 ) + ( (int16_t)L23 * (int16_t)VZ0 ) ) >> 12 );
+			MAC3 = A3( ( ( (int64_t)(int16_t)L31 * (int16_t)VX0 ) + ( (int16_t)L32 * (int16_t)VY0 ) + ( (int16_t)L33 * (int16_t)VZ0 ) ) >> 12 );
+			IR1 = Lm_B1( (int32_t)MAC1, 1 );
+			IR2 = Lm_B2( (int32_t)MAC2, 1 );
+			IR3 = Lm_B3( (int32_t)MAC3, 1 );
+			MAC1 = A1( ( ( (int64_t)RBK << 12 ) + ( (int16_t)LR1 * (int16_t)IR1 ) + ( (int16_t)LR2 * (int16_t)IR2 ) + ( (int16_t)LR3 * (int16_t)IR3 ) ) >> 12 );
+			MAC2 = A2( ( ( (int64_t)GBK << 12 ) + ( (int16_t)LG1 * (int16_t)IR1 ) + ( (int16_t)LG2 * (int16_t)IR2 ) + ( (int16_t)LG3 * (int16_t)IR3 ) ) >> 12 );
+			MAC3 = A3( ( ( (int64_t)BBK << 12 ) + ( (int16_t)LB1 * (int16_t)IR1 ) + ( (int16_t)LB2 * (int16_t)IR2 ) + ( (int16_t)LB3 * (int16_t)IR3 ) ) >> 12 );
+			IR1 = Lm_B1( (int32_t)MAC1, 1 );
+			IR2 = Lm_B2( (int32_t)MAC2, 1 );
+			IR3 = Lm_B3( (int32_t)MAC3, 1 );
 			CD0 = CD1;
 			CD1 = CD2;
 			CD2 = CODE;
 			R0 = R1;
 			R1 = R2;
-			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			R2 = Lm_C1( (int32_t)MAC1 >> 4 );
 			G0 = G1;
 			G1 = G2;
-			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			G2 = Lm_C2( (int32_t)MAC2 >> 4 );
 			B0 = B1;
 			B1 = B2;
-			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			B2 = Lm_C3( (int32_t)MAC3 >> 4 );
 			return;
 		}
 		break;
@@ -2369,30 +2369,30 @@
 
 			for( n_v = 0; n_v < 3; n_v++ )
 			{
-				MAC1 = A1( ( ( (INT64)(INT16)L11 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L12 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L13 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
-				MAC2 = A2( ( ( (INT64)(INT16)L21 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L22 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L23 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
-				MAC3 = A3( ( ( (INT64)(INT16)L31 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L32 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L33 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
-				IR1 = Lm_B1( (INT32)MAC1, 1 );
-				IR2 = Lm_B2( (INT32)MAC2, 1 );
-				IR3 = Lm_B3( (INT32)MAC3, 1 );
-				MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
-				MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
-				MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
-				IR1 = Lm_B1( (INT32)MAC1, 1 );
-				IR2 = Lm_B2( (INT32)MAC2, 1 );
-				IR3 = Lm_B3( (INT32)MAC3, 1 );
+				MAC1 = A1( ( ( (int64_t)(int16_t)L11 * (int16_t)*p_n_vx[ n_v ] ) + ( (int16_t)L12 * (int16_t)*p_n_vy[ n_v ] ) + ( (int16_t)L13 * (int16_t)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC2 = A2( ( ( (int64_t)(int16_t)L21 * (int16_t)*p_n_vx[ n_v ] ) + ( (int16_t)L22 * (int16_t)*p_n_vy[ n_v ] ) + ( (int16_t)L23 * (int16_t)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC3 = A3( ( ( (int64_t)(int16_t)L31 * (int16_t)*p_n_vx[ n_v ] ) + ( (int16_t)L32 * (int16_t)*p_n_vy[ n_v ] ) + ( (int16_t)L33 * (int16_t)*p_n_vz[ n_v ] ) ) >> 12 );
+				IR1 = Lm_B1( (int32_t)MAC1, 1 );
+				IR2 = Lm_B2( (int32_t)MAC2, 1 );
+				IR3 = Lm_B3( (int32_t)MAC3, 1 );
+				MAC1 = A1( ( ( (int64_t)RBK << 12 ) + ( (int16_t)LR1 * (int16_t)IR1 ) + ( (int16_t)LR2 * (int16_t)IR2 ) + ( (int16_t)LR3 * (int16_t)IR3 ) ) >> 12 );
+				MAC2 = A2( ( ( (int64_t)GBK << 12 ) + ( (int16_t)LG1 * (int16_t)IR1 ) + ( (int16_t)LG2 * (int16_t)IR2 ) + ( (int16_t)LG3 * (int16_t)IR3 ) ) >> 12 );
+				MAC3 = A3( ( ( (int64_t)BBK << 12 ) + ( (int16_t)LB1 * (int16_t)IR1 ) + ( (int16_t)LB2 * (int16_t)IR2 ) + ( (int16_t)LB3 * (int16_t)IR3 ) ) >> 12 );
+				IR1 = Lm_B1( (int32_t)MAC1, 1 );
+				IR2 = Lm_B2( (int32_t)MAC2, 1 );
+				IR3 = Lm_B3( (int32_t)MAC3, 1 );
 				CD0 = CD1;
 				CD1 = CD2;
 				CD2 = CODE;
 				R0 = R1;
 				R1 = R2;
-				R2 = Lm_C1( (INT32)MAC1 >> 4 );
+				R2 = Lm_C1( (int32_t)MAC1 >> 4 );
 				G0 = G1;
 				G1 = G2;
-				G2 = Lm_C2( (INT32)MAC2 >> 4 );
+				G2 = Lm_C2( (int32_t)MAC2 >> 4 );
 				B0 = B1;
 				B1 = B2;
-				B2 = Lm_C3( (INT32)MAC3 >> 4 );
+				B2 = Lm_C3( (int32_t)MAC3 >> 4 );
 			}
 			return;
 		}
@@ -2404,9 +2404,9 @@
 			n_sf = 12 * GTE_SF( gteop );
 			FLAG = 0;
 
-			MAC1 = A1( ( (INT64)(INT16)IR1 * (INT16)IR1 ) >> n_sf );
-			MAC2 = A2( ( (INT64)(INT16)IR2 * (INT16)IR2 ) >> n_sf );
-			MAC3 = A3( ( (INT64)(INT16)IR3 * (INT16)IR3 ) >> n_sf );
+			MAC1 = A1( ( (int64_t)(int16_t)IR1 * (int16_t)IR1 ) >> n_sf );
+			MAC2 = A2( ( (int64_t)(int16_t)IR2 * (int16_t)IR2 ) >> n_sf );
+			MAC3 = A3( ( (int64_t)(int16_t)IR3 * (int16_t)IR3 ) >> n_sf );
 			IR1 = Lm_B1( MAC1, 1 );
 			IR2 = Lm_B2( MAC2, 1 );
 			IR3 = Lm_B3( MAC3, 1 );
@@ -2422,24 +2422,24 @@
 
 			for( n_pass = 0; n_pass < 3; n_pass++ )
 			{
-				MAC1 = A1( ( ( (INT64)R0 << 16 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)RFC - ( R0 << 4 ), 0 ) ) ) ) >> 12 );
-				MAC2 = A2( ( ( (INT64)G0 << 16 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)GFC - ( G0 << 4 ), 0 ) ) ) ) >> 12 );
-				MAC3 = A3( ( ( (INT64)B0 << 16 ) + ( (INT64)(INT16)IR0 * ( Lm_B1( (INT32)BFC - ( B0 << 4 ), 0 ) ) ) ) >> 12 );
-				IR1 = Lm_B1( (INT32)MAC1, 0 );
-				IR2 = Lm_B2( (INT32)MAC2, 0 );
-				IR3 = Lm_B3( (INT32)MAC3, 0 );
+				MAC1 = A1( ( ( (int64_t)R0 << 16 ) + ( (int64_t)(int16_t)IR0 * ( Lm_B1( (int32_t)RFC - ( R0 << 4 ), 0 ) ) ) ) >> 12 );
+				MAC2 = A2( ( ( (int64_t)G0 << 16 ) + ( (int64_t)(int16_t)IR0 * ( Lm_B1( (int32_t)GFC - ( G0 << 4 ), 0 ) ) ) ) >> 12 );
+				MAC3 = A3( ( ( (int64_t)B0 << 16 ) + ( (int64_t)(int16_t)IR0 * ( Lm_B1( (int32_t)BFC - ( B0 << 4 ), 0 ) ) ) ) >> 12 );
+				IR1 = Lm_B1( (int32_t)MAC1, 0 );
+				IR2 = Lm_B2( (int32_t)MAC2, 0 );
+				IR3 = Lm_B3( (int32_t)MAC3, 0 );
 				CD0 = CD1;
 				CD1 = CD2;
 				CD2 = CODE;
 				R0 = R1;
 				R1 = R2;
-				R2 = Lm_C1( (INT32)MAC1 >> 4 );
+				R2 = Lm_C1( (int32_t)MAC1 >> 4 );
 				G0 = G1;
 				G1 = G2;
-				G2 = Lm_C2( (INT32)MAC2 >> 4 );
+				G2 = Lm_C2( (int32_t)MAC2 >> 4 );
 				B0 = B1;
 				B1 = B2;
-				B2 = Lm_C3( (INT32)MAC3 >> 4 );
+				B2 = Lm_C3( (int32_t)MAC3 >> 4 );
 			}
 			return;
 		}
@@ -2450,8 +2450,8 @@
 			GTELOG( "AVSZ3" );
 			FLAG = 0;
 
-			MAC0 = F( ( (INT64)(INT16)ZSF3 * SZ1 ) + ( (INT16)ZSF3 * SZ2 ) + ( (INT16)ZSF3 * SZ3 ) );
-			OTZ = Lm_D( (INT32)MAC0 >> 12 );
+			MAC0 = F( ( (int64_t)(int16_t)ZSF3 * SZ1 ) + ( (int16_t)ZSF3 * SZ2 ) + ( (int16_t)ZSF3 * SZ3 ) );
+			OTZ = Lm_D( (int32_t)MAC0 >> 12 );
 			return;
 		}
 		break;
@@ -2461,8 +2461,8 @@
 			GTELOG( "AVSZ4" );
 			FLAG = 0;
 
-			MAC0 = F( ( (INT64)(INT16)ZSF4 * SZ0 ) + ( (INT16)ZSF4 * SZ1 ) + ( (INT16)ZSF4 * SZ2 ) + ( (INT16)ZSF4 * SZ3 ) );
-			OTZ = Lm_D( (INT32)MAC0 >> 12 );
+			MAC0 = F( ( (int64_t)(int16_t)ZSF4 * SZ0 ) + ( (int16_t)ZSF4 * SZ1 ) + ( (int16_t)ZSF4 * SZ2 ) + ( (int16_t)ZSF4 * SZ3 ) );
+			OTZ = Lm_D( (int32_t)MAC0 >> 12 );
 			return;
 		}
 		break;
@@ -2474,22 +2474,22 @@
 
 			for( n_v = 0; n_v < 3; n_v++ )
 			{
-				MAC1 = A1( ( ( (INT64)(INT32)TRX << 12 ) + ( (INT16)R11 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)R12 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)R13 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
-				MAC2 = A2( ( ( (INT64)(INT32)TRY << 12 ) + ( (INT16)R21 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)R22 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)R23 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
-				MAC3 = A3( ( ( (INT64)(INT32)TRZ << 12 ) + ( (INT16)R31 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)R32 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)R33 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
-				IR1 = Lm_B1( (INT32)MAC1, 0 );
-				IR2 = Lm_B2( (INT32)MAC2, 0 );
-				IR3 = Lm_B3( (INT32)MAC3, 0 );
+				MAC1 = A1( ( ( (int64_t)(int32_t)TRX << 12 ) + ( (int16_t)R11 * (int16_t)*p_n_vx[ n_v ] ) + ( (int16_t)R12 * (int16_t)*p_n_vy[ n_v ] ) + ( (int16_t)R13 * (int16_t)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC2 = A2( ( ( (int64_t)(int32_t)TRY << 12 ) + ( (int16_t)R21 * (int16_t)*p_n_vx[ n_v ] ) + ( (int16_t)R22 * (int16_t)*p_n_vy[ n_v ] ) + ( (int16_t)R23 * (int16_t)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC3 = A3( ( ( (int64_t)(int32_t)TRZ << 12 ) + ( (int16_t)R31 * (int16_t)*p_n_vx[ n_v ] ) + ( (int16_t)R32 * (int16_t)*p_n_vy[ n_v ] ) + ( (int16_t)R33 * (int16_t)*p_n_vz[ n_v ] ) ) >> 12 );
+				IR1 = Lm_B1( (int32_t)MAC1, 0 );
+				IR2 = Lm_B2( (int32_t)MAC2, 0 );
+				IR3 = Lm_B3( (int32_t)MAC3, 0 );
 				SZ0 = SZ1;
 				SZ1 = SZ2;
 				SZ2 = SZ3;
-				SZ3 = Lm_D( (INT32)MAC3 );
+				SZ3 = Lm_D( (int32_t)MAC3 );
 				SXY0 = SXY1;
 				SXY1 = SXY2;
-				SX2 = Lm_G1( F( ( (INT64)(INT32)OFX + ( (INT64)(INT16)IR1 * ( ( (UINT32)H << 16 ) / Lm_E( SZ3 ) ) ) ) >> 16 ) );
-				SY2 = Lm_G2( F( ( (INT64)(INT32)OFY + ( (INT64)(INT16)IR2 * ( ( (UINT32)H << 16 ) / Lm_E( SZ3 ) ) ) ) >> 16 ) );
-				MAC0 = F( (INT64)(INT32)DQB + ( (INT64)(INT16)DQA * ( ( (UINT32)H << 16 ) / Lm_E( SZ3 ) ) ) );
-				IR0 = Lm_H( (INT32)MAC0 >> 12 );
+				SX2 = Lm_G1( F( ( (int64_t)(int32_t)OFX + ( (int64_t)(int16_t)IR1 * ( ( (uint32_t)H << 16 ) / Lm_E( SZ3 ) ) ) ) >> 16 ) );
+				SY2 = Lm_G2( F( ( (int64_t)(int32_t)OFY + ( (int64_t)(int16_t)IR2 * ( ( (uint32_t)H << 16 ) / Lm_E( SZ3 ) ) ) ) >> 16 ) );
+				MAC0 = F( (int64_t)(int32_t)DQB + ( (int64_t)(int16_t)DQA * ( ( (uint32_t)H << 16 ) / Lm_E( SZ3 ) ) ) );
+				IR0 = Lm_H( (int32_t)MAC0 >> 12 );
 			}
 			return;
 		}
@@ -2502,24 +2502,24 @@
 			n_sf = 12 * GTE_SF( gteop );
 			FLAG = 0;
 
-			MAC1 = A1( ( (INT64)(INT16)IR0 * (INT16)IR1 ) >> n_sf );
-			MAC2 = A2( ( (INT64)(INT16)IR0 * (INT16)IR2 ) >> n_sf );
-			MAC3 = A3( ( (INT64)(INT16)IR0 * (INT16)IR3 ) >> n_sf );
-			IR1 = Lm_B1( (INT32)MAC1, 0 );
-			IR2 = Lm_B2( (INT32)MAC2, 0 );
-			IR3 = Lm_B3( (INT32)MAC3, 0 );
+			MAC1 = A1( ( (int64_t)(int16_t)IR0 * (int16_t)IR1 ) >> n_sf );
+			MAC2 = A2( ( (int64_t)(int16_t)IR0 * (int16_t)IR2 ) >> n_sf );
+			MAC3 = A3( ( (int64_t)(int16_t)IR0 * (int16_t)IR3 ) >> n_sf );
+			IR1 = Lm_B1( (int32_t)MAC1, 0 );
+			IR2 = Lm_B2( (int32_t)MAC2, 0 );
+			IR3 = Lm_B3( (int32_t)MAC3, 0 );
 			CD0 = CD1;
 			CD1 = CD2;
 			CD2 = CODE;
 			R0 = R1;
 			R1 = R2;
-			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			R2 = Lm_C1( (int32_t)MAC1 >> 4 );
 			G0 = G1;
 			G1 = G2;
-			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			G2 = Lm_C2( (int32_t)MAC2 >> 4 );
 			B0 = B1;
 			B1 = B2;
-			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			B2 = Lm_C3( (int32_t)MAC3 >> 4 );
 			return;
 		}
 		break;
@@ -2530,24 +2530,24 @@
 			n_sf = 12 * GTE_SF( gteop );
 			FLAG = 0;
 
-			MAC1 = A1( ( ( (INT64)(INT32)MAC1 << n_sf ) + ( (INT16)IR0 * (INT16)IR1 ) ) >> n_sf );
-			MAC2 = A2( ( ( (INT64)(INT32)MAC2 << n_sf ) + ( (INT16)IR0 * (INT16)IR2 ) ) >> n_sf );
-			MAC3 = A3( ( ( (INT64)(INT32)MAC3 << n_sf ) + ( (INT16)IR0 * (INT16)IR3 ) ) >> n_sf );
-			IR1 = Lm_B1( (INT32)MAC1, 0 );
-			IR2 = Lm_B2( (INT32)MAC2, 0 );
-			IR3 = Lm_B3( (INT32)MAC3, 0 );
+			MAC1 = A1( ( ( (int64_t)(int32_t)MAC1 << n_sf ) + ( (int16_t)IR0 * (int16_t)IR1 ) ) >> n_sf );
+			MAC2 = A2( ( ( (int64_t)(int32_t)MAC2 << n_sf ) + ( (int16_t)IR0 * (int16_t)IR2 ) ) >> n_sf );
+			MAC3 = A3( ( ( (int64_t)(int32_t)MAC3 << n_sf ) + ( (int16_t)IR0 * (int16_t)IR3 ) ) >> n_sf );
+			IR1 = Lm_B1( (int32_t)MAC1, 0 );
+			IR2 = Lm_B2( (int32_t)MAC2, 0 );
+			IR3 = Lm_B3( (int32_t)MAC3, 0 );
 			CD0 = CD1;
 			CD1 = CD2;
 			CD2 = CODE;
 			R0 = R1;
 			R1 = R2;
-			R2 = Lm_C1( (INT32)MAC1 >> 4 );
+			R2 = Lm_C1( (int32_t)MAC1 >> 4 );
 			G0 = G1;
 			G1 = G2;
-			G2 = Lm_C2( (INT32)MAC2 >> 4 );
+			G2 = Lm_C2( (int32_t)MAC2 >> 4 );
 			B0 = B1;
 			B1 = B2;
-			B2 = Lm_C3( (INT32)MAC3 >> 4 );
+			B2 = Lm_C3( (int32_t)MAC3 >> 4 );
 			return;
 		}
 		break;
@@ -2560,36 +2560,36 @@
 
 			for( n_v = 0; n_v < 3; n_v++ )
 			{
-				MAC1 = A1( ( ( (INT64)(INT16)L11 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L12 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L13 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
-				MAC2 = A2( ( ( (INT64)(INT16)L21 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L22 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L23 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
-				MAC3 = A3( ( ( (INT64)(INT16)L31 * (INT16)*p_n_vx[ n_v ] ) + ( (INT16)L32 * (INT16)*p_n_vy[ n_v ] ) + ( (INT16)L33 * (INT16)*p_n_vz[ n_v ] ) ) >> 12 );
-				IR1 = Lm_B1( (INT32)MAC1, 1 );
-				IR2 = Lm_B2( (INT32)MAC2, 1 );
-				IR3 = Lm_B3( (INT32)MAC3, 1 );
-				MAC1 = A1( ( ( (INT64)RBK << 12 ) + ( (INT16)LR1 * (INT16)IR1 ) + ( (INT16)LR2 * (INT16)IR2 ) + ( (INT16)LR3 * (INT16)IR3 ) ) >> 12 );
-				MAC2 = A2( ( ( (INT64)GBK << 12 ) + ( (INT16)LG1 * (INT16)IR1 ) + ( (INT16)LG2 * (INT16)IR2 ) + ( (INT16)LG3 * (INT16)IR3 ) ) >> 12 );
-				MAC3 = A3( ( ( (INT64)BBK << 12 ) + ( (INT16)LB1 * (INT16)IR1 ) + ( (INT16)LB2 * (INT16)IR2 ) + ( (INT16)LB3 * (INT16)IR3 ) ) >> 12 );
-				IR1 = Lm_B1( (INT32)MAC1, 1 );
-				IR2 = Lm_B2( (INT32)MAC2, 1 );
-				IR3 = Lm_B3( (INT32)MAC3, 1 );
-				MAC1 = A1( ( (INT64)R * (INT16)IR1 ) >> 8 );
-				MAC2 = A2( ( (INT64)G * (INT16)IR2 ) >> 8 );
-				MAC3 = A3( ( (INT64)B * (INT16)IR3 ) >> 8 );
-				IR1 = Lm_B1( (INT32)MAC1, 1 );
-				IR2 = Lm_B2( (INT32)MAC2, 1 );
-				IR3 = Lm_B3( (INT32)MAC3, 1 );
+				MAC1 = A1( ( ( (int64_t)(int16_t)L11 * (int16_t)*p_n_vx[ n_v ] ) + ( (int16_t)L12 * (int16_t)*p_n_vy[ n_v ] ) + ( (int16_t)L13 * (int16_t)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC2 = A2( ( ( (int64_t)(int16_t)L21 * (int16_t)*p_n_vx[ n_v ] ) + ( (int16_t)L22 * (int16_t)*p_n_vy[ n_v ] ) + ( (int16_t)L23 * (int16_t)*p_n_vz[ n_v ] ) ) >> 12 );
+				MAC3 = A3( ( ( (int64_t)(int16_t)L31 * (int16_t)*p_n_vx[ n_v ] ) + ( (int16_t)L32 * (int16_t)*p_n_vy[ n_v ] ) + ( (int16_t)L33 * (int16_t)*p_n_vz[ n_v ] ) ) >> 12 );
+				IR1 = Lm_B1( (int32_t)MAC1, 1 );
+				IR2 = Lm_B2( (int32_t)MAC2, 1 );
+				IR3 = Lm_B3( (int32_t)MAC3, 1 );
+				MAC1 = A1( ( ( (int64_t)RBK << 12 ) + ( (int16_t)LR1 * (int16_t)IR1 ) + ( (int16_t)LR2 * (int16_t)IR2 ) + ( (int16_t)LR3 * (int16_t)IR3 ) ) >> 12 );
+				MAC2 = A2( ( ( (int64_t)GBK << 12 ) + ( (int16_t)LG1 * (int16_t)IR1 ) + ( (int16_t)LG2 * (int16_t)IR2 ) + ( (int16_t)LG3 * (int16_t)IR3 ) ) >> 12 );
+				MAC3 = A3( ( ( (int64_t)BBK << 12 ) + ( (int16_t)LB1 * (int16_t)IR1 ) + ( (int16_t)LB2 * (int16_t)IR2 ) + ( (int16_t)LB3 * (int16_t)IR3 ) ) >> 12 );
+				IR1 = Lm_B1( (int32_t)MAC1, 1 );
+				IR2 = Lm_B2( (int32_t)MAC2, 1 );
+				IR3 = Lm_B3( (int32_t)MAC3, 1 );
+				MAC1 = A1( ( (int64_t)R * (int16_t)IR1 ) >> 8 );
+				MAC2 = A2( ( (int64_t)G * (int16_t)IR2 ) >> 8 );
+				MAC3 = A3( ( (int64_t)B * (int16_t)IR3 ) >> 8 );
+				IR1 = Lm_B1( (int32_t)MAC1, 1 );
+				IR2 = Lm_B2( (int32_t)MAC2, 1 );
+				IR3 = Lm_B3( (int32_t)MAC3, 1 );
 				CD0 = CD1;
 				CD1 = CD2;
 				CD2 = CODE;
 				R0 = R1;
 				R1 = R2;
-				R2 = Lm_C1( (INT32)MAC1 >> 4 );
+				R2 = Lm_C1( (int32_t)MAC1 >> 4 );
 				G0 = G1;
 				G1 = G2;
-				G2 = Lm_C2( (INT32)MAC2 >> 4 );
+				G2 = Lm_C2( (int32_t)MAC2 >> 4 );
 				B0 = B1;
 				B1 = B2;
-				B2 = Lm_C3( (INT32)MAC3 >> 4 );
+				B2 = Lm_C3( (int32_t)MAC3 >> 4 );
 			}
 			return;
 		}
@@ -2604,7 +2604,7 @@
 * Generic set_info
 **************************************************************************/
 
-void mips_set_info(UINT32 state, union cpuinfo *info)
+void mips_set_info(uint32_t state, union cpuinfo *info)
 {
 	switch (state)
 	{
@@ -2763,7 +2763,7 @@
 * Generic get_info
 **************************************************************************/
 
-void mips_get_info(UINT32 state, union cpuinfo *info)
+void mips_get_info(uint32_t state, union cpuinfo *info)
 {
 	switch (state)
 	{
@@ -2954,22 +2954,22 @@
 	}
 }
 
-uint32 mips_get_cause(void)
+uint32_t mips_get_cause(void)
 {
 	return mipscpu.cp0r[ CP0_CAUSE ];
 }
 
-uint32 mips_get_status(void)
+uint32_t mips_get_status(void)
 {
 	return mipscpu.cp0r[ CP0_SR ];
 }
 
-void mips_set_status(uint32 status)
+void mips_set_status(uint32_t status)
 {
 	mipscpu.cp0r[ CP0_SR ] = status;
 }
 
-uint32 mips_get_ePC(void)
+uint32_t mips_get_ePC(void)
 {
 	return mipscpu.cp0r[ CP0_EPC ];
 }
@@ -2990,7 +2990,7 @@
 * CPU-specific set_info
 **************************************************************************/
 
-void psxcpu_get_info(UINT32 state, union cpuinfo *info)
+void psxcpu_get_info(uint32_t state, union cpuinfo *info)
 {
 	switch (state)
 	{

audacious-plugins-3.3.4.tar.bz2/src/psf/psx.h -> audacious-plugins-3.4.2.tar.bz2/src/psf/psx.h Changed

@@ -21,14 +21,14 @@
 #define UNUSEDARG
 #endif
 
-typedef int8		(*read8_handler)  (UNUSEDARG offs_t offset);
-typedef void		(*write8_handler) (UNUSEDARG offs_t offset, UNUSEDARG int8 data);
-typedef int16		(*read16_handler) (UNUSEDARG offs_t offset, UNUSEDARG int16 mem_mask);
-typedef void		(*write16_handler)(UNUSEDARG offs_t offset, UNUSEDARG int16 data, UNUSEDARG int16 mem_mask);
-typedef int32		(*read32_handler) (UNUSEDARG offs_t offset, UNUSEDARG int32 mem_mask);
-typedef void		(*write32_handler)(UNUSEDARG offs_t offset, UNUSEDARG int32 data, UNUSEDARG int32 mem_mask);
-typedef int64		(*read64_handler) (UNUSEDARG offs_t offset, UNUSEDARG int64 mem_mask);
-typedef void		(*write64_handler)(UNUSEDARG offs_t offset, UNUSEDARG int64 data, UNUSEDARG int64 mem_mask);
+typedef int8_t		(*read8_handler)  (UNUSEDARG offs_t offset);
+typedef void		(*write8_handler) (UNUSEDARG offs_t offset, UNUSEDARG int8_t data);
+typedef int16_t		(*read16_handler) (UNUSEDARG offs_t offset, UNUSEDARG int16_t mem_mask);
+typedef void		(*write16_handler)(UNUSEDARG offs_t offset, UNUSEDARG int16_t data, UNUSEDARG int16_t mem_mask);
+typedef int32_t		(*read32_handler) (UNUSEDARG offs_t offset, UNUSEDARG int32_t mem_mask);
+typedef void		(*write32_handler)(UNUSEDARG offs_t offset, UNUSEDARG int32_t data, UNUSEDARG int32_t mem_mask);
+typedef int64_t		(*read64_handler) (UNUSEDARG offs_t offset, UNUSEDARG int64_t mem_mask);
+typedef void		(*write64_handler)(UNUSEDARG offs_t offset, UNUSEDARG int64_t data, UNUSEDARG int64_t mem_mask);
 
 union read_handlers_t
 {
@@ -50,14 +50,14 @@
 
 struct address_map_t
 {
-	uint32				flags;				/* flags and additional info about this entry */
+	uint32_t				flags;				/* flags and additional info about this entry */
 	offs_t				start, end;			/* start/end (or mask/match) values */
 	offs_t				mirror;				/* mirror bits */
 	offs_t				mask;				/* mask bits */
 	union read_handlers_t read;				/* read handler callback */
 	union write_handlers_t write;			/* write handler callback */
 	void *				memory;				/* pointer to memory backing this entry */
-	uint32				share;				/* index of a shared memory block */
+	uint32_t				share;				/* index of a shared memory block */
 	void **				base;				/* receives pointer to memory (optional) */
 	size_t *			size;				/* receives size of area in bytes (optional) */
 };
@@ -65,12 +65,12 @@
 
 union cpuinfo
 {
-	int64	i;											/* generic integers */
+	int64_t	i;											/* generic integers */
 	void *	p;											/* generic pointers */
 	genf *  f;											/* generic function pointers */
 	char *	s;											/* generic strings */
 
-	void	(*setinfo)(UINT32 state, union cpuinfo *info);/* CPUINFO_PTR_SET_INFO */
+	void	(*setinfo)(uint32_t state, union cpuinfo *info);/* CPUINFO_PTR_SET_INFO */
 	void	(*getcontext)(void *context);				/* CPUINFO_PTR_GET_CONTEXT */
 	void	(*setcontext)(void *context);				/* CPUINFO_PTR_SET_CONTEXT */
 	void	(*init)(void);								/* CPUINFO_PTR_INIT */
@@ -164,8 +164,8 @@
 #define MIPS_IRQ4	( 4 )
 #define MIPS_IRQ5	( 5 )
 
-#define MIPS_BYTE_EXTEND( a ) ( (INT32)(INT8)a )
-#define MIPS_WORD_EXTEND( a ) ( (INT32)(INT16)a )
+#define MIPS_BYTE_EXTEND( a ) ( (int32_t)(int8_t)a )
+#define MIPS_WORD_EXTEND( a ) ( (int32_t)(int16_t)a )
 
 #define INS_OP( op ) ( ( op >> 26 ) & 63 )
 #define INS_RS( op ) ( ( op >> 21 ) & 31 )
@@ -234,7 +234,7 @@
 #define FUNCT_SRLV ( 6 )
 #define FUNCT_SRAV ( 7 )
 #define FUNCT_JR ( 8 )
-#define FUNCT_JALR ( 9 )	   
+#define FUNCT_JALR ( 9 )
 #define FUNCT_HLECALL ( 11 )
 #define FUNCT_SYSCALL ( 12 )
 #define FUNCT_BREAK ( 13 )
@@ -282,7 +282,7 @@
 #endif
 
 #if (HAS_PSXCPU)
-extern void psxcpu_get_info(UINT32 state, union cpuinfo *info);
+extern void psxcpu_get_info(uint32_t state, union cpuinfo *info);
 #endif
 
 #endif

audacious-plugins-3.3.4.tar.bz2/src/psf/psx_hw.c -> audacious-plugins-3.4.2.tar.bz2/src/psf/psx_hw.c Changed

@@ -47,10 +47,12 @@
 */
 
 #include <stdio.h>
+#include <glib.h>
+
 #include "ao.h"
 #include "cpuintrf.h"
 #include "psx.h"
-	
+
 #define DEBUG_HLE_BIOS	(0)		// debug PS1 HLE BIOS
 #define DEBUG_SPU	(0)		// debug PS1 SPU read/write
 #define DEBUG_SPU2	(0)		// debug PS2 SPU read/write
@@ -58,17 +60,19 @@
 #define DEBUG_UNK_RW	(0)		// debug unknown reads/writes
 #define DEBUG_THREADING (0)		// debug PS2 IOP threading
 
-extern void mips_get_info(UINT32 state, union cpuinfo *info);
-extern void mips_set_info(UINT32 state, union cpuinfo *info);
+#define LE32(x) GUINT32_FROM_LE(x)
+
+extern void mips_get_info(uint32_t state, union cpuinfo *info);
+extern void mips_set_info(uint32_t state, union cpuinfo *info);
 extern int psxcpu_verbose;
-extern uint16 SPUreadRegister(uint32 reg);
-extern void SPUwriteRegister(uint32 reg, uint16 val);
-extern void SPUwriteDMAMem(uint32 usPSXMem,int iSize);
-extern void SPUreadDMAMem(uint32 usPSXMem,int iSize);
+extern uint16_t SPUreadRegister(uint32_t reg);
+extern void SPUwriteRegister(uint32_t reg, uint16_t val);
+extern void SPUwriteDMAMem(uint32_t usPSXMem,int iSize);
+extern void SPUreadDMAMem(uint32_t usPSXMem,int iSize);
 extern void mips_shorten_frame(void);
 extern int mips_execute( int cycles );
-extern uint32 psf2_load_file(char *file, uint8 *buf, uint32 buflen);
-extern uint32 psf2_load_elf(uint8 *start, uint32 len);
+extern uint32_t psf2_load_file(char *file, uint8_t *buf, uint32_t buflen);
+extern uint32_t psf2_load_elf(uint8_t *start, uint32_t len);
 void psx_hw_runcounters(void);
 int mips_get_icount(void);
 void mips_set_icount(int count);
@@ -78,10 +82,10 @@
 // SPU2
 extern void SPU2write(unsigned long reg, unsigned short val);
 extern unsigned short SPU2read(unsigned long reg);
-extern void SPU2readDMA4Mem(uint32 usPSXMem,int iSize);
-extern void SPU2writeDMA4Mem(uint32 usPSXMem,int iSize);
-extern void SPU2readDMA7Mem(uint32 usPSXMem,int iSize);
-extern void SPU2writeDMA7Mem(uint32 usPSXMem,int iSize);
+extern void SPU2readDMA4Mem(uint32_t usPSXMem,int iSize);
+extern void SPU2writeDMA4Mem(uint32_t usPSXMem,int iSize);
+extern void SPU2readDMA7Mem(uint32_t usPSXMem,int iSize);
+extern void SPU2writeDMA7Mem(uint32_t usPSXMem,int iSize);
 extern void SPU2interruptDMA4(void);
 extern void SPU2interruptDMA7(void);
 
@@ -89,50 +93,50 @@
 
 static volatile int softcall_target = 0;
 static int filestat[MAX_FILE_SLOTS];
-static uint8 *filedata[MAX_FILE_SLOTS];
-static uint32 filesize[MAX_FILE_SLOTS], filepos[MAX_FILE_SLOTS];
-uint32 psf2_get_loadaddr(void);
-void psf2_set_loadaddr(uint32 new);
-static void call_irq_routine(uint32 routine, uint32 parameter);
+static uint8_t *filedata[MAX_FILE_SLOTS];
+static uint32_t filesize[MAX_FILE_SLOTS], filepos[MAX_FILE_SLOTS];
+uint32_t psf2_get_loadaddr(void);
+void psf2_set_loadaddr(uint32_t new);
+static void call_irq_routine(uint32_t routine, uint32_t parameter);
 static int intr_susp = 0;
 
-static uint64 sys_time;
+static uint64_t sys_time;
 static int timerexp = 0;
 
 typedef struct
 {
 	char name[10];
-	uint32 dispatch;
+	uint32_t dispatch;
 } ExternLibEntries;
 
-static int32 iNumLibs;
+static int32_t iNumLibs;
 static ExternLibEntries	reglibs[32];
 
 typedef struct
 {
-	uint32 type;
-	uint32 value;
-	uint32 param;
+	uint32_t type;
+	uint32_t value;
+	uint32_t param;
 	int inUse;
 } EventFlag;
 
-static int32 iNumFlags;
+static int32_t iNumFlags;
 static EventFlag evflags[32];
 
 typedef struct
 {
-	uint32 attr;
-	uint32 option;
-	int32 init;
-	int32 current;
-	int32 max;
-	int32 threadsWaiting;
-	int32 inuse;
+	uint32_t attr;
+	uint32_t option;
+	int32_t init;
+	int32_t current;
+	int32_t max;
+	int32_t threadsWaiting;
+	int32_t inuse;
 } Semaphore;
 
 #define SEMA_MAX	(64)
 
-static int32 iNumSema;
+static int32_t iNumSema;
 static Semaphore semaphores[SEMA_MAX];
 
 // thread states
@@ -151,20 +155,20 @@
 
 typedef struct
 {
-	int32 iState;		// state of thread
+	int32_t iState;		// state of thread
 
-	uint32 flags;		// flags
-	uint32 routine;		// start of code for the thread
-	uint32 stackloc;	// stack location in IOP RAM
-	uint32 stacksize;	// stack size
-	uint32 refCon;		// user value passed in at CreateThread time
+	uint32_t flags;		// flags
+	uint32_t routine;		// start of code for the thread
+	uint32_t stackloc;	// stack location in IOP RAM
+	uint32_t stacksize;	// stack size
+	uint32_t refCon;		// user value passed in at CreateThread time
 
-	uint32 waitparm;	// what we're waiting on if in one the TS_WAIT* states
-	
-	uint32 save_regs[37];	// CPU registers belonging to this thread
+	uint32_t waitparm;	// what we're waiting on if in one the TS_WAIT* states
+
+	uint32_t save_regs[37];	// CPU registers belonging to this thread
 } Thread;
 
-static int32 iNumThreads, iCurThread;
+static int32_t iNumThreads, iCurThread;
 static Thread threads[32];
 
 #if DEBUG_THREADING
@@ -177,26 +181,26 @@
 
 typedef struct
 {
-	int32 iActive;
-	uint32 count;
-	uint32 target;
-	uint32 source;
-	uint32 prescale;
-	uint32 handler;
-	uint32 hparam;
-	uint32 mode;
+	int32_t iActive;
+	uint32_t count;
+	uint32_t target;
+	uint32_t source;
+	uint32_t prescale;
+	uint32_t handler;
+	uint32_t hparam;
+	uint32_t mode;
 } IOPTimer;
 
 static IOPTimer iop_timers[8];
-static int32 iNumTimers;
+static int32_t iNumTimers;
 
 typedef struct
 {
-	uint32 count;
-	uint32 mode;
-	uint32 target;
-	uint32 sysclock;
-	uint32 interrupt;
+	uint32_t count;
+	uint32_t mode;
+	uint32_t target;
+	uint32_t sysclock;
+	uint32_t interrupt;
 } Counter;
 
 static Counter root_cnts[4];	// 4 of the bastards
@@ -213,10 +217,10 @@
 
 typedef struct
 {
-	uint32 desc;
-	int32 status;
-	int32 mode;
-	uint32 fhandler;
+	uint32_t desc;
+	int32_t status;
+	int32_t mode;
+	uint32_t fhandler;
 } EvtCtrlBlk[32];
 
 static EvtCtrlBlk *Event;
@@ -233,20 +237,20 @@
 #define EvMdNOINTR	0x2000
 
 // PSX main RAM
-uint32 psx_ram[(2*1024*1024)/4];
-uint32 psx_scratch[0x400];
+uint32_t psx_ram[(2*1024*1024)/4];
+uint32_t psx_scratch[0x400];
 // backup image to restart songs
-uint32 initial_ram[(2*1024*1024)/4];
-uint32 initial_scratch[0x400];
+uint32_t initial_ram[(2*1024*1024)/4];
+uint32_t initial_scratch[0x400];
 
-static uint32 spu_delay, dma_icr, irq_data, irq_mask, dma_timer, WAI;
-static uint32 dma4_madr, dma4_bcr, dma4_chcr, dma4_delay;
-static uint32 dma7_madr, dma7_bcr, dma7_chcr, dma7_delay;
-static uint32 dma4_cb, dma7_cb, dma4_fval, dma4_flag, dma7_fval, dma7_flag;
-static uint32 irq9_cb, irq9_fval, irq9_flag;
+static uint32_t spu_delay, dma_icr, irq_data, irq_mask, dma_timer, WAI;
+static uint32_t dma4_madr, dma4_bcr, dma4_chcr, dma4_delay;
+static uint32_t dma7_madr, dma7_bcr, dma7_chcr, dma7_delay;
+static uint32_t dma4_cb, dma7_cb, dma4_fval, dma4_flag, dma7_fval, dma7_flag;
+static uint32_t irq9_cb, irq9_fval, irq9_flag;
 
 // take a snapshot of the CPU state for a thread
-static void FreezeThread(int32 iThread, int flag)
+static void FreezeThread(int32_t iThread, int flag)
 {
 	int i;
 	union cpuinfo mipsinfo;
@@ -271,7 +275,7 @@
 
 
 	// if a thread is freezing itself due to a IOP syscall, we must save the RA as the PC
-	// to come back to or else the syscall will recurse	
+	// to come back to or else the syscall will recurse
 	if (flag)
 	{
 		mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
@@ -300,7 +304,7 @@
 }
 
 // restore the CPU state from a thread's snapshot
-static void ThawThread(int32 iThread)
+static void ThawThread(int32_t iThread)
 {
 	int i;
 	union cpuinfo mipsinfo;
@@ -321,7 +325,7 @@
 //		printf("IOP: Initial setup for thread %d => PC %x SP %x\n", iThread, threads[iThread].save_regs[34]+4, threads[iThread].save_regs[29]);
 		#endif
 	}
-											 
+
 	#if DEBUG_THREADING
 	{
 		char buffer[256];
@@ -465,16 +469,16 @@
 	}
 }
 
-void psx_irq_set(uint32 irq)
+void psx_irq_set(uint32_t irq)
 {
 	irq_data |= irq;
 
 	psx_irq_update();
 }
 
-static uint32 gpu_stat = 0;
+static uint32_t gpu_stat = 0;
 
-uint32 psx_hw_read(offs_t offset, uint32 mem_mask)
+uint32_t psx_hw_read(offs_t offset, uint32_t mem_mask)
 {
 	if (offset >= 0x00000000 && offset <= 0x007fffff)
 	{
@@ -491,7 +495,7 @@
 	if (offset == 0xbfc00180 || offset == 0xbfc00184)	// exception vector
 	{
 		return FUNCT_HLECALL;
-	}	
+	}
 
 	if (offset == 0x1f801014)
 	{
@@ -548,7 +552,7 @@
 	if (offset >= 0x1f801100 && offset <= 0x1f801128)
 	{
 		int cnt = (offset>>4) & 0xf;
-		
+
 		switch (offset & 0xf)
 		{
 			case 0:
@@ -603,7 +607,7 @@
 	return 0;
 }
 
-static void psx_dma4(uint32 madr, uint32 bcr, uint32 chcr)
+static void psx_dma4(uint32_t madr, uint32_t bcr, uint32_t chcr)
 {
 	if (chcr == 0x01000201)	// cpu to SPU
 	{
@@ -623,7 +627,7 @@
 	}
 }
 
-static void ps2_dma4(uint32 madr, uint32 bcr, uint32 chcr)
+static void ps2_dma4(uint32_t madr, uint32_t bcr, uint32_t chcr)
 {
 	if (chcr == 0x01000201)	// cpu to SPU2
 	{
@@ -645,7 +649,7 @@
 	dma4_delay = 80;
 }
 
-static void ps2_dma7(uint32 madr, uint32 bcr, uint32 chcr)
+static void ps2_dma7(uint32_t madr, uint32_t bcr, uint32_t chcr)
 {
 	if ((chcr == 0x01000201) || (chcr == 0x00100010) || (chcr == 0x000f0010) || (chcr == 0x00010010))	// cpu to SPU2
 	{
@@ -667,7 +671,7 @@
 	dma7_delay = 80;
 }
 
-void psx_hw_write(offs_t offset, uint32 data, uint32 mem_mask)
+void psx_hw_write(offs_t offset, uint32_t data, uint32_t mem_mask)
 {
 	union cpuinfo mipsinfo;
 
@@ -739,7 +743,7 @@
 	if (offset >= 0x1f801100 && offset <= 0x1f801128)
 	{
 		int cnt = (offset>>4) & 0xf;
-		
+
 		switch (offset & 0xf)
 		{
 			case 0:
@@ -826,7 +830,7 @@
 		}
 		return;
 	}
-							 
+
 	if (offset == 0xbf8010c4 || offset == 0xbf8010c6)
 	{
 		dma4_bcr &= mem_mask;
@@ -846,7 +850,7 @@
 		ps2_dma7(dma7_madr, dma7_bcr, dma7_chcr);
 		return;
 	}
-							 
+
 	if (offset == 0xbf801508 || offset == 0xbf80150a)
 	{
 		dma7_bcr &= mem_mask;
@@ -948,18 +952,18 @@
 	BLK_BK = 12
 };
 
-static uint32 heap_addr, entry_int = 0;
+static uint32_t heap_addr, entry_int = 0;
 
-extern uint32 mips_get_cause(void);
-extern uint32 mips_get_status(void);
-extern void mips_set_status(uint32 status);
-extern uint32 mips_get_ePC(void);
+extern uint32_t mips_get_cause(void);
+extern uint32_t mips_get_status(void);
+extern void mips_set_status(uint32_t status);
+extern uint32_t mips_get_ePC(void);
 
-static uint32 irq_regs[37];
+static uint32_t irq_regs[37];
 
 static int irq_mutex = 0;
 
-static void call_irq_routine(uint32 routine, uint32 parameter)
+static void call_irq_routine(uint32_t routine, uint32_t parameter)
 {
 	int j, oldICount;
 	union cpuinfo mipsinfo;
@@ -992,7 +996,7 @@
 	irq_regs[36] = mipsinfo.i;
 
 	// PC = timer handler routine
-	mipsinfo.i = routine; 
+	mipsinfo.i = routine;
 	mips_set_info(CPUINFO_INT_PC, &mipsinfo);
 
 	// parameter in a0
@@ -1035,9 +1039,9 @@
 	irq_mutex = 0;
 }
 
-void psx_bios_exception(uint32 pc)
+void psx_bios_exception(uint32_t pc)
 {
-	uint32 a0, status;
+	uint32_t a0, status;
 	union cpuinfo mipsinfo;
 	int i, oldICount;
 
@@ -1074,10 +1078,10 @@
 					mips_set_info(CPUINFO_INT_PC, &mipsinfo);
 					mipsinfo.i = 0x80001000;
 					mips_set_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
-				
+
 					// make sure we're set
 					psx_ram[0x1000/4] = LE32(FUNCT_HLECALL);
-		
+
 					softcall_target = 0;
 					oldICount = mips_get_icount();
 					while (!softcall_target)
@@ -1106,10 +1110,10 @@
 							mips_set_info(CPUINFO_INT_PC, &mipsinfo);
 							mipsinfo.i = 0x80001000;
 							mips_set_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
-							
+
 							// make sure we're set
 							psx_ram[0x1000/4] = LE32(FUNCT_HLECALL);
-					
+
 							softcall_target = 0;
 							oldICount = mips_get_icount();
 							while (!softcall_target)
@@ -1128,7 +1132,7 @@
 					}
 				}
 			}
-		 	
+
 			if (entry_int)
 			{
 				psx_hw_write(0x1f801070, 0xffffffff, 0);
@@ -1231,12 +1235,12 @@
 	}
 }
 
-static uint32 calc_ev(uint32 a0)
+static uint32_t calc_ev(uint32_t a0)
 {
-	uint32 ev;
+	uint32_t ev;
 
 	ev = (a0 >> 24) & 0xf;
-	if (ev == 0xf) 
+	if (ev == 0xf)
 	{
 		ev = 0x5;
 	}
@@ -1246,9 +1250,9 @@
 	return ev;
 }
 
-static uint32 calc_spec(uint32 a1)
+static uint32_t calc_spec(uint32_t a1)
 {
-	uint32 spec = 0;
+	uint32_t spec = 0;
 	int i;
 
 	if (a1 == 0x301)
@@ -1338,11 +1342,11 @@
 	root_cnts[3].interrupt = 1;
 }
 
-void psx_bios_hle(uint32 pc)
+void psx_bios_hle(uint32_t pc)
 {
-	uint32 subcall, status;
+	uint32_t subcall, status;
 	union cpuinfo mipsinfo;
-	uint32 a0, a1, a2, a3;
+	uint32_t a0, a1, a2, a3;
 	int i;
 
 	if ((pc == 0) || (pc == 0x80000000)) 	 	// IOP "null" state
@@ -1383,7 +1387,7 @@
 
 //	mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
 //	printf("HLEBIOS: return is %08x\n", mipsinfo.i);
-	
+
 	switch (pc)
 	{
 		case 0xa0:	// a0 syscalls
@@ -1421,14 +1425,14 @@
 
 				case 0x18:	// strncmp
 					{
-						uint8 *dst, *src;
+						uint8_t *dst, *src;
 
 						#if DEBUG_HLE_BIOS
 						printf("HLEBIOS: strncmp(%08x, %08x, %d)\n", a0, a1, a2);
 						#endif
 
-						dst = (uint8 *)psx_ram;
-						src = (uint8 *)psx_ram;
+						dst = (uint8_t *)psx_ram;
+						src = (uint8_t *)psx_ram;
 						dst += (a0 & 0x1fffff);
 						src += (a1 & 0x1fffff);
 
@@ -1440,14 +1444,14 @@
 
 				case 0x19:	// strcpy
 					{
-						uint8 *dst, *src;
+						uint8_t *dst, *src;
 
 						#if DEBUG_HLE_BIOS
 						printf("HLEBIOS: strcpy(%08x, %08x)\n", a0, a1);
 						#endif
 
-						dst = (uint8 *)psx_ram;
-						src = (uint8 *)psx_ram;
+						dst = (uint8_t *)psx_ram;
+						src = (uint8_t *)psx_ram;
 						dst += (a0 & 0x1fffff);
 						src += (a1 & 0x1fffff);
 
@@ -1466,13 +1470,13 @@
 
 				case 0x28:	// bzero
 					{
-						uint8 *dst;
+						uint8_t *dst;
 
 						#if DEBUG_HLE_BIOS
 						printf("HLEBIOS: bzero(%08x, %08x)\n", a0, a1);
 						#endif
 
-						dst = (uint8 *)psx_ram;
+						dst = (uint8_t *)psx_ram;
 						dst += (a0 & 0x1fffff);
 						memset(dst, 0, a1);
 					}
@@ -1480,14 +1484,14 @@
 
 				case 0x2a:	// memcpy
 					{
-						uint8 *dst, *src;
+						uint8_t *dst, *src;
 
 						#if DEBUG_HLE_BIOS
 						printf("HLEBIOS: memcpy(%08x, %08x, %08x)\n", a0, a1, a2);
 						#endif
 
-						dst = (uint8 *)psx_ram;
-						src = (uint8 *)psx_ram;
+						dst = (uint8_t *)psx_ram;
+						src = (uint8_t *)psx_ram;
 						dst += (a0 & 0x1fffff);
 						src += (a1 & 0x1fffff);
 
@@ -1504,16 +1508,16 @@
 						mips_set_info(CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
 					}
 					break;
-				
+
 				case 0x2b:	// memset
 					{
-						uint8 *dst;
+						uint8_t *dst;
 
 						#if DEBUG_HLE_BIOS
 						printf("HLEBIOS: memset(%08x, %08x, %08x)\n", a0, a1, a2);
 						#endif
 
-						dst = (uint8 *)psx_ram;
+						dst = (uint8_t *)psx_ram;
 						dst += (a0 & 0x1fffff);
 
 						while (a2)
@@ -1548,7 +1552,7 @@
 
 				case 0x33:	// malloc
 					{
-						uint32 chunk, fd;
+						uint32_t chunk, fd;
 
 						#if DEBUG_HLE_BIOS
 						printf("HLEBIOS: malloc(%x)\n", a0);
@@ -1567,7 +1571,7 @@
 						fd = chunk + 16 + a0;	// free block starts after block record and allocation size
 						psx_ram[(fd+BLK_STAT)/4] = psx_ram[(chunk+BLK_STAT)/4];
 						psx_ram[(fd+BLK_SIZE)/4] = LE32(LE32(psx_ram[(chunk+BLK_SIZE)/4]) - a0);
-						psx_ram[(fd+BLK_FD)/4] = psx_ram[(chunk+BLK_FD)/4]; 
+						psx_ram[(fd+BLK_FD)/4] = psx_ram[(chunk+BLK_FD)/4];
 						psx_ram[(fd+BLK_BK)/4] = chunk;
 
 						psx_ram[(chunk+BLK_STAT)/4] = LE32(1);
@@ -1582,7 +1586,7 @@
 						mips_set_info(CPUINFO_INT_REGISTER + MIPS_R2, &mipsinfo);
 					}
 					break;
-				
+
 				case 0x39:	// InitHeap
 					// heap address in A0, length in A1
 					#if DEBUG_HLE_BIOS
@@ -1628,7 +1632,7 @@
 
 		case 0xb0:	// b0 syscalls
 			switch (subcall)
-			{		 
+			{
 				case 0x07:	// DeliverEvent
 					{
 						int ev, spec;
@@ -1662,11 +1666,11 @@
 						}
 					}
 					break;
-			 
+
 				case 0x08:	// OpenEvent
 					{
 						int ev, spec;
-						
+
 						ev = calc_ev(a0);
 						spec = calc_spec(a1);
 
@@ -1691,7 +1695,7 @@
 				case 0x0a:	// WaitEvent
 					{
 						int ev, spec;
-						
+
 						ev = a0 & 0xff;
 						spec = (a0 >> 8) & 0xff;
 
@@ -1746,7 +1750,7 @@
 				case 0x0c:	// EnableEvent
 					{
 						int ev, spec;
-						
+
 						ev = a0 & 0xff;
 						spec = (a0 >> 8) & 0xff;
 
@@ -1765,7 +1769,7 @@
 				case 0x0d:	// DisableEvent
 					{
 						int ev, spec;
-						
+
 						ev = a0 & 0xff;
 						spec = (a0 >> 8) & 0xff;
 
@@ -1830,7 +1834,7 @@
 
 		case 0xc0:	// c0 syscalls
 			switch (subcall)
-			{		
+			{
 				case 0xa:	// ChangeClearRCnt
 					#if DEBUG_HLE_BIOS
 					printf("HLEBIOS: ChangeClearRCnt(%08x, %08x)\n", a0, a1);
@@ -1843,7 +1847,7 @@
 					// (a0*4)+0x8600 = a1;
 					psx_ram[((a0<<2) + 0x8600)/4] = LE32(a1);
 					break;
-			 
+
 				default:
 					#if DEBUG_HLE_BIOS
 					printf("Unknown BIOS C0 call = %x\n", subcall);
@@ -1934,7 +1938,7 @@
 						call_irq_routine(iop_timers[i].handler, iop_timers[i].hparam);
 
 						timerexp = 1;
-					} 
+					}
 				}
 			}
 		}
@@ -1964,7 +1968,7 @@
 				{
 					root_cnts[i].count %= root_cnts[i].target;
 				}
-				
+
 				psx_irq_set(1<<(4+i));
 			}
 		}
@@ -1973,14 +1977,14 @@
 
 // PEOpS callbacks
 
-void SPUirq(void) 
+void SPUirq(void)
 {
 //	psx_irq_set(0x200);
 }
 
 // PSXCPU callbacks
 
-uint8 program_read_byte_32le(offs_t address)
+uint8_t program_read_byte_32le(offs_t address)
 {
 	switch (address & 0x3)
 	{
@@ -2001,7 +2005,7 @@
 	return psx_hw_read(address, 0xffffff00);
 }
 
-uint16 program_read_word_32le(offs_t address)
+uint16_t program_read_word_32le(offs_t address)
 {
 	if (address & 2)
 		return psx_hw_read(address, 0x0000ffff)>>16;
@@ -2009,12 +2013,12 @@
 	return psx_hw_read(address, 0xffff0000);
 }
 
-uint32 program_read_dword_32le(offs_t address)
+uint32_t program_read_dword_32le(offs_t address)
 {
 	return psx_hw_read(address, 0);
 }
 
-void program_write_byte_32le(offs_t address, uint8 data)
+void program_write_byte_32le(offs_t address, uint8_t data)
 {
 	switch (address & 0x3)
 	{
@@ -2033,7 +2037,7 @@
 	}
 }
 
-void program_write_word_32le(offs_t address, uint16 data)
+void program_write_word_32le(offs_t address, uint16_t data)
 {
 	if (address & 2)
 	{
@@ -2044,13 +2048,13 @@
 	psx_hw_write(address, data, 0xffff0000);
 }
 
-void program_write_dword_32le(offs_t address, uint32 data)
+void program_write_dword_32le(offs_t address, uint32_t data)
 {
 	psx_hw_write(address, data, 0);
 }
 
 // sprintf replacement
-static void iop_sprintf(char *out, char *fmt, uint32 pstart)
+static void iop_sprintf(char *out, char *fmt, uint32_t pstart)
 {
 	char temp[64], tfmt[64];
 	char *cf, *pstr;
@@ -2095,7 +2099,7 @@
 			tfmt[fp] = *cf;
 			tfmt[fp+1] = '\0';
 
-			isnum = 0;			
+			isnum = 0;
 			switch (*cf)
 			{
 				case 'x':
@@ -2117,7 +2121,7 @@
 				mips_get_info(curparm, &mipsinfo);
 //				printf("parameter %d = %x\n", curparm-pstart, mipsinfo.i);
 				curparm++;
-				sprintf(temp, tfmt, (int32)mipsinfo.i);
+				sprintf(temp, tfmt, (int32_t)mipsinfo.i);
 			}
 			else
 			{
@@ -2146,11 +2150,11 @@
 }
 
 // PS2 IOP callbacks
-void psx_iop_call(uint32 pc, uint32 callnum)
+void psx_iop_call(uint32_t pc, uint32_t callnum)
 {
-	uint32 scan;
+	uint32_t scan;
 	char *mname, *str1, name[9], out[512];
-	uint32 a0, a1, a2, a3;
+	uint32_t a0, a1, a2, a3;
 	union cpuinfo mipsinfo;
 	int i;
 
@@ -2194,7 +2198,7 @@
 				mname += (a0 & 3);
 
 				iop_sprintf(out, mname, CPUINFO_INT_REGISTER + MIPS_R5);	// a1 is first parm
-				
+
 			/*	if (out[strlen(out)-1] != '\n')
 				{
 					strcat(out, "\n");
@@ -2257,7 +2261,7 @@
 	}
 	else if (!strcmp(name, "thbase"))
 	{
-		uint32 newAlloc;
+		uint32_t newAlloc;
 
 		switch (callnum)
 		{
@@ -2280,7 +2284,7 @@
 					newAlloc += 16;
 				}
 				psf2_set_loadaddr(newAlloc + LE32(psx_ram[a0+3]));
-				
+
 				threads[iNumThreads].iState = TS_CREATED;
 				threads[iNumThreads].stackloc = newAlloc;
 				threads[iNumThreads].flags = LE32(psx_ram[a0]);
@@ -2331,7 +2335,7 @@
 				#endif
 
 				// set thread to "ready to go"
-				threads[a0].iState = TS_READY;	
+				threads[a0].iState = TS_READY;
 				break;
 
 			case 26:// iWakeupThread
@@ -2342,7 +2346,7 @@
 				// set thread to "ready to go" if it's not running
 				if (threads[a0].iState != TS_RUNNING)
 				{
-					threads[a0].iState = TS_READY;	
+					threads[a0].iState = TS_READY;
 				}
 				break;
 
@@ -2365,7 +2369,7 @@
 					threads[iCurThread].iState = TS_WAITDELAY;
 					dTicks /= (double)1000000.0;
 					dTicks *= (double)36864000.0;	// 768*48000 = IOP native-mode clock rate
-					threads[iCurThread].waitparm = (uint32)dTicks;
+					threads[iCurThread].waitparm = (uint32_t)dTicks;
 					iCurThread = -1;
 
 					ps2_reschedule();
@@ -2389,16 +2393,16 @@
 
 			case 39:// USec2SysClock
 				{
-					uint64 dTicks = (uint64)a0;
-					uint32 hi, lo;
+					uint64_t dTicks = (uint64_t)a0;
+					uint32_t hi, lo;
 
 					#if DEBUG_HLE_IOP
 					printf("IOP: USec2SysClock(%d %08x)\n", a0, a1);
 					#endif
 
-					dTicks *= (uint64)36864000;
-					dTicks /= (uint64)1000000;
-			
+					dTicks *= (uint64_t)36864000;
+					dTicks /= (uint64_t)1000000;
+
 					hi = dTicks>>32;
 					lo = dTicks & 0xffffffff;
 
@@ -2412,8 +2416,8 @@
 
 			case 40://SysClock2USec
 				{
-					uint64 temp;
-					uint32 seconds, usec;
+					uint64_t temp;
+					uint32_t seconds, usec;
 
 					#if DEBUG_HLE_IOP
 					printf("IOP: SysClock2USec(%08x %08x %08x)\n", a0, a1, a2);
@@ -2427,10 +2431,10 @@
 					a2 /= 4;
 
 					temp = LE32(psx_ram[a0]);
-					temp |= (uint64)LE32(psx_ram[a0+1])<<32;
+					temp |= (uint64_t)LE32(psx_ram[a0+1])<<32;
 
-					temp *= (uint64)1000000;
-					temp /= (uint64)36864000;
+					temp *= (uint64_t)1000000;
+					temp /= (uint64_t)36864000;
 
 					// temp now is USec
 					seconds = (temp / 1000000) & 0xffffffff;
@@ -2458,7 +2462,7 @@
 
 				a0 &= 0x1fffff;
 				a0 /= 4;
- 
+
 				evflags[iNumFlags].type = LE32(psx_ram[a0]);
 				evflags[iNumFlags].value = LE32(psx_ram[a0+1]);
 				evflags[iNumFlags].param = LE32(psx_ram[a0+2]);
@@ -2500,7 +2504,7 @@
 				{
 					if ((threads[i].iState == TS_WAITEVFLAG) && (threads[i].waitparm == a0))
 					{
-						threads[i].iState = TS_READY;	
+						threads[i].iState = TS_READY;
 					}
 				}
 				break;
@@ -2589,7 +2593,7 @@
 				a0 /= 4;
 
 //				printf("Sema %d Parms: %08x %08x %08x %08x\n", mipsinfo.i, psx_ram[a0], psx_ram[a0+1], psx_ram[a0+2], psx_ram[a0+3]);
-	
+
 				if (mipsinfo.i != -1)
 				{
 					semaphores[mipsinfo.i].attr = LE32(psx_ram[a0]);
@@ -2615,7 +2619,7 @@
 				{
 					if ((threads[i].iState == TS_WAITSEMA) && (threads[i].waitparm == a0))
 					{
-						threads[i].iState = TS_READY;	
+						threads[i].iState = TS_READY;
 						semaphores[a0].threadsWaiting--;
 						foundthread = 1;
 						break;
@@ -2649,7 +2653,7 @@
 				{
 					if ((threads[i].iState == TS_WAITSEMA) && (threads[i].waitparm == a0))
 					{
-						threads[i].iState = TS_READY;	
+						threads[i].iState = TS_READY;
 						semaphores[a0].threadsWaiting--;
 						foundthread = 1;
 						break;
@@ -2678,7 +2682,7 @@
 				mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
 				printf("IOP: WaitSema(%d) (cnt %d) (th %d) (PC=%x)\n", a0, iCurThread, semaphores[a0].current, mipsinfo.i);
 				#endif
-		
+
 				if (semaphores[a0].current > 0)
 				{
 					semaphores[a0].current--;
@@ -2709,7 +2713,7 @@
 				printf("IOP: AllocHardTimer(%d %d %d)\n", a0, a1, a2);
 				#endif
 				// source, size, prescale
-								 
+
 				if (a1 != 32)
 				{
 					printf("IOP: AllocHardTimer doesn't support 16-bit timers!\n");
@@ -2798,14 +2802,14 @@
 		{
 			case 12:	// memcpy
 				{
-					uint8 *dst, *src;
+					uint8_t *dst, *src;
 
 					#if DEBUG_HLE_IOP
 					printf("IOP: memcpy(%08x, %08x, %d)\n", a0, a1, a2);
 					#endif
 
-					dst = (uint8 *)&psx_ram[(a0&0x1fffff)/4];
-					src = (uint8 *)&psx_ram[(a1&0x1fffff)/4];
+					dst = (uint8_t *)&psx_ram[(a0&0x1fffff)/4];
+					src = (uint8_t *)&psx_ram[(a1&0x1fffff)/4];
 					// get exact byte alignment
 					dst += a0 % 4;
 					src += a1 % 4;
@@ -2826,14 +2830,14 @@
 
 			case 13:	// memmove
 				{
-					uint8 *dst, *src;
+					uint8_t *dst, *src;
 
 					#if DEBUG_HLE_IOP
 					printf("IOP: memmove(%08x, %08x, %d)\n", a0, a1, a2);
 					#endif
 
-					dst = (uint8 *)&psx_ram[(a0&0x1fffff)/4];
-					src = (uint8 *)&psx_ram[(a1&0x1fffff)/4];
+					dst = (uint8_t *)&psx_ram[(a0&0x1fffff)/4];
+					src = (uint8_t *)&psx_ram[(a1&0x1fffff)/4];
 					// get exact byte alignment
 					dst += a0 % 4;
 					src += a1 % 4;
@@ -2857,14 +2861,14 @@
 
 			case 14:	// memset
 				{
-					uint8 *dst;
+					uint8_t *dst;
 
 					#if DEBUG_HLE_IOP
 					mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
 					printf("IOP: memset(%08x, %02x, %d) [PC=%x]\n", a0, a1, a2, mipsinfo.i);
 					#endif
 
-					dst = (uint8 *)&psx_ram[(a0&0x1fffff)/4];
+					dst = (uint8_t *)&psx_ram[(a0&0x1fffff)/4];
 					dst += (a0 & 3);
 
 					memset(dst, a1, a2);
@@ -2873,13 +2877,13 @@
 
 			case 17:	// bzero
 				{
-					uint8 *dst;
+					uint8_t *dst;
 
 					#if DEBUG_HLE_IOP
 					printf("IOP: bzero(%08x, %08x)\n", a0, a1);
 					#endif
 
-					dst = (uint8 *)&psx_ram[(a0&0x1fffff)/4];
+					dst = (uint8_t *)&psx_ram[(a0&0x1fffff)/4];
 					dst += (a0 & 3);
 					memset(dst, 0, a1);
 				}
@@ -2893,7 +2897,7 @@
 
 				#if DEBUG_HLE_IOP
 				mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
-				printf("IOP: sprintf(%08x, %s, ...) [PC=%08x]\n", a0, str1, (uint32)mipsinfo.i);
+				printf("IOP: sprintf(%08x, %s, ...) [PC=%08x]\n", a0, str1, (uint32_t)mipsinfo.i);
 				printf("%x %x %x %x\n", a0, a1, a2, a3);
 				#endif
 
@@ -2906,14 +2910,14 @@
 
 			case 23:	// strcpy
 				{
-					uint8 *dst, *src;
+					uint8_t *dst, *src;
 
 					#if DEBUG_HLE_IOP
 					printf("IOP: strcpy(%08x, %08x)\n", a0, a1);
 					#endif
 
-					dst = (uint8 *)&psx_ram[(a0&0x1fffff)/4];
-					src = (uint8 *)&psx_ram[(a1&0x1fffff)/4];
+					dst = (uint8_t *)&psx_ram[(a0&0x1fffff)/4];
+					src = (uint8_t *)&psx_ram[(a1&0x1fffff)/4];
 					// get exact byte alignment
 					dst += a0 % 4;
 					src += a1 % 4;
@@ -3116,7 +3120,7 @@
 				mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
 				printf("IOP: RegisterLibraryEntries(%08x) (PC=%x)\n", a0, mipsinfo.i);
 				#endif
-				
+
 				if (psx_ram[a0/4] == LE32(0x41c00000))
 				{
 					a0 += 3*4;
@@ -3146,7 +3150,7 @@
 	}
 	else if (!strcmp(name, "sysmem"))
 	{
-		uint32 newAlloc;
+		uint32_t newAlloc;
 
 		switch (callnum)
 		{
@@ -3205,7 +3209,7 @@
 				mname += (a0 & 3);
 
 				iop_sprintf(out, mname, CPUINFO_INT_REGISTER + MIPS_R5);	// a1 is first parm
-				
+
 				if (out[strlen(out)-1] != '\n')
 				{
 					strcat(out, "\n");
@@ -3237,8 +3241,8 @@
 	}
 	else if (!strcmp(name, "modload"))
 	{
-		uint8 *tempmem;
-		uint32 newAlloc;
+		uint8_t *tempmem;
+		uint32_t newAlloc;
 
 		switch (callnum)
 		{
@@ -3260,19 +3264,19 @@
 				}
 				psf2_set_loadaddr(newAlloc + 2048);
 
-				tempmem = (uint8 *)malloc(2*1024*1024);
+				tempmem = (uint8_t *)malloc(2*1024*1024);
 				if (psf2_load_file(mname, tempmem, 2*1024*1024) != 0xffffffff)
 				{
-					uint32 start;
+					uint32_t start;
 					int i;
 
 					start = psf2_load_elf(tempmem, 2*1024*1024);
 
 					if (start != 0xffffffff)
 					{
-						uint32 args[20], numargs = 1, argofs;
-						uint8 *argwalk = (uint8 *)psx_ram;
-						
+						uint32_t args[20], numargs = 1, argofs;
+						uint8_t *argwalk = (uint8_t *)psx_ram;
+
 						argwalk += (a2 & 0x1fffff);
 
 						args[0] = a0;	// program name is argc[0]
@@ -3297,10 +3301,10 @@
 							}
 						}
 
-						for (i = 0; i < numargs; i++) 
+						for (i = 0; i < numargs; i++)
 						{
 							#if DEBUG_HLE_IOP
-//							printf("Arg %d: %08x [%s]\n", i, args[i], &argbase[args[i]-a2]); 
+//							printf("Arg %d: %08x [%s]\n", i, args[i], &argbase[args[i]-a2]);
 							#endif
 							psx_ram[(newAlloc/4)+i] = LE32(args[i]);
 						}
@@ -3363,7 +3367,7 @@
 					{
 						mname += 8;
 					}
-					else if (!strncmp(mname, "host0:", 6)) 
+					else if (!strncmp(mname, "host0:", 6))
 					{
 						mname += 7;
 					}
@@ -3396,7 +3400,7 @@
 				printf("IOP: close(%d) (PC=%08x)\n", a0, mipsinfo.i);
 				#endif
 				free(filedata[a0]);
-				filedata[a0] = (uint8 *)NULL;
+				filedata[a0] = (uint8_t *)NULL;
 				filepos[a0] = 0;
 				filesize[a0] = 0;
 				filestat[a0] = 0;
@@ -3413,14 +3417,14 @@
 				}
 				else
 				{
-					uint8 *rp;
+					uint8_t *rp;
 
 					if ((filepos[a0] + a2) > filesize[a0])
 					{
 						a2 = filesize[a0] - filepos[a0];
 					}
 
-					rp = (uint8 *)psx_ram;
+					rp = (uint8_t *)psx_ram;
 					rp += (a1 & 0x1fffff);
 					memcpy(rp, &filedata[a0][filepos[a0]], a2);
 
@@ -3479,8 +3483,8 @@
 
 			default:
 				printf("IOP: Unhandled service %d for module %s\n", callnum, name);
-		}		 
-	}		
+		}
+	}
 	else
 	{
 		int lib;
@@ -3492,7 +3496,7 @@
 				if (!strcmp(name, reglibs[lib].name))
 				{
 					#if DEBUG_HLE_IOP
-					uint32 PC;
+					uint32_t PC;
 
 					mips_get_info(CPUINFO_INT_REGISTER + MIPS_R31, &mipsinfo);
 					PC = mipsinfo.i;
@@ -3508,10 +3512,10 @@
 					// (NOTE: we get called in the delay slot!)
 					#if DEBUG_HLE_IOP
 					printf("IOP: Calling %s (%d) service %d => %08x (parms %08x %08x %08x %08x) (PC=%x)\n",
-							 reglibs[lib].name, 
+							 reglibs[lib].name,
 							 lib,
-							 callnum, 
-							 (uint32)mipsinfo.i, 
+							 callnum,
+							 (uint32_t)mipsinfo.i,
 							 a0, a1, a2, a3, PC);
 					#endif

audacious-plugins-3.3.4.tar.bz2/src/pulse_audio/pulse_audio.c -> audacious-plugins-3.4.2.tar.bz2/src/pulse_audio/pulse_audio.c Changed

audacious-plugins-3.3.4.tar.bz2/src/resample/resample.c -> audacious-plugins-3.4.2.tar.bz2/src/resample/resample.c Changed

audacious-plugins-3.4.2.tar.bz2/src/scrobbler2 Added

audacious-plugins-3.4.2.tar.bz2/src/scrobbler2/Makefile Added

audacious-plugins-3.4.2.tar.bz2/src/scrobbler2/config_window.c Added

@@ -0,0 +1,233 @@
+
+//external includes
+#include <gdk/gdk.h>
+//plugin includes
+#include "scrobbler.h"
+
+
+//shared variables
+bool_t permission_check_requested = FALSE;
+bool_t invalidate_session_requested = FALSE;
+enum permission perm_result = PERMISSION_UNKNOWN;
+gchar *username = "";
+
+
+//static (private) variables
+static GtkWidget *button;
+static GtkWidget *revoke_button;
+static GtkWidget *permission_status_icon;
+static GtkWidget *permission_status_label;
+
+static GtkWidget *details_label_first;
+static GtkWidget *url_button;
+static GtkWidget *details_label_second;
+
+static GtkWidget *additional_details_icon;
+static GtkWidget *additional_details_label;
+
+
+static gboolean permission_checker_thread (gpointer data) {
+ if (permission_check_requested == TRUE) {
+ //the answer hasn't arrived yet
+ return TRUE;
+
+ } else {
+ //the answer has arrived
+ g_assert(perm_result != PERMISSION_UNKNOWN);
+
+ if (perm_result == PERMISSION_ALLOWED) {
+ gtk_image_set_from_stock(GTK_IMAGE(permission_status_icon), GTK_STOCK_YES, GTK_ICON_SIZE_SMALL_TOOLBAR);
+
+ gchar *markup = g_markup_printf_escaped(_("OK. Scrobbling for user: %s"), username);
+
+ gtk_label_set_markup(GTK_LABEL(permission_status_label), markup);
+ gtk_widget_set_sensitive(revoke_button, TRUE);
+
+ } else if (perm_result == PERMISSION_DENIED) {
+
+ gtk_image_set_from_stock(GTK_IMAGE(permission_status_icon), GTK_STOCK_NO, GTK_ICON_SIZE_SMALL_TOOLBAR);
+ gtk_image_set_from_stock(GTK_IMAGE(additional_details_icon), GTK_STOCK_INFO, GTK_ICON_SIZE_SMALL_TOOLBAR);
+
+
+ gtk_label_set_label(GTK_LABEL(permission_status_label), _("Permission Denied"));
+
+ gtk_label_set_markup(GTK_LABEL(details_label_first), _("Access the following link to allow Audacious to scrobble your plays:"));
+
+ gchar *url = g_markup_printf_escaped("http://www.last.fm/api/auth/?api_key=%s&token=%s", SCROBBLER_API_KEY, request_token);
+
+ gtk_link_button_set_uri(GTK_LINK_BUTTON(url_button), url);
+ gtk_button_set_label(GTK_BUTTON(url_button), url);
+ gtk_widget_show(url_button);
+ g_free(url);
+
+ gtk_label_set_markup(GTK_LABEL(details_label_second), _("Keep this window open and click 'Check Permission' again.\n"));
+
+ gtk_label_set_label(GTK_LABEL(additional_details_label),
+ _("Don't worry. Your scrobbles are saved on your computer.\n"
+ "They will be submitted as soon as Audacious is allowed to do so."));
+
+ } else if (perm_result == PERMISSION_NONET) {
+ gtk_image_set_from_stock(GTK_IMAGE(permission_status_icon), GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_SMALL_TOOLBAR);
+ gtk_image_set_from_stock(GTK_IMAGE(additional_details_icon), GTK_STOCK_INFO, GTK_ICON_SIZE_SMALL_TOOLBAR);
+
+
+ gtk_label_set_label(GTK_LABEL(permission_status_label), _("Network Problem."));
+ gtk_label_set_label(GTK_LABEL(details_label_first), _("There was a problem contacting Last.fm. Please try again later."));
+ gtk_label_set_label(GTK_LABEL(additional_details_label),
+ _("Don't worry. Your scrobbles are saved on your computer.\n"
+ "They will be submitted as soon as Audacious is allowed to do so."));
+ }
+
+ perm_result = PERMISSION_UNKNOWN;
+ gtk_widget_set_sensitive(button, TRUE);
+
+ return FALSE;
+ }
+}
+
+
+static void cleanup_window() {
+ gtk_widget_set_sensitive(button, FALSE);
+ gtk_widget_set_sensitive(revoke_button, FALSE);
+
+ gtk_image_clear(GTK_IMAGE(permission_status_icon));
+ gtk_image_clear(GTK_IMAGE(additional_details_icon));
+
+ gtk_label_set_label(GTK_LABEL(permission_status_label), (""));
+ gtk_label_set_label(GTK_LABEL(details_label_first), "");
+ gtk_widget_hide(url_button);
+ gtk_label_set_label(GTK_LABEL(details_label_second), "");
+ gtk_label_set_label(GTK_LABEL(additional_details_label), "");
+}
+
+static void permission_checker (GtkButton *button12, gpointer data) {
+ cleanup_window();
+
+ gtk_image_set_from_stock(GTK_IMAGE(permission_status_icon), GTK_STOCK_EXECUTE, GTK_ICON_SIZE_SMALL_TOOLBAR);
+ gtk_label_set_label(GTK_LABEL(permission_status_label), _("Checking..."));
+
+ //This will make the communication thread check the permission
+ //and set the current status on the perm_result enum
+ permission_check_requested = TRUE;
+
+ //This is only to accelerate the check.
+ //If scrobbles are being made, they are stopped for the request to be done sooner.
+ scrobbling_enabled = FALSE;
+
+ //Wake up the communication thread in case it's waiting for track plays
+ pthread_mutex_lock(&communication_mutex);
+ pthread_cond_signal(&communication_signal);
+ pthread_mutex_unlock(&communication_mutex);
+
+ //The button is clicked. Wait for the permission check to be done.
+ gdk_threads_add_timeout_seconds(1, permission_checker_thread, data);
+}
+
+static void revoke_permissions (GtkButton *revoke_button2, gpointer data) {
+ cleanup_window();
+
+ pthread_mutex_lock(&communication_mutex);
+ invalidate_session_requested = TRUE;
+
+ scrobbling_enabled = FALSE;
+ pthread_cond_signal(&communication_signal);
+ pthread_mutex_unlock(&communication_mutex);
+
+ gtk_widget_set_sensitive(button, TRUE);
+}
+
+/*
+ ,---config_box---------------------.
+ | |
+ |,-permission_box----------------. |
+ || ,-buttons_box--. | |
+ || |button | perm_status | |
+ || |revoke_button | | |
+ || `--------------' | |
+ |`-------------------------------' |
+ | |
+ |,-details_box------------------. |
+ ||details_label_first | |
+ ||url_button | |
+ ||details_label_second | |
+ |`------------------------------' |
+ | |
+ |,-additional_details_box--------. |
+ ||_______________________________| |
+ |__________________________________|
+
+ */
+static void *config_status_checker () {
+ GtkWidget *config_box;
+ GtkWidget *permission_box;
+ GtkWidget *buttons_box;
+ GtkWidget *details_box;
+ GtkWidget *additional_details_box;
+
+ config_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 15);
+ permission_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+ buttons_box = gtk_button_box_new(GTK_ORIENTATION_VERTICAL);
+ details_box = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
+ additional_details_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 7);
+
+ button = gtk_button_new_with_mnemonic(_("C_heck Permission"));
+ revoke_button = gtk_button_new_with_mnemonic(_("_Revoke Permission"));
+ gtk_widget_set_sensitive(revoke_button, FALSE);
+
+ permission_status_icon = gtk_image_new();
+ permission_status_label = gtk_label_new("");
+
+ details_label_first = gtk_label_new ("");
+ url_button = gtk_link_button_new("");
+ details_label_second = gtk_label_new("");
+ gtk_widget_set_halign(details_label_first, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign(url_button, GTK_ALIGN_CENTER);
+ gtk_widget_set_halign(details_label_second, GTK_ALIGN_CENTER);
+
+// gtk_label_set_use_markup(GTK_LABEL(details_label), TRUE);
+
+ additional_details_icon = gtk_image_new();
+ additional_details_label = gtk_label_new("");
+
+
+ g_signal_connect (button, "clicked", G_CALLBACK (permission_checker), NULL);
+ g_signal_connect (revoke_button, "clicked", G_CALLBACK (revoke_permissions), NULL);
+
+ gtk_box_pack_start(GTK_BOX(permission_box), buttons_box, FALSE, FALSE, 20);
+ gtk_box_pack_start(GTK_BOX(permission_box), permission_status_icon, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(permission_box), permission_status_label, FALSE, FALSE, 5);
+
+ gtk_box_pack_start(GTK_BOX(buttons_box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(buttons_box), revoke_button, FALSE, FALSE, 0);
+
+ gtk_box_pack_start(GTK_BOX(details_box), details_label_first, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(details_box), url_button, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(details_box), details_label_second, FALSE, FALSE, 0);
+
+ gtk_box_pack_start(GTK_BOX(additional_details_box), additional_details_icon, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(additional_details_box), additional_details_label, FALSE, FALSE, 0);
+
+ gtk_box_pack_start(GTK_BOX(config_box), permission_box, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(config_box), details_box, FALSE, FALSE, 0);
+ gtk_box_pack_start(GTK_BOX(config_box), additional_details_box, FALSE, FALSE, 0);
+
+ return config_box;
+}
+
+
+static const PreferencesWidget config_contents[] = {
+ {
+ .type = WIDGET_LABEL,
+ .label = N_("You need to allow Audacious to scrobble tracks to your Last.fm account.\n"),
+ .data = { .label = {.single_line = TRUE} }
+ },
+ {
+ .type = WIDGET_CUSTOM,
+ .data = { .populate = config_status_checker }
+ }
+};
+
+const PluginPreferences configuration = {
+ .widgets = config_contents,
+ .n_widgets = G_N_ELEMENTS(config_contents)
+};

audacious-plugins-3.4.2.tar.bz2/src/scrobbler2/scrobbler.c Added

@@ -0,0 +1,323 @@
+/*
+ * Scrobbler Plugin v2.0 for Audacious by Pitxyoki
+ *
+ * Copyright 2012-2013 Luís Picciochi Oliveira <Pitxyoki@Gmail.com>
+ *
+ * This plugin is part of the Audacious Media Player.
+ * It is licensed under the GNU General Public License, version 3.
+ */
+
+//audacious includes
+#include <audacious/plugin.h>
+#include <audacious/drct.h>
+#include <audacious/playlist.h>
+#include <libaudcore/hook.h>
+
+
+//plugin includes
+#include "scrobbler.h"
+
+
+//shared variables
+bool_t scrobbler_running = TRUE;
+bool_t migrate_config_requested = FALSE;
+bool_t now_playing_requested = FALSE;
+Tuple *now_playing_track = NULL;
+
+pthread_mutex_t communication_mutex = PTHREAD_MUTEX_INITIALIZER;
+pthread_cond_t communication_signal = PTHREAD_COND_INITIALIZER;
+pthread_mutex_t log_access_mutex = PTHREAD_MUTEX_INITIALIZER;
+gchar *session_key = NULL;
+gchar *request_token = NULL;
+
+
+//static (private) variables
+static Tuple * playing_track = NULL;
+//all times are in microseconds
+static gint64 timestamp = 0;
+static gint64 play_started_at = 0;
+static gint64 pause_started_at = 0;
+static gint64 time_until_scrobble = 0;
+static guint queue_function_ID = 0;
+
+static pthread_t communicator;
+
+static void cleanup_current_track(void) {
+
+ timestamp = 0;
+ play_started_at = 0;
+ pause_started_at = 0;
+ time_until_scrobble = 0;
+ if (queue_function_ID != 0) {
+ gboolean success = g_source_remove(queue_function_ID);
+ queue_function_ID = 0;
+ if (!success) {
+ AUDDBG("BUG: No success on g_source_remove!\n");
+ }
+ }
+ if (playing_track != NULL) {
+ tuple_unref(playing_track);
+ playing_track = NULL;
+ }
+}
+
+gchar *remove_tabs(const char *string) {
+ if (string == NULL)
+ return NULL;
+
+ gchar *result;
+ gchar **tmp = g_strsplit(string, "\t", -1);
+
+ result = g_strjoinv(" ", tmp);
+ g_strfreev(tmp);
+
+ return result;
+}
+
+static gboolean queue_track_to_scrobble (gpointer data) {
+ AUDDBG("The playing track is going to be ENQUEUED!\n.");
+ gchar *tab_remover;
+
+ char *queuepath = g_strconcat(aud_get_path(AUD_PATH_USER_DIR),"/scrobbler.log", NULL);
+
+ char *artist = tuple_get_str(playing_track, FIELD_ARTIST, NULL);
+ char *title = tuple_get_str(playing_track, FIELD_TITLE, NULL);
+ char *album = tuple_get_str(playing_track, FIELD_ALBUM, NULL);
+
+ tab_remover = remove_tabs(artist);
+ str_unref(artist);
+ artist = tab_remover;
+
+ tab_remover = remove_tabs(title);
+ str_unref(title);
+ title = tab_remover;
+
+ tab_remover = remove_tabs(album);
+ str_unref(album);
+ album = tab_remover;
+ tab_remover = NULL;
+
+ int number = tuple_get_int(playing_track, FIELD_TRACK_NUMBER, NULL);
+ int length = tuple_get_int(playing_track, FIELD_LENGTH, NULL) / 1000;
+
+ //artist, title and timestamp are required for a successful scrobble
+ if ( artist != NULL && strlen(artist) > 0
+ && title != NULL && strlen(title) > 0) {
+
+ pthread_mutex_lock(&log_access_mutex);
+ FILE *f = fopen(queuepath, "a");
+
+ if (f == NULL) {
+ perror("fopen");
+ } else {
+ //This isn't exactly the scrobbler.log format because the header
+ //is missing, but we're sticking to it anyway...
+ //See http://www.audioscrobbler.net/wiki/Portable_Player_Logging
+ if (fprintf(f, "%s\t%s\t%s\t%i\t%i\t%s\t%"G_GINT64_FORMAT"\n",
+ artist, (album == NULL ? "" : album), title, number, length, "L", timestamp
+ ) < 0) {
+ perror("fprintf");
+ } else {
+ pthread_mutex_lock(&communication_mutex);
+ pthread_cond_signal(&communication_signal);
+ pthread_mutex_unlock(&communication_mutex);
+ }
+ fclose(f);
+ }
+ pthread_mutex_unlock(&log_access_mutex);
+ }
+ g_free(queuepath);
+ g_free(artist);
+ g_free(title);
+ g_free(album);
+
+ cleanup_current_track();
+ return FALSE;
+}
+
+
+static void stopped (void *hook_data, void *user_data) {
+ // Called when pressing STOP and when the playlist ends.
+ cleanup_current_track();
+}
+
+static void ended (void *hook_data, void *user_data) {
+ //Called when when a track finishes playing.
+
+ //TODO: hic sunt race conditions
+ if (playing_track != NULL && (g_get_monotonic_time() > (play_started_at + 30*G_USEC_PER_SEC)) ) {
+ //This is an odd situation when the track's real length doesn't correspond to the length reported by the player.
+ //If we are at the end of the track, it is longer than 30 seconds and it wasn't scrobbled, we scrobble it by then.
+
+ if (queue_function_ID != 0) {
+ gboolean success = g_source_remove(queue_function_ID);
+ queue_function_ID = 0;
+ if (!success) {
+ AUDDBG("BUG or race condition: Could not remove source.\n");
+ } else {
+ queue_track_to_scrobble(NULL);
+ }
+ }
+ }
+
+ cleanup_current_track();
+}
+
+static void ready (void *hook_data, void *user_data) {
+ cleanup_current_track();
+
+ Tuple *current_track = aud_playlist_entry_get_tuple(aud_playlist_get_playing(), aud_playlist_get_position(aud_playlist_get_playing()), FALSE);
+
+ int duration_seconds = tuple_get_int(current_track, FIELD_LENGTH, NULL) / 1000;
+ if (duration_seconds <= 30) {
+ tuple_unref(current_track);
+ return;
+ }
+
+ pthread_mutex_lock(&communication_mutex);
+ now_playing_track = tuple_ref(current_track);
+ now_playing_requested = TRUE;
+ pthread_cond_signal(&communication_signal);
+ pthread_mutex_unlock(&communication_mutex);
+
+ time_until_scrobble = (((gint64)duration_seconds)*G_USEC_PER_SEC) / 2;
+ if (time_until_scrobble > 4*60*G_USEC_PER_SEC) {
+ time_until_scrobble = 4*60*G_USEC_PER_SEC;
+ }
+ timestamp = g_get_real_time() / G_USEC_PER_SEC;
+ play_started_at = g_get_monotonic_time();
+ playing_track = current_track;
+
+ queue_function_ID = g_timeout_add_seconds(time_until_scrobble / G_USEC_PER_SEC, (GSourceFunc) queue_track_to_scrobble, NULL);
+
+}
+
+static void paused (void *hook_data, void *user_data) {
+ if (playing_track == NULL) {
+ //This happens when audacious is started in paused mode
+ return;
+ }
+
+ gboolean success = g_source_remove(queue_function_ID);
+ queue_function_ID = 0;
+ if (!success) {
+ AUDDBG("BUG: Could not remove source.\n");
+ return;
+ }
+
+ pause_started_at = g_get_monotonic_time();
+}
+
+static void unpaused (void *hook_data, void *user_data) {
+
+ if (playing_track == NULL
+ || pause_started_at == 0) { //TODO: audacious was started with a paused track.
+ return;
+ }
+ time_until_scrobble = time_until_scrobble - (pause_started_at - play_started_at);
+
+ queue_function_ID = g_timeout_add_seconds(time_until_scrobble / G_USEC_PER_SEC, (GSourceFunc) queue_track_to_scrobble, NULL);
+
+ pause_started_at = 0;
+ play_started_at = g_get_monotonic_time();
+}
+
+
+
+static bool_t scrobbler_init (void) {
+ // Initialize libXML and check potential ABI mismatches between
+ // the version it was compiled for and the actual libXML in use
+ LIBXML_TEST_VERSION
+
+ if (scrobbler_communication_init() == FALSE) {
+ aud_interface_show_error(_("The Scrobbler plugin could not be started.\n"
+ "There might be a problem with your installation."));
+ return FALSE;
+ }
+
+ session_key = aud_get_string("scrobbler", "session_key");
+ if (session_key != NULL && strlen(session_key) == 0) {
+ session_key = NULL;
+ scrobbling_enabled = FALSE;
+ }
+ request_token = NULL;
+
+ //TODO: Remove this after we are "sure" that noone is using the old scrobbler (from audacious < 3.4)
+ //By Debian's standard, this will probably be by 2020 or so
+ //Migration from the old scrobbler config
+ if (session_key == NULL) {
+ //We haven't been configured yet
+
+ char *migrated = aud_get_string("scrobbler", "migrated");
+ if (g_strcmp0(migrated, "true") != 0) {
+ //We haven't been migrated yet
+
+ char *oldpass = aud_get_string("audioscrobbler","password");
+ if (oldpass != NULL && strlen(oldpass) != 0) {
+
+ char *olduser = aud_get_string("audioscrobbler","username");
+ if (olduser != NULL && strlen(olduser) != 0) {
+ //And the old scrobbler was configured
+
+ session_key = NULL;
+ scrobbling_enabled = FALSE;
+ migrate_config_requested = TRUE;
+ }
+ g_free(olduser);
+ }
+ g_free(oldpass);
+ }
+ g_free(migrated);
+ }
+
+
+
+ pthread_create(&communicator, NULL, scrobbling_thread, NULL);
+
+ hook_associate("playback stop", (HookFunction) stopped, NULL);
+ hook_associate("playback end", (HookFunction) ended, NULL);
+ hook_associate("playback ready", (HookFunction) ready, NULL);
+ hook_associate("playback pause", (HookFunction) paused, NULL);
+ hook_associate("playback unpause", (HookFunction) unpaused, NULL);
+ return TRUE;
+}
+
+static void scrobbler_cleanup (void) {
+
+ hook_dissociate("playback stop", (HookFunction) stopped);
+ hook_dissociate("playback end", (HookFunction) ended);
+ hook_dissociate("playback ready", (HookFunction) ready);
+ hook_dissociate("playback pause", (HookFunction) paused);
+ hook_dissociate("playback unpause", (HookFunction) unpaused);
+
+ cleanup_current_track();
+
+ scrobbling_enabled = FALSE;
+ scrobbler_running = FALSE;
+ pthread_mutex_lock(&communication_mutex);
+ pthread_cond_signal(&communication_signal);
+ pthread_mutex_unlock(&communication_mutex);
+
+ pthread_join(communicator, NULL);
+
+ g_free(request_token);
+ g_free(session_key);
+ request_token = NULL;
+ session_key = NULL;
+ scrobbler_running = TRUE;
+}
+
+static const char scrobbler_about[] =
+ N_("Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n\n"
+ "Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n\n"
+ "Thanks to John Lindgren for giving me a hand at the beginning of this project.\n\n");
+
+
+AUD_GENERAL_PLUGIN (
+ .name = N_("Scrobbler 2.0"),
+ .domain = PACKAGE,
+ .about_text = scrobbler_about,
+ .init = scrobbler_init,
+ .cleanup = scrobbler_cleanup,
+ .prefs = &configuration //see config_window.c
+)

audacious-plugins-3.4.2.tar.bz2/src/scrobbler2/scrobbler.h Added

@@ -0,0 +1,95 @@
+/*
+ * Scrobbler Plugin v2.0 for Audacious by Pitxyoki
+ *
+ * Copyright 2012-2013 Luís Picciochi Oliveira <Pitxyoki@Gmail.com>
+ *
+ * This plugin is part of the Audacious Media Player.
+ * It is licensed under the GNU General Public License, version 3.
+ */
+
+#ifndef SCROBBLER_H_
+#define SCROBBLER_H_
+
+//external includes
+#include <pthread.h>
+#include <string.h>
+#include <glib.h>
+#include <libxml/xpath.h>
+#include <gtk/gtk.h>
+
+//audacious includes
+#include <audacious/i18n.h>
+#include <audacious/misc.h>
+#include <audacious/debug.h>
+#include <audacious/preferences.h>
+
+#define SCROBBLER_API_KEY "4b4f73bda181868353f9b438604adf52"
+#define SCROBBLER_SHARED_SECRET "716cc0a784bb62835de5bd674e65eb57"
+#define SCROBBLER_URL "https://ws.audioscrobbler.com/2.0/"
+
+
+extern const PluginPreferences configuration;
+
+extern enum permission {
+ PERMISSION_UNKNOWN,
+ PERMISSION_DENIED,
+ PERMISSION_ALLOWED,
+ PERMISSION_NONET
+} perm_result;
+
+extern bool_t scrobbler_running;
+extern bool_t scrobbling_enabled;
+
+
+//used to tell the scrobbling thread that there's something to do:
+//A new track is to be scrobbled or a permission check was requested
+extern pthread_mutex_t communication_mutex;
+extern pthread_cond_t communication_signal;
+
+//to avoid reading/writing the log file while other thread is accessing it
+extern pthread_mutex_t log_access_mutex;
+
+/* All "something"_requested variables are set to TRUE by the requester.
+ * The scrobbling thread shall set them to FALSE and invalidate any auxiliary
+ *data (such as now_playing_track).
+ */
+
+//TRUE when a permission check is being requested
+extern bool_t permission_check_requested;
+extern bool_t invalidate_session_requested;
+
+//Migrate the settings from the old scrobbler
+extern bool_t migrate_config_requested;
+
+//Send "now playing"
+extern bool_t now_playing_requested;
+extern Tuple *now_playing_track;
+
+
+
+
+//scrobbler_communication.c
+extern bool_t scrobbler_communication_init();
+extern gpointer scrobbling_thread(gpointer data);
+
+
+
+/* Internal stuff */
+//Data sent to the XML parser
+extern gchar *received_data;
+extern size_t received_data_size;
+
+//Data filled by the XML parser
+extern gchar *request_token;
+extern gchar *session_key;
+extern gchar *username;
+
+//scrobbler_xml_parsing.c
+extern bool_t read_authentication_test_result(char **error_code, char **error_detail);
+extern bool_t read_token(char **error_code, char **error_detail);
+extern bool_t read_session_key(char **error_code, char **error_detail);
+extern bool_t read_scrobble_result(char **error_code, char **error_detail, bool_t *ignored, char **ignored_code);
+
+//scrobbler.c //TODO: refactor this
+extern gchar *remove_tabs(const char *string);
+#endif /* SCROBBLER_H_ */

audacious-plugins-3.4.2.tar.bz2/src/scrobbler2/scrobbler_communication.c Added

@@ -0,0 +1,804 @@
+
+//external includes
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include <curl/curl.h>
+
+//plugin includes
+#include "scrobbler.h"
+
+typedef struct {
+ gchar *paramName;
+ gchar *argument;
+} API_Parameter;
+
+static CURL *curlHandle = NULL; //global handle holding cURL options
+
+bool_t scrobbling_enabled = TRUE;
+
+//shared variables
+gchar *received_data = NULL; //Holds the result of the last request made to last.fm
+size_t received_data_size = 0; //Holds the size of the received_data buffer
+
+
+
+// The cURL callback function to store the received data from the last.fm servers.
+static size_t result_callback (void *buffer, size_t size, size_t nmemb, void *userp) {
+
+ const size_t len = size*nmemb;
+
+ gchar *temp_data = realloc(received_data, received_data_size + len + 1);
+
+ if (temp_data == NULL) {
+ return 0;
+ } else {
+ received_data = temp_data;
+ }
+
+ memcpy(received_data + received_data_size, buffer, len);
+
+ received_data_size += len;
+
+ return len;
+}
+
+static int scrobbler_compare_API_Parameters(const void *a, const void *b) {
+ return g_strcmp0(((const API_Parameter *) a)->paramName, ((const API_Parameter *) b)->paramName);
+}
+
+static char *scrobbler_get_signature(int nparams, API_Parameter *parameters) {
+ qsort(parameters, nparams, sizeof(API_Parameter), scrobbler_compare_API_Parameters);
+
+ char *all_params = NULL;
+ gchar *result = NULL;
+ gchar *api_sig = NULL;
+ size_t api_sig_length = strlen(SCROBBLER_SHARED_SECRET);
+
+ for (gint i = 0; i < nparams; i++) {
+ api_sig_length += strlen(parameters[i].paramName) + strlen(parameters[i].argument);
+ }
+ all_params = calloc(api_sig_length, sizeof(gchar));
+
+ for (int i = 0; i < nparams; i++) {
+ strcat(all_params, parameters[i].paramName);
+ strcat(all_params, parameters[i].argument);
+ }
+
+ api_sig = g_strconcat(all_params, SCROBBLER_SHARED_SECRET, NULL);
+ free(all_params);
+
+
+ result = g_compute_checksum_for_string(G_CHECKSUM_MD5, api_sig, -1);
+ g_free(api_sig);
+ return result;
+}
+
+
+
+
+/*
+ * n_args should count with the given authentication parameters
+ * At most 2: api_key, session_key.
+ * api_sig (checksum) is always included, be it necessary or not
+ * Example usage:
+ * create_message_to_lastfm("track.scrobble", 5
+ * "artist", "Artist Name", "track", "Track Name", "timestamp", time(NULL),
+ * "api_key", SCROBBLER_API_KEY, "sk", session_key);
+ *
+ * Returns NULL if an error occurrs
+ */
+static gchar *create_message_to_lastfm (char *method_name, int n_args, ...) {
+ //TODO: Improve this f-ugly mess.
+ gchar *result = NULL;
+
+ //parameters to be sent to the get_signature() function
+ API_Parameter signable_params[n_args+1];
+ signable_params[0].paramName = g_strdup("method");
+ signable_params[0].argument = g_strdup(method_name);
+
+ size_t msg_size = 2; // First '=' and final '\0'
+ msg_size = msg_size + strlen("method") + strlen(method_name);
+
+ va_list vl;
+ va_start(vl, n_args);
+ for (int i = 0; i < n_args; i++) {
+
+ signable_params[i+1].paramName = g_strdup(va_arg(vl, gchar *));
+ signable_params[i+1].argument = g_strdup(va_arg(vl, gchar *));
+
+ msg_size += strlen( signable_params[i+1].paramName );
+ msg_size += strlen( signable_params[i+1].argument );
+ msg_size += 2; //Counting '&' and '='
+ }
+ va_end(vl);
+
+ gchar *aux;
+ result = g_strconcat("method=", method_name, NULL);
+ char *escaped_argument;
+
+ for (int i = 0; i < n_args; i++) {
+ escaped_argument = curl_easy_escape(curlHandle, signable_params[i+1].argument, 0);
+
+ aux = g_strdup_printf("%s&%s=%s", result, signable_params[i+1].paramName, escaped_argument);
+ g_free(result);
+ curl_free(escaped_argument);
+ result = aux;
+ }
+
+ gchar *api_sig = scrobbler_get_signature(n_args+1, signable_params);
+
+ aux = g_strdup_printf("%s&api_sig=%s", result, api_sig);
+ result = aux;
+
+ AUDDBG("FINAL message: %s.\n", result);
+ g_free(api_sig);
+ for (int i = 0; i < n_args+1; i++) {
+ g_free(signable_params[i].paramName);
+ g_free(signable_params[i].argument);
+ }
+
+ return result;
+}
+
+
+static bool_t send_message_to_lastfm(gchar *data) {
+ AUDDBG("This message will be sent to last.fm:\n%s\n%%%%End of message%%%%\n", data);//Enter?\n", data);
+ curl_easy_setopt(curlHandle, CURLOPT_POSTFIELDS, data);
+ CURLcode curl_requests_result = curl_easy_perform(curlHandle);
+
+ if (curl_requests_result != CURLE_OK) {
+ AUDDBG("Could not communicate with last.fm: %s.\n", curl_easy_strerror(curl_requests_result));
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
+//returns:
+// FALSE if there was a network problem
+// TRUE otherwise (request_token must be checked)
+static bool_t scrobbler_request_token() {
+ gchar *tokenmsg = create_message_to_lastfm("auth.getToken",
+ 1,
+ "api_key", SCROBBLER_API_KEY
+ );
+
+ if (send_message_to_lastfm(tokenmsg) == FALSE) {
+ AUDDBG("Could not send token request to last.fm.\n");
+ g_free(tokenmsg);
+ return FALSE;
+ }
+
+ gchar *error_code = NULL;
+ gchar *error_detail = NULL;
+ if (read_token(&error_code, &error_detail) == FALSE) {
+ if (error_code != NULL && g_strcmp0(error_code, "8")) {
+ //error code 8: There was an error granting the request token. Please try again later
+ request_token = NULL;
+ return FALSE;
+ }
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+
+static bool_t update_session_key() {
+ bool_t result = TRUE;
+ gchar *error_code = NULL;
+ gchar *error_detail = NULL;
+
+ if (read_session_key(&error_code, &error_detail) == FALSE) {
+ if (error_code != NULL && (
+ g_strcmp0(error_code, "4") == 0 || //invalid token
+ g_strcmp0(error_code, "14") == 0 || //token not authorized
+ g_strcmp0(error_code, "15") == 0 //token expired
+ )) {
+ AUDDBG("error code CAUGHT: %s\n", error_code);
+ g_free(session_key);
+ session_key = NULL;
+ result = TRUE;
+ } else {
+ result= FALSE;
+ }
+ }
+
+ if (session_key == NULL) {
+ aud_set_string("scrobbler", "session_key", "");
+ } else {
+ aud_set_string("scrobbler", "session_key", session_key);
+ }
+ return result;
+}
+
+//returns:
+// FALSE if there was a network problem
+// TRUE otherwise (session_key must be checked)
+static bool_t scrobbler_request_session() {
+
+ gchar *sessionmsg = create_message_to_lastfm("auth.getSession",
+ 2,
+ "token", request_token,
+ "api_key", SCROBBLER_API_KEY);
+
+ if (send_message_to_lastfm(sessionmsg) == FALSE) {
+ g_free(sessionmsg);
+ return FALSE;
+ }
+
+ g_free(sessionmsg);
+ //the token can only be sent once
+ if (request_token != NULL) {
+ g_free(request_token);
+ }
+ request_token = NULL;
+
+ return update_session_key();
+}
+
+
+
+//returns:
+// FALSE if there was a network problem.
+// TRUE otherwise (scrobbling_enabled must be checked)
+//sets scrobbling_enabled to TRUE if the session is OK
+//sets session_key to NULL if it is invalid
+static bool_t scrobbler_test_connection() {
+
+ if (session_key == NULL || strlen(session_key) == 0) {
+ scrobbling_enabled = FALSE;
+ return TRUE;
+ }
+
+
+ gchar *testmsg = create_message_to_lastfm("user.getRecommendedArtists",
+ 3,
+ "limit", "1",
+ "api_key", SCROBBLER_API_KEY,
+ "sk", session_key
+ );
+ bool_t success = send_message_to_lastfm(testmsg);
+ g_free(testmsg);
+ if (success == FALSE) {
+ AUDDBG("Network problems. Will not scrobble any tracks.\n");
+ scrobbling_enabled = FALSE;
+ if (permission_check_requested) {
+ perm_result = PERMISSION_NONET;
+ }
+ return FALSE;
+ }
+
+ gchar *error_code = NULL;
+ gchar *error_detail = NULL;
+ if (read_authentication_test_result(&error_code, &error_detail) == FALSE) {
+ AUDDBG("Error code: %s. Detail: %s.\n", error_code, error_detail);
+ if (error_code != NULL && (
+ g_strcmp0(error_code, "4") == 0 || //error code 4: Authentication Failed - You do not have permissions to access the service
+ g_strcmp0(error_code, "9") == 0 //error code 9: Invalid session key - Please re-authenticate
+ )) {
+ g_free(error_code);
+ g_free(error_detail);
+ g_free(session_key);
+ session_key = NULL;
+ aud_set_string("scrobbler", "session_key", "");
+ scrobbling_enabled = FALSE;
+ return TRUE;
+ } else {
+ //network problem.
+ scrobbling_enabled = FALSE;
+ AUDDBG("Connection NOT OK. Scrobbling disabled\n");
+ return FALSE;
+ }
+ } else {
+ //THIS IS THE ONLY PLACE WHERE SCROBBLING IS SET TO ENABLED IN RUN-TIME
+ scrobbling_enabled = TRUE;
+ AUDDBG("Connection OK. Scrobbling enabled.\n");
+ return TRUE;
+ }
+}
+
+//called from scrobbler_init() @ scrobbler.c
+bool_t scrobbler_communication_init() {
+ CURLcode curl_requests_result = curl_global_init(CURL_GLOBAL_DEFAULT);
+ if (curl_requests_result != CURLE_OK) {
+ AUDDBG("Could not initialize libCURL: %s.\n", curl_easy_strerror(curl_requests_result));
+ return FALSE;
+ }
+
+ curlHandle = curl_easy_init();
+ if (curlHandle == NULL) {
+ AUDDBG("Could not initialize libCURL.\n");
+ return FALSE;
+ }
+
+ curl_requests_result = curl_easy_setopt(curlHandle, CURLOPT_URL, SCROBBLER_URL);
+ if (curl_requests_result != CURLE_OK) {
+ AUDDBG("Could not define scrobbler destination URL: %s.\n", curl_easy_strerror(curl_requests_result));
+ return FALSE;
+ }
+
+ curl_requests_result = curl_easy_setopt(curlHandle, CURLOPT_WRITEFUNCTION, result_callback);
+ if (curl_requests_result != CURLE_OK) {
+ AUDDBG("Could not register scrobbler callback function: %s.\n", curl_easy_strerror(curl_requests_result));
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+static void set_timestamp_to_current(gchar **line) {
+ //line[0] line[1] line[2] line[3] line[4] line[5] line[6] line[7]
+ //artist album title number length "L" timestamp NULL
+
+ gchar **splitted_line = g_strsplit(*line, "\t", 0);
+ g_free(splitted_line[6]);
+ splitted_line[6] = g_strdup_printf("%"G_GINT64_FORMAT"", g_get_real_time() / G_USEC_PER_SEC);
+ AUDDBG("splitted line's timestamp is now: %s.\n", splitted_line[6]);
+ g_free(*line);
+ (*line) = g_strjoinv("\t", splitted_line);
+}
+
+static void delete_lines_from_scrobble_log (GSList **lines_to_remove_ptr, GSList **lines_to_retry_ptr, gchar *queuepath) {
+ GSList *lines_to_remove = *lines_to_remove_ptr;
+ GSList *lines_to_retry = *lines_to_retry_ptr;
+ gchar *contents = NULL;
+ gchar **lines = NULL;
+ gchar **finallines = g_malloc_n(1, sizeof(gchar *));
+ int n_finallines;
+
+ if (lines_to_remove != NULL) {
+ lines_to_remove = g_slist_reverse(lines_to_remove);
+ }
+ if (lines_to_retry != NULL) {
+ lines_to_retry = g_slist_reverse(lines_to_retry);
+ }
+
+
+ pthread_mutex_lock(&log_access_mutex);
+
+ gboolean success = g_file_get_contents(queuepath, &contents, NULL, NULL);
+ if (!success) {
+ AUDDBG("Could not read scrobbler.log contents.\n");
+ } else {
+ lines = g_strsplit(contents, "\n", 0);
+
+ n_finallines = 0;
+ for (int i = 0 ; lines[i] != NULL && strlen(lines[i]) > 0; i++) {
+ if (lines_to_remove != NULL && *((int *) (lines_to_remove->data)) == i) {
+ //this line is to remove
+ lines_to_remove = g_slist_next(lines_to_remove);
+ } else {
+ //keep this line
+ AUDDBG("Going to keep line %i\n", i);
+ if (lines_to_retry != NULL && *((int *) (lines_to_retry->data)) == i) {
+ lines_to_retry = g_slist_next(lines_to_retry);
+ //this line will be retried with a zero timestamp
+ AUDDBG("Going to zero this line.\n");
+ AUDDBG("Line before: %s.\n", lines[i]);
+ set_timestamp_to_current(&(lines[i]));
+ AUDDBG("Line after: %s.\n", lines[i]);
+
+ } else {
+ AUDDBG("not zeroing this line\n");
+ }
+ n_finallines++;
+ finallines = g_realloc_n(finallines, n_finallines, sizeof(gchar *));
+ finallines[n_finallines-1] = g_strdup(lines[i]);
+ }
+ }
+
+ finallines = g_realloc_n(finallines, n_finallines+2, sizeof(gchar *));
+ finallines[n_finallines] = g_strdup("");
+ finallines[n_finallines+1] = NULL;
+ g_free(contents);
+ contents = g_strjoinv("\n", finallines);
+ success = g_file_set_contents(queuepath, contents, -1, NULL);
+ if (!success) {
+ AUDDBG("Could not write to scrobbler.log!\n");
+ }
+
+ }
+
+ pthread_mutex_unlock(&log_access_mutex);
+
+
+ g_strfreev(finallines);
+ g_strfreev(lines);
+ g_free(contents);
+}
+
+static void save_line_to_remove(GSList **lines_to_remove, int linenumber) {
+ int *rem = g_malloc(sizeof(int));
+ *rem = linenumber;
+ (*lines_to_remove) = g_slist_prepend((*lines_to_remove), rem);
+}
+
+static void scrobble_cached_queue() {
+
+ gchar *queuepath = g_build_filename(aud_get_path(AUD_PATH_USER_DIR),"scrobbler.log", NULL);
+ gchar *contents = NULL;
+ gboolean success;
+ gchar **lines = NULL;
+ gchar **line;
+ gchar *scrobblemsg;
+ GSList *lines_to_remove = NULL; //lines to remove because they were scrobbled (or ignored, and will not be retried)
+ GSList *lines_to_retry = NULL; //lines to retry later because they were too old TODO: or "daily scrobble limit reached"
+ gchar *error_code = NULL;
+ gchar *error_detail = NULL;
+ bool_t ignored = FALSE;
+ gchar *ignored_code = NULL;
+
+ pthread_mutex_lock(&log_access_mutex);
+ success = g_file_get_contents(queuepath, &contents, NULL, NULL);
+ pthread_mutex_unlock(&log_access_mutex);
+ if (!success) {
+ AUDDBG("Couldn't access the queue file.\n");
+ } else {
+
+ lines = g_strsplit(contents, "\n", 0);
+
+ for (int i = 0; lines[i] != NULL && strlen(lines[i]) > 0 && scrobbling_enabled; i++) {
+ line = g_strsplit(lines[i], "\t", 0);
+
+ //line[0] line[1] line[2] line[3] line[4] line[5] line[6] line[7]
+ //artist album title number length "L" timestamp NULL
+
+ if (line[0] && line[2] && (strcmp(line[5], "L") == 0) && line[6] && (line[7] == NULL)) {
+ scrobblemsg = create_message_to_lastfm("track.scrobble",
+ 8,
+ "artist", line[0],
+ "album", line[1],
+ "track", line[2],
+ "trackNumber", line[3],
+ "duration", line[4],
+ "timestamp", line[6],
+ "api_key", SCROBBLER_API_KEY,
+ "sk", session_key);
+ if (send_message_to_lastfm(scrobblemsg) == TRUE) {
+ error_code = NULL;
+ error_detail = NULL;
+ if (read_scrobble_result(&error_code, &error_detail, &ignored, &ignored_code) == TRUE) {
+ AUDDBG("SCROBBLE OK. Error code: %s. Error detail: %s\n", error_code, error_detail);
+ AUDDBG("SCROBBLE OK. ignored: %i.\n", ignored);
+ AUDDBG("SCROBBLE OK. ignored code: %s.\n", ignored_code);
+ if (ignored == TRUE && g_strcmp0(ignored_code, "3") == 0) { //3: Timestamp was too old
+ AUDDBG("SCROBBLE IGNORED!!! %i, detail: %s\n", ignored, ignored_code);
+ save_line_to_remove(&lines_to_retry, i);
+ } else if (ignored == TRUE && g_strcmp0(ignored_code, "") == 0) { //5: Daily scrobble limit reached
+ //TODO: a track might not be scrobbled due to "daily scrobble limit exeeded".
+ //This message comes on the ignoredMessage attribute, inside the XML of the response.
+ //We are not dealing with this case currently and are losing that scrobble.
+ //TODO
+
+ } else {
+ AUDDBG("Not ignored. Carrying on...\n");
+ save_line_to_remove(&lines_to_remove, i);
+ }
+ } else {
+ AUDDBG("SCROBBLE NOT OK. Error code: %s. Error detail: %s.\n", error_code, error_detail);
+
+ if (error_code == NULL) { //net error(?) or the answer from last.fm was not well read
+ //scrobble to be retried
+ }
+ else if (g_strcmp0(error_code, "11") == 0 ||
+ g_strcmp0(error_code, "16") == 0){
+ //error code 11: Service Offline - This service is temporarily offline. Try again later.
+ //error code 16: The service is temporarily unavailable, please try again.
+ //scrobble to be retried
+ }
+ else if (g_strcmp0(error_code, "9") == 0) {
+ //Bad Session. Reauth.
+ scrobbling_enabled = FALSE;
+ g_free(session_key);
+ session_key = NULL;
+ aud_set_string("scrobbler", "session_key", "");
+ }
+ else {
+ save_line_to_remove(&lines_to_remove, i);
+ }
+ }
+
+ g_free(error_code);
+ g_free(error_detail);
+
+ } else {
+ AUDDBG("Could not scrobble a track on the queue. Network problem?\n");
+ //scrobble to be retried
+ scrobbling_enabled = FALSE;
+ }
+
+ g_free(scrobblemsg);
+ //TODO: Avoid spamming last.fm --- It's not as simple as just adding a wait here:
+ //If audacious is closed while we're on this loop, tracks might be re-scrobbled.
+ //This shall be doable if we only pick one track at a time from the scrobbler.log
+ } else {
+ AUDDBG("Unscrobbable line.\n");
+ //leave entry on the cache file
+ }
+ g_strfreev(line);
+ }//for
+
+
+ delete_lines_from_scrobble_log(&lines_to_remove, &lines_to_retry, queuepath);
+
+ if (lines_to_remove != NULL) {
+ g_slist_free_full(lines_to_remove, g_free);
+ }
+ if (lines_to_retry != NULL) {
+ g_slist_free_full(lines_to_retry, g_free);
+ }
+
+ g_strfreev(lines);
+ }
+
+ g_free(contents);
+ g_free(queuepath);
+}
+
+
+static void send_now_playing() {
+
+ gchar *error_code = NULL;
+ gchar *error_detail = NULL;
+ bool_t ignored = FALSE;
+ gchar *ignored_code = NULL;
+ /*
+ * now_playing_track can be set to something else while we this method is
+ * running. Creating a local variable avoids to get data for different tracks,
+ * while now_playing_track was updated concurrently.
+ */
+ Tuple *curr_track = now_playing_track;
+
+ gchar *tab_remover;
+
+ gchar *artist = tuple_get_str(curr_track, FIELD_ARTIST, NULL);
+ gchar *album = tuple_get_str(curr_track, FIELD_ALBUM, NULL);
+ gchar *title = tuple_get_str(curr_track, FIELD_TITLE, NULL);
+
+ tab_remover = remove_tabs(artist);
+ str_unref(artist);
+ artist = tab_remover;
+
+ tab_remover = remove_tabs(album);
+ str_unref(album);
+ album = tab_remover;
+
+ tab_remover = remove_tabs(title);
+ str_unref(title);
+ title = tab_remover;
+
+ tab_remover = NULL;
+
+ gchar *number = g_strdup_printf("%i", tuple_get_int(curr_track, FIELD_TRACK_NUMBER, NULL));
+ gchar *length = g_strdup_printf("%i", tuple_get_int(curr_track, FIELD_LENGTH, NULL) / 1000);
+ tuple_unref(curr_track);
+
+
+ if (artist != NULL && strlen(artist) > 0 &&
+ title != NULL && strlen(title) > 0) {
+
+ gchar *playingmsg = create_message_to_lastfm("track.updateNowPlaying",
+ 7,
+ "artist", artist,
+ "album", (album == NULL ? "" : album),
+ "track", title,
+ "trackNumber", number,
+ "duration", length,
+ "api_key", SCROBBLER_API_KEY,
+ "sk", session_key);
+ g_free(artist);
+ g_free(album);
+ g_free(title);
+ g_free(number);
+ g_free(length);
+
+ bool_t success = send_message_to_lastfm(playingmsg);
+ g_free(playingmsg);
+ if (success == FALSE) {
+ AUDDBG("Network problems. Could not send \"now playing\" to last.fm\n");
+ scrobbling_enabled = FALSE;
+ return;
+ }
+
+ if (read_scrobble_result(&error_code, &error_detail, &ignored, &ignored_code) == TRUE) {
+ //see scrobble_cached_queue()
+ AUDDBG("NOW PLAYING OK.\n");
+ } else {
+ AUDDBG("NOW PLAYING NOT OK. Error code: %s. Error detail: %s.\n", error_code, error_detail);
+ //From the API: Now Playing requests that fail should not be retried.
+
+ if (g_strcmp0(error_code, "9") == 0) {
+ //Bad Session. Reauth.
+ //We don't really care about any other errors.
+ scrobbling_enabled = FALSE;
+ g_free(session_key);
+ session_key = NULL;
+ aud_set_string("scrobbler", "session_key", "");
+ }
+
+ }
+ g_free(error_code);
+ g_free(error_detail);
+ g_free(ignored_code);
+ //We don't care if the now playing was not accepted, no need to read the result from the server.
+
+ }
+}
+
+static void treat_permission_check_request() {
+ if (session_key == NULL || strlen(session_key) == 0) {
+ perm_result = PERMISSION_DENIED;
+
+ if (request_token == NULL || strlen(request_token) == 0) {
+ if (scrobbler_request_token() == FALSE || request_token == NULL || strlen(request_token) == 0) {
+ perm_result = PERMISSION_NONET;
+ } //else PERMISSION_DENIED
+
+ } else if (scrobbler_request_session() == FALSE) {
+ perm_result = PERMISSION_NONET;
+
+ } else if (session_key == NULL || strlen(session_key) == 0) {
+ //This means we had a token, a session was requested now,
+ //but the token was not accepted or expired.
+ //Ask for a new token now.
+ if (scrobbler_request_token() == FALSE || request_token == NULL || strlen(request_token) == 0) {
+ perm_result = PERMISSION_NONET;
+ } //else PERMISSION_DENIED
+ }
+ }
+ if (session_key != NULL && strlen(session_key) != 0 ){
+ if (scrobbler_test_connection() == FALSE) {
+ perm_result = PERMISSION_NONET;
+
+ if (session_key == NULL || strlen(session_key) == 0) {
+ if (scrobbler_request_token() != FALSE && request_token != NULL && strlen(request_token) != 0) {
+ perm_result = PERMISSION_DENIED;
+ } //else PERMISSION_NONET
+ }
+
+ } else {
+ if (scrobbling_enabled) {
+ perm_result = PERMISSION_ALLOWED;
+ } else {
+ /* This means that we have a session key but couldn't make
+ * an authenticated call with it. This happens when:
+ * a) the user revoked the permission to Audacious on his
+ * last.fm account OR
+ * b) something might be wrong on last.fm's side (?) OR
+ * c) the user fiddled with the audacious config file and
+ * the key is now invalid
+ */
+ if (scrobbler_request_token() != FALSE && request_token != NULL && strlen(request_token) != 0) {
+ perm_result = PERMISSION_DENIED;
+ } else {
+ perm_result = PERMISSION_NONET;
+ }
+ }
+ }
+ } //session_key == NULL || strlen(session_key) == 0
+}
+
+// This is a sister function of scrobbler_request_session, using the getMobileSession
+//API call, for migrating from the old config
+//returns:
+// FALSE if there was a network problem OR a session_key was not obtained
+// TRUE if a new session_key was obtained
+static bool_t treat_migrate_config() {
+
+ char *password = aud_get_string("audioscrobbler","password");
+ if (password == NULL || strlen(password) == 0) {
+ g_free(password);
+ return FALSE;
+ }
+
+ char *username = aud_get_string("audioscrobbler","username");
+ if (username == NULL || strlen(username) == 0) {
+ g_free(password);
+ g_free(username);
+ return FALSE;
+ }
+
+ gchar *checksumThis = g_strdup_printf("%s%s", username, password);
+ gchar *authToken = g_compute_checksum_for_string(G_CHECKSUM_MD5, checksumThis, -1);
+
+ gchar *sessionmsg = create_message_to_lastfm("auth.getMobileSession",
+ 3,
+ "authToken", authToken,
+ "username", username,
+ "api_key", SCROBBLER_API_KEY);
+ g_free(username);
+ g_free(password);
+ g_free(checksumThis);
+ g_free(authToken);
+
+ if (send_message_to_lastfm(sessionmsg) == FALSE) {
+ g_free(sessionmsg);
+ return FALSE;
+ }
+
+ g_free(sessionmsg);
+
+ if (update_session_key() == TRUE) {
+ if(session_key != NULL && strlen(session_key) != 0) {
+ return TRUE;
+ } else {
+ return FALSE;
+ }
+ } else {
+ return FALSE;
+ }
+}
+
+
+//Scrobbling will only be enabled after the first connection test passed
+gpointer scrobbling_thread (gpointer input_data) {
+
+ while (scrobbler_running) {
+
+ if (migrate_config_requested) {
+ if (treat_migrate_config() == FALSE) {
+ aud_interface_show_error(_("Audacious is now using an improved version of the Last.fm Scrobbler.\nPlease check the Preferences for the Scrobbler plugin."));
+ }
+ aud_set_string("scrobbler", "migrated", "true");
+ migrate_config_requested = FALSE;
+
+ } else if (permission_check_requested) {
+ treat_permission_check_request();
+ permission_check_requested = FALSE;
+
+ } else if (invalidate_session_requested) {
+ session_key = NULL;
+ aud_set_string("scrobbler", "session_key", "");
+ invalidate_session_requested = FALSE;
+
+ } else if (now_playing_requested) {
+ if (scrobbling_enabled) {
+ send_now_playing();
+ }
+ now_playing_requested = FALSE;
+
+ } else {
+ if (scrobbling_enabled) {
+ scrobble_cached_queue();
+ }
+ //scrobbling may be disabled at this point if communication errors occur
+
+ pthread_mutex_lock(&communication_mutex);
+ if (scrobbling_enabled) {
+ pthread_cond_wait(&communication_signal, &communication_mutex);
+ pthread_mutex_unlock(&communication_mutex);
+ }
+ else {
+ //We don't want to wait until receiving a signal to retry
+ //if submitting the cache failed due to network problems
+ pthread_mutex_unlock(&communication_mutex);
+
+ if (scrobbler_test_connection() == FALSE || !scrobbling_enabled) {
+ struct timeval curtime;
+ struct timespec timeout;
+ pthread_mutex_lock(&communication_mutex);
+ gettimeofday(&curtime, NULL);
+ timeout.tv_sec = curtime.tv_sec + 7;
+ timeout.tv_nsec = curtime.tv_usec * 1000;
+ pthread_cond_timedwait(&communication_signal, &communication_mutex, &timeout);
+ pthread_mutex_unlock(&communication_mutex);
+ }
+ }
+ }
+ }//while(scrobbler_running)
+
+ //reset all vars to their initial values
+ free(received_data);
+ received_data = NULL;
+ received_data_size = 0;
+
+ curl_easy_cleanup(curlHandle);
+ curlHandle = NULL;
+
+ scrobbling_enabled = TRUE;
+ return NULL;
+}
+

audacious-plugins-3.4.2.tar.bz2/src/scrobbler2/scrobbler_xml_parsing.c Added

@@ -0,0 +1,358 @@
+
+//plugin includes
+#include "scrobbler.h"
+
+//static (private) variables
+static xmlDocPtr doc = NULL;
+static xmlXPathContextPtr context = NULL;
+
+static bool_t prepare_data () {
+    received_data[received_data_size] = '\0';
+    AUDDBG("Data received from last.fm:\n%s\n%%%%End of data%%%%\n", received_data);
+
+    doc = xmlParseMemory(received_data, received_data_size+1);
+    received_data_size = 0;
+    if (doc == NULL) {
+        AUDDBG("Document not parsed successfully.\n");
+        return FALSE;
+    }
+
+    context = xmlXPathNewContext(doc);
+    if (context == NULL) {
+        AUDDBG("Error in xmlXPathNewContext\n");
+        xmlFreeDoc(doc);
+        doc = NULL;
+        return FALSE;
+    }
+    return TRUE;
+}
+
+static void clean_data() {
+    xmlXPathFreeContext(context);
+    xmlFreeDoc(doc);
+    context = NULL;
+    doc = NULL;
+}
+
+
+//returns:
+// NULL if an error occurs or the attribute was not found
+// the attribute's value if it was found
+static xmlChar *get_attribute_value (xmlChar *node_expression, xmlChar *attribute) {
+    if (doc == NULL || context == NULL) {
+        AUDDBG("Response from last.fm not parsed successfully. Did you call prepare_data?\n");
+        return NULL;
+    }
+
+    xmlXPathObjectPtr statusObj;
+    xmlChar *result;
+
+
+    statusObj = xmlXPathEvalExpression((xmlChar *) node_expression, context);
+    if (statusObj == NULL) {
+        AUDDBG ("Error in xmlXPathEvalExpression.\n");
+        return NULL;
+    }
+    if (xmlXPathNodeSetIsEmpty(statusObj->nodesetval)) {
+        AUDDBG("No result.\n");
+        xmlXPathFreeObject(statusObj);
+        return NULL;
+    }
+
+    result = xmlGetProp(statusObj->nodesetval->nodeTab[0], (xmlChar *) attribute);
+
+    xmlXPathFreeObject(statusObj);
+    AUDDBG("RESULT FOR THIS FUNCTION: %s.\n", result);
+    return result;
+}
+
+//returns:
+// NULL if an error occurs or the node was not found
+static xmlChar *get_node_string (const char * node_expression) {
+    if (doc == NULL || context == NULL) {
+        AUDDBG("Response from last.fm not parsed successfully. Did you call prepare_data?\n");
+        return NULL;
+    }
+
+    xmlXPathObjectPtr statusObj;
+    xmlChar *result;
+
+
+    statusObj = xmlXPathEvalExpression((xmlChar *) node_expression, context);
+    if (statusObj == NULL) {
+        AUDDBG ("Error in xmlXPathEvalExpression.\n");
+        return NULL;
+    }
+    if (xmlXPathNodeSetIsEmpty(statusObj->nodesetval)) {
+        AUDDBG("No result.\n");
+        xmlXPathFreeObject(statusObj);
+        return NULL;
+    }
+
+    result = xmlNodeListGetString(doc, statusObj->nodesetval->nodeTab[0]->children, 1);
+    xmlXPathFreeObject(statusObj);
+    AUDDBG("RESULT FOR THIS FUNCTION: %s.\n", result);
+    return result;
+}
+
+
+//returns:
+// NULL if an error occurs
+// "true" if the the command succeeded
+// "false" if an error occurred. error_code and error_detail should be checked in this case
+static xmlChar *check_status (xmlChar **error_code, xmlChar **error_detail) {
+    (*error_code) = NULL;
+    (*error_detail) = NULL;
+
+    xmlChar *status = get_attribute_value((xmlChar *) "/lfm[@status]", (xmlChar *) "status");
+    if (status == NULL || xmlStrlen(status) == 0) {
+        AUDDBG("last.fm not answering according to the API.\n");
+        return NULL;
+    }
+
+    AUDDBG ("status is %s.\n", status);
+    if (!xmlStrEqual(status, (xmlChar *) "ok")) {
+
+        (*error_code) = get_attribute_value((xmlChar *) "/lfm/error[@code]", (xmlChar *) "code");
+        if ((*error_code) == NULL || xmlStrlen(*error_code) == 0) {
+            AUDDBG("Weird API answer. Last.fm says status is %s but there is no error code?\n", status);
+            xmlFree(status);
+            status = NULL;
+        } else {
+            (*error_detail) = get_node_string("/lfm/error");
+        }
+    }
+
+    AUDDBG("check_status results: return: %s. error_code: %s. error_detail: %s.\n", status, (*error_code), (*error_detail));
+    return status;
+}
+
+/*
+ * Returns:
+ *  * TRUE if the scrobble was successful
+ *    * with ignored = TRUE if it was ignored
+ *      * ignored_code_out must be checked
+ *    * with ignored = FALSE if it was scrobbled OK
+ *  * FALSE if the scrobble was unsuccessful
+ *    * error_code_out and error_detail_out must be checked:
+ *      * They are NULL if an API communication error occur
+ */
+bool_t read_scrobble_result(char **error_code_out, char **error_detail_out, bool_t *ignored_out, char **ignored_code_out) {
+    xmlChar *status;
+    xmlChar *error_code = NULL;
+    xmlChar *error_detail = NULL;
+
+    bool_t ignored = FALSE;
+    xmlChar *ignored_code = NULL;
+
+    bool_t result = TRUE;
+
+
+    if (!prepare_data()) {
+        AUDDBG("Could not read received data from last.fm. What's up?\n");
+        return FALSE;
+    }
+
+    status = check_status(&error_code, &error_detail);
+    (*error_code_out) = g_strdup((gchar *) error_code);
+    (*error_detail_out) = g_strdup((gchar *) error_detail);
+
+
+    if (status == NULL || xmlStrlen(status) == 0) {
+        AUDDBG("Status was NULL. Invalid API answer.\n");
+        clean_data();
+        return FALSE;
+    }
+
+    if (xmlStrEqual(status, (xmlChar *) "failed")) {
+        AUDDBG("Error code: %s. Detail: %s.\n", error_code, error_detail);
+        result = FALSE;
+
+    } else {
+        //TODO: We are assuming that only one track is scrobbled per request! This will have to be
+        //re-done to support multiple tracks being scrobbled in batch
+        xmlChar *ignored_scrobble = get_attribute_value((xmlChar *) "/lfm/scrobbles[@ignored]", (xmlChar *) "ignored");
+
+        if (ignored_scrobble != NULL && ! xmlStrEqual(ignored_scrobble, (xmlChar *) "0")) {
+          //The track was ignored
+          //TODO: this assumes ignored_scrobble == 1!!!
+          ignored = TRUE;
+          ignored_code = get_attribute_value((xmlChar *) "/lfm/scrobbles/scrobble/ignoredMessage[@code]", (xmlChar *) "code");
+        }
+        if (ignored_scrobble != NULL) {
+          xmlFree(ignored_scrobble);
+        }
+        AUDDBG("ignored? %i, ignored_code: %s\n", ignored, ignored_code);
+    }
+
+    (*ignored_out) = ignored;
+    (*ignored_code_out) = g_strdup((gchar *) ignored_code);
+
+
+    xmlFree(status);
+    if (error_code != NULL) {
+        xmlFree(error_code);
+    }
+    if (error_detail != NULL) {
+        xmlFree(error_detail);
+    }
+    if (ignored_code != NULL) {
+        xmlFree(ignored_code);
+    }
+
+    clean_data();
+    return result;
+}
+
+//returns
+//FALSE if there was an error with the connection
+bool_t read_authentication_test_result (char **error_code_out, char **error_detail_out) {
+    xmlChar *status;
+    xmlChar *error_code = NULL;
+    xmlChar *error_detail = NULL;
+    bool_t result = TRUE;
+
+
+    if (!prepare_data()) {
+        AUDDBG("Could not read received data from last.fm. What's up?\n");
+        return FALSE;
+    }
+
+    status = check_status(&error_code, &error_detail);
+    (*error_code_out) = g_strdup((gchar *) error_code);
+    (*error_detail_out) = g_strdup((gchar *) error_detail);
+
+    if (status == NULL || xmlStrlen(status) == 0) {
+        AUDDBG("Status was NULL. Invalid API answer.\n");
+        clean_data();
+        return FALSE;
+    }
+
+    if (xmlStrEqual(status, (xmlChar *) "failed")) {
+        result = FALSE;
+
+    } else {
+        username = (gchar *) get_attribute_value((xmlChar *) "/lfm/recommendations[@user]", (xmlChar *) "user");
+        if (username == NULL || strlen(username) == 0) {
+          AUDDBG("last.fm not answering according to the API.\n");
+          result = FALSE;
+        }
+    }
+
+
+    xmlFree(status);
+    if (error_code != NULL) {
+        xmlFree(error_code);
+    }
+    if (error_detail != NULL) {
+        xmlFree(error_detail);
+    }
+
+    clean_data();
+    return result;
+}
+
+
+
+bool_t read_token (char **error_code_out, char **error_detail_out) {
+    xmlChar *status;
+    xmlChar *error_code = NULL;
+    xmlChar *error_detail = NULL;
+    bool_t result = TRUE;
+
+
+    if (!prepare_data()) {
+        AUDDBG("Could not read received data from last.fm. What's up?\n");
+        return FALSE;
+    }
+
+    status = check_status(&error_code, &error_detail);
+    (*error_code_out) = g_strdup((gchar *) error_code);
+    (*error_detail_out) = g_strdup((gchar *) error_detail);
+
+    if (status == NULL || xmlStrlen(status) == 0) {
+        AUDDBG("Status was NULL. Invalid API answer.\n");
+        clean_data();
+        return FALSE;
+    }
+
+    if (xmlStrEqual(status, (xmlChar *) "failed")) {
+        AUDDBG("Error code: %s. Detail: %s.\n", error_code, error_detail);
+        result = FALSE;
+    }
+    else {
+        request_token = (gchar *) get_node_string("/lfm/token");
+
+        if (request_token == NULL || strlen(request_token) == 0) {
+            AUDDBG("Could not read the received token. Something's wrong with the API?\n");
+            result = FALSE;
+        }
+        else {
+            AUDDBG("This is the token: %s.\nNice? Nice.\n", request_token);
+        }
+    }
+
+    xmlFree(status);
+    if (error_code != NULL) {
+        xmlFree(error_code);
+    }
+    if (error_detail != NULL) {
+        xmlFree(error_detail);
+    }
+
+    clean_data();
+    return result;
+}
+
+
+
+bool_t read_session_key(char **error_code_out, char **error_detail_out) {
+    xmlChar *status;
+    xmlChar *error_code = NULL;
+    xmlChar *error_detail = NULL;
+    bool_t result = TRUE;
+
+
+    if (!prepare_data()) {
+        AUDDBG("Could not read received data from last.fm. What's up?\n");
+        return FALSE;
+    }
+
+    status = check_status(&error_code, &error_detail);
+    (*error_code_out) = g_strdup((gchar *) error_code);
+    (*error_detail_out) = g_strdup((gchar *) error_detail);
+
+    if (status == NULL || xmlStrlen(status) == 0) {
+        AUDDBG("Status was NULL or empty. Invalid API answer.\n");
+        clean_data();
+        return FALSE;
+    }
+
+    if (xmlStrEqual(status, (xmlChar *) "failed")) {
+        AUDDBG("Error code: %s. Detail: %s.\n", error_code, error_detail);
+        result = FALSE;
+
+    } else {
+        g_free(session_key);
+        session_key = (gchar *) get_node_string("/lfm/session/key");
+
+        if (session_key == NULL || strlen(session_key) == 0) {
+            AUDDBG("Could not read the received session key. Something's wrong with the API?\n");
+            result = FALSE;
+        } else {
+            AUDDBG("This is the session key: %s.\n", session_key);
+        }
+    }
+
+    xmlFree(status);
+    if (error_code != NULL) {
+        xmlFree(error_code);
+    }
+    if (error_detail != NULL) {
+        xmlFree(error_detail);
+    }
+
+    clean_data();
+    return result;
+}
+

audacious-plugins-3.3.4.tar.bz2/src/sdlout/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/sdlout/plugin.c Changed

audacious-plugins-3.3.4.tar.bz2/src/search-tool/search-tool.c -> audacious-plugins-3.4.2.tar.bz2/src/search-tool/search-tool.c Changed

@@ -30,9 +30,7 @@
 #include <libaudcore/hook.h>
 #include <libaudgui/list.h>
 
-#include "config.h"
-
-#define MAX_RESULTS 12
+#define MAX_RESULTS 100
 #define SEARCH_DELAY 300
 
 enum {ARTIST, ALBUM, TITLE, FIELDS};
@@ -318,18 +316,25 @@
 
 g_hash_table_foreach (database, search_cb, & state);
 
+ int total = 0;
+
 for (int f = 0; f < FIELDS; f ++)
 {
- if (index_count (state.items[f]) <= MAX_RESULTS)
+ int count = index_count (state.items[f]);
+ if (count > MAX_RESULTS - total)
+ count = MAX_RESULTS - total;
+
+ if (count)
 {
 index_sort (state.items[f], item_compare);
- index_merge_append (items, state.items[f]);
+ index_copy_append (state.items[f], 0, items, count);
+ total += count;
 }
 
 index_free (state.items[f]);
 }
 
- g_array_set_size (selection, index_count (items));
+ g_array_set_size (selection, total);
 memset (selection->data, 0, selection->len);
 if (selection->len > 0)
 selection->data[0] = 1;

audacious-plugins-3.3.4.tar.bz2/src/sid/Makefile -> audacious-plugins-3.4.2.tar.bz2/src/sid/Makefile Changed

audacious-plugins-3.3.4.tar.bz2/src/sid/xmms-sid.c -> audacious-plugins-3.4.2.tar.bz2/src/sid/xmms-sid.c Changed

@@ -20,66 +20,38 @@
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "xmms-sid.h"
 
+#include <assert.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>
+#include <string.h>
 
-#include <audacious/debug.h>
 #include <libaudcore/audstrings.h>
+#include <audacious/plugin.h>
 
-#include "xs_config.h"
-#include "xs_length.h"
-#include "xs_stil.h"
-#include "xs_filter.h"
-#include "xs_player.h"
-#include "xs_slsup.h"
+#include "xs_sidplay2.h"
 
 
 /*
 * Global variables
 */
 xs_status_t xs_status;
-XS_MUTEX(xs_status);
-
-static void xs_get_song_tuple_info(Tuple *pResult, xs_tuneinfo_t *pInfo, gint subTune);
-
-/*
- * Error messages
- */
-void xs_verror(const gchar *fmt, va_list ap)
-{
- g_logv("AUD-SID", G_LOG_LEVEL_WARNING, fmt, ap);
-}
-
-void xs_error(const gchar *fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- xs_verror(fmt, ap);
- va_end(ap);
-}
-
-void XSDEBUG(const gchar *fmt, ...)
-{
- va_list ap;
- va_start(ap, fmt);
- char * str = g_strdup_vprintf (fmt, ap);
- AUDDBG ("%s", str);
- g_free (str);
- va_end(ap);
-}
+pthread_mutex_t xs_status_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+static void xs_get_song_tuple_info(Tuple *pResult, xs_tuneinfo_t *pInfo, int subTune);
 
 /*
 * Initialization functions
 */
-void xs_reinit(void)
+bool_t xs_init(void)
 {
- XSDEBUG("xs_reinit() thread = %p\n", g_thread_self());
+ bool_t success;
 
- XS_MUTEX_LOCK(xs_status);
- XS_MUTEX_LOCK(xs_cfg);
+ /* Initialize and get configuration */
+ xs_init_configuration();
+
+ pthread_mutex_lock(&xs_status_mutex);
+ pthread_mutex_lock(&xs_cfg_mutex);
 
 /* Initialize status and sanitize configuration */
 memset(&xs_status, 0, sizeof(xs_status));
@@ -87,32 +59,21 @@
 if (xs_cfg.audioFrequency < 8000)
 xs_cfg.audioFrequency = 8000;
 
- if (xs_cfg.oversampleFactor < XS_MIN_OVERSAMPLE)
- xs_cfg.oversampleFactor = XS_MIN_OVERSAMPLE;
- else if (xs_cfg.oversampleFactor > XS_MAX_OVERSAMPLE)
- xs_cfg.oversampleFactor = XS_MAX_OVERSAMPLE;
-
- if (xs_cfg.audioChannels != XS_CHN_MONO)
- xs_cfg.oversampleEnable = FALSE;
-
 xs_status.audioFrequency = xs_cfg.audioFrequency;
- xs_status.audioBitsPerSample = xs_cfg.audioBitsPerSample;
 xs_status.audioChannels = xs_cfg.audioChannels;
- xs_status.audioFormat = -1;
- xs_status.oversampleEnable = xs_cfg.oversampleEnable;
- xs_status.oversampleFactor = xs_cfg.oversampleFactor;
 
 /* Try to initialize emulator engine */
- xs_init_emu_engine(&xs_cfg.playerEngine, &xs_status);
+ success = xs_sidplayfp_init(&xs_status);
 
 /* Get settings back, in case the chosen emulator backend changed them */
 xs_cfg.audioFrequency = xs_status.audioFrequency;
- xs_cfg.audioBitsPerSample = xs_status.audioBitsPerSample;
 xs_cfg.audioChannels = xs_status.audioChannels;
- xs_cfg.oversampleEnable = xs_status.oversampleEnable;
 
- XS_MUTEX_UNLOCK(xs_status);
- XS_MUTEX_UNLOCK(xs_cfg);
+ pthread_mutex_unlock(&xs_status_mutex);
+ pthread_mutex_unlock(&xs_cfg_mutex);
+
+ if (! success)
+ return FALSE;
 
 /* Initialize song-length database */
 xs_songlen_close();
@@ -126,22 +87,6 @@
 xs_error("Error initializing STIL database!\n");
 }
 
-}
-
-
-/*
- * Initialize XMMS-SID
- */
-gboolean xs_init (void)
-{
- XSDEBUG("xs_init()\n");
-
- /* Initialize and get configuration */
- xs_init_configuration();
-
- /* Initialize subsystems */
- xs_reinit();
-
 return TRUE;
 }
 
@@ -151,58 +96,51 @@
 */
 void xs_close(void)
 {
- XSDEBUG("xs_close(): shutting down...\n");
-
 xs_tuneinfo_free(xs_status.tuneInfo);
 xs_status.tuneInfo = NULL;
 
- if (xs_status.sidPlayer)
- {
- xs_status.sidPlayer->plrDeleteSID (& xs_status);
- xs_status.sidPlayer->plrClose (& xs_status);
- }
+ xs_sidplayfp_delete (& xs_status);
+ xs_sidplayfp_close (& xs_status);
 
 xs_songlen_close();
 xs_stil_close();
-
- XSDEBUG("shutdown finished.\n");
 }
 
 
 /*
 * Start playing the given file
 */
-gboolean xs_play_file(InputPlayback *pb, const gchar *filename, VFSFile *file, gint start_time, gint stop_time, gboolean pause)
+bool_t xs_play_file(InputPlayback *pb, const char *filename, VFSFile *file,
+ int start_time, int stop_time, bool_t pause)
 {
 xs_tuneinfo_t *tmpTune;
- gint audioBufSize, bufRemaining, tmpLength, subTune = -1;
- gchar *audioBuffer = NULL, *oversampleBuffer = NULL;
+ int audioBufSize, bufRemaining, tmpLength, subTune = -1;
+ char *audioBuffer = NULL, *oversampleBuffer = NULL;
 Tuple *tmpTuple;
 
 assert(pb);
- assert(xs_status.sidPlayer != NULL);
 
 uri_parse (filename, NULL, NULL, NULL, & subTune);
 
 /* Get tune information */
- XS_MUTEX_LOCK(xs_status);
+ pthread_mutex_lock(&xs_status_mutex);
 
- if (! (xs_status.tuneInfo = xs_status.sidPlayer->plrGetSIDInfo (filename)))
+ if (! (xs_status.tuneInfo = xs_sidplayfp_getinfo (filename)))
 {
- XS_MUTEX_UNLOCK(xs_status);
+ pthread_mutex_unlock(&xs_status_mutex);
 return FALSE;
 }
 
 /* Initialize the tune */
- if (! xs_status.sidPlayer->plrLoadSID (& xs_status, filename))
+ if (! xs_sidplayfp_load (& xs_status, filename))
 {
- XS_MUTEX_UNLOCK(xs_status);
+ pthread_mutex_unlock(&xs_status_mutex);
 xs_tuneinfo_free(xs_status.tuneInfo);
 xs_status.tuneInfo = NULL;
 return FALSE;
 }
 
- gboolean error = FALSE;
+ bool_t error = FALSE;
 
 /* Set general status information */
 tmpTune = xs_status.tuneInfo;
@@ -212,33 +150,19 @@
 else
 xs_status.currSong = subTune;
 
- XSDEBUG("subtune #%i selected (#%d wanted), initializing...\n", xs_status.currSong, subTune);
-
- gint channels = (xs_status.audioChannels == XS_CHN_AUTOPAN) ? 2 :
- xs_status.audioChannels;
+ int channels = xs_status.audioChannels;
 
 /* Allocate audio buffer */
- audioBufSize = xs_status.audioFrequency * channels *
- xs_status.audioBitsPerSample / (8 * 4);
+ audioBufSize = xs_status.audioFrequency * channels * FMT_SIZEOF (FMT_S16_NE);
 if (audioBufSize < 512) audioBufSize = 512;
 
- audioBuffer = (gchar *) g_malloc(audioBufSize);
+ audioBuffer = (char *) malloc(audioBufSize);
 if (audioBuffer == NULL) {
 xs_error("Couldn't allocate memory for audio data buffer!\n");
- XS_MUTEX_UNLOCK(xs_status);
+ pthread_mutex_unlock(&xs_status_mutex);
 goto xs_err_exit;
 }
 
- if (xs_status.oversampleEnable) {
- oversampleBuffer = (gchar *) g_malloc(audioBufSize * xs_status.oversampleFactor);
- if (oversampleBuffer == NULL) {
- xs_error("Couldn't allocate memory for audio oversampling buffer!\n");
- XS_MUTEX_UNLOCK(xs_status);
- goto xs_err_exit;
- }
- }
-
-
 /* Check minimum playtime */
 tmpLength = tmpTune->subTunes[xs_status.currSong - 1].tuneLength;
 if (xs_cfg.playMinTimeEnable && (tmpLength >= 0)) {
@@ -247,76 +171,51 @@
 }
 
 /* Initialize song */
- if (!xs_status.sidPlayer->plrInitSong(&xs_status)) {
+ if (!xs_sidplayfp_initsong(&xs_status)) {
 xs_error("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n",
 tmpTune->sidFilename, xs_status.currSong);
- XS_MUTEX_UNLOCK(xs_status);
+ pthread_mutex_unlock(&xs_status_mutex);
 goto xs_err_exit;
 }
 
 /* Open the audio output */
- XSDEBUG("open audio output (%d, %d, %d)\n",
- xs_status.audioFormat, xs_status.audioFrequency, channels);
-
- if (!pb->output->open_audio(xs_status.audioFormat, xs_status.audioFrequency,
+ if (!pb->output->open_audio(FMT_S16_NE, xs_status.audioFrequency,
 channels))
 {
 xs_error("Couldn't open audio output (fmt=%x, freq=%i, nchan=%i)!\n",
- xs_status.audioFormat,
+ FMT_S16_NE,
 xs_status.audioFrequency,
 channels);
 
- XS_MUTEX_UNLOCK(xs_status);
+ pthread_mutex_unlock(&xs_status_mutex);
 goto xs_err_exit;
 }
 
 /* Set song information for current subtune */
- XSDEBUG("foobar #1\n");
- xs_status.sidPlayer->plrUpdateSIDInfo(&xs_status);
+ xs_sidplayfp_updateinfo(&xs_status);
 tmpTuple = tuple_new_from_filename(tmpTune->sidFilename);
 xs_get_song_tuple_info(tmpTuple, tmpTune, xs_status.currSong);
 
 xs_status.stop_flag = FALSE;
- XS_MUTEX_UNLOCK(xs_status);
+ pthread_mutex_unlock(&xs_status_mutex);
 
 pb->set_tuple(pb, tmpTuple);
 pb->set_params (pb, -1, xs_status.audioFrequency, channels);
 pb->set_pb_ready(pb);
 
- XSDEBUG("playing\n");
-
 while (1)
 {
- XS_MUTEX_LOCK (xs_status);
+ pthread_mutex_lock(&xs_status_mutex);
 
 if (xs_status.stop_flag)
 {
- XS_MUTEX_UNLOCK (xs_status);
+ pthread_mutex_unlock(&xs_status_mutex);
 break;
 }
 
- XS_MUTEX_UNLOCK (xs_status);
-
- /* Render audio data */
- if (xs_status.oversampleEnable) {
- /* Perform oversampled rendering */
- bufRemaining = xs_status.sidPlayer->plrFillBuffer(
- &xs_status,
- oversampleBuffer,
- (audioBufSize * xs_status.oversampleFactor));
+ pthread_mutex_unlock(&xs_status_mutex);
 
- bufRemaining /= xs_status.oversampleFactor;
-
- /* Execute rate-conversion with filtering */
- if (xs_filter_rateconv(audioBuffer, oversampleBuffer,
- xs_status.audioFormat, xs_status.oversampleFactor, bufRemaining) < 0) {
- xs_error("Oversampling rate-conversion pass failed.\n");
- goto xs_err_exit;
- }
- } else {
- bufRemaining = xs_status.sidPlayer->plrFillBuffer(
- &xs_status, audioBuffer, audioBufSize);
- }
+ bufRemaining = xs_sidplayfp_fillbuffer(&xs_status, audioBuffer, audioBufSize);
 
 pb->output->write_audio (audioBuffer, bufRemaining);
 
@@ -339,28 +238,24 @@
 }
 
 DONE:
- XSDEBUG("out of playing loop\n");
-
- g_free(audioBuffer);
- g_free(oversampleBuffer);
+ free(audioBuffer);
+ free(oversampleBuffer);
 
 /* Set playing status to false (stopped), thus when
 * XMMS next calls xs_get_time(), it can return appropriate
 * value "not playing" status and XMMS knows to move to
 * next entry in the playlist .. or whatever it wishes.
 */
- XS_MUTEX_LOCK(xs_status);
+ pthread_mutex_lock(&xs_status_mutex);
 xs_status.stop_flag = TRUE;
 
 /* Free tune information */
- xs_status.sidPlayer->plrDeleteSID(&xs_status);
+ xs_sidplayfp_delete(&xs_status);
 xs_tuneinfo_free(xs_status.tuneInfo);
 xs_status.tuneInfo = NULL;
- XS_MUTEX_UNLOCK(xs_status);
+ pthread_mutex_unlock(&xs_status_mutex);
 
 /* Exit the playing thread */
- XSDEBUG("exiting thread, bye.\n");
-
 return ! error;
 
 xs_err_exit:
@@ -381,50 +276,46 @@
 */
 void xs_stop(InputPlayback *pb)
 {
- XSDEBUG("stop requested\n");
-
 /* Lock xs_status and stop playing thread */
- XS_MUTEX_LOCK(xs_status);
+ pthread_mutex_lock(&xs_status_mutex);
 
 if (! xs_status.stop_flag)
 {
- XSDEBUG("stopping...\n");
 xs_status.stop_flag = TRUE;
 pb->output->abort_write ();
 }
 
- XS_MUTEX_UNLOCK (xs_status);
- XSDEBUG("ok\n");
+ pthread_mutex_unlock(&xs_status_mutex);
 }
 
 
 /*
 * Pause/unpause the playing
 */
-void xs_pause (InputPlayback * pb, gboolean pauseState)
+void xs_pause (InputPlayback * pb, bool_t pauseState)
 {
- XS_MUTEX_LOCK(xs_status);
+ pthread_mutex_lock(&xs_status_mutex);
 pb->output->pause(pauseState);
- XS_MUTEX_UNLOCK(xs_status);
+ pthread_mutex_unlock(&xs_status_mutex);
 }
 
 
 /*
 * Return song information Tuple
 */
-static void xs_get_song_tuple_info(Tuple *tuple, xs_tuneinfo_t *info, gint subTune)
+static void xs_get_song_tuple_info(Tuple *tuple, xs_tuneinfo_t *info, int subTune)
 {
- gchar *tmpStr;
+ char *tmpStr;
 
 tmpStr = str_to_utf8(info->sidName);
 tuple_set_str(tuple, FIELD_TITLE, NULL, tmpStr);
- g_free(tmpStr);
+ free(tmpStr);
 tmpStr = str_to_utf8(info->sidComposer);
 tuple_set_str(tuple, FIELD_ARTIST, NULL, tmpStr);
- g_free(tmpStr);
+ free(tmpStr);
 tmpStr = str_to_utf8(info->sidCopyright);
 tuple_set_str(tuple, FIELD_COPYRIGHT, NULL, tmpStr);
- g_free(tmpStr);
+ free(tmpStr);
 tuple_set_str(tuple, FIELD_CODEC, NULL, info->sidFormat);
 
 #if 0
@@ -442,7 +333,7 @@
 subTune = info->startTune;
 
 if (subTune > 0 && subTune <= info->nsubTunes) {
- gint tmpInt = info->subTunes[subTune - 1].tuneLength;
+ int tmpInt = info->subTunes[subTune - 1].tuneLength;
 tuple_set_int(tuple, FIELD_LENGTH, NULL, (tmpInt < 0) ? -1 : tmpInt * 1000);
 
 #if 0
@@ -455,7 +346,7 @@
 case XS_CLOCK_VBI: tmpStr = "VBI"; break;
 case XS_CLOCK_CIA: tmpStr = "CIA"; break;
 default:
- g_snprintf(tmpStr2, sizeof(tmpStr2), "%dHz", tmpInt);
+ snprintf(tmpStr2, sizeof(tmpStr2), "%dHz", tmpInt);
 tmpStr = tmpStr2;
 break;
 }
@@ -475,8 +366,8 @@
 
 static void xs_fill_subtunes(Tuple *tuple, xs_tuneinfo_t *info)
 {
- gint count, found;
- gint subtunes[info->nsubTunes];
+ int count, found;
+ int subtunes[info->nsubTunes];
 
 for (found = count = 0; count < info->nsubTunes; count++) {
 if (count + 1 == info->startTune || !xs_cfg.subAutoMinOnly ||
@@ -488,30 +379,27 @@
 tuple_set_subtunes (tuple, found, subtunes);
 }
 
-Tuple * xs_probe_for_tuple(const gchar *filename, xs_file_t *fd)
+Tuple * xs_probe_for_tuple(const char *filename, VFSFile *fd)
 {
 Tuple *tuple;
 xs_tuneinfo_t *info;
- gint tune = -1;
-
- if (xs_status.sidPlayer == NULL || filename == NULL)
- return NULL;
+ int tune = -1;
 
- XS_MUTEX_LOCK(xs_status);
- if (!xs_status.sidPlayer->plrProbe(fd)) {
- XS_MUTEX_UNLOCK(xs_status);
+ pthread_mutex_lock(&xs_status_mutex);
+ if (!xs_sidplayfp_probe(fd)) {
+ pthread_mutex_unlock(&xs_status_mutex);
 return NULL;
 }
- XS_MUTEX_UNLOCK(xs_status);
+ pthread_mutex_unlock(&xs_status_mutex);
 
 /* Get information from URL */
 tuple = tuple_new_from_filename (filename);
 tune = tuple_get_int (tuple, FIELD_SUBSONG_NUM, NULL);
 
 /* Get tune information from emulation engine */
- XS_MUTEX_LOCK(xs_status);
- info = xs_status.sidPlayer->plrGetSIDInfo (filename);
- XS_MUTEX_UNLOCK(xs_status);
+ pthread_mutex_lock(&xs_status_mutex);
+ info = xs_sidplayfp_getinfo (filename);
+ pthread_mutex_unlock(&xs_status_mutex);
 
 if (info == NULL)
 return tuple;
@@ -525,3 +413,26 @@
 
 return tuple;
 }
+
+/*
+ * Plugin header
+ */
+static const char *xs_sid_fmts[] = { "sid", "psid", NULL };
+
+AUD_INPUT_PLUGIN
+(
+ .name = "SID Player", /* Plugin description */
+ .domain = PACKAGE,
+ .init = xs_init, /* Initialization */
+ .cleanup = xs_close, /* Cleanup */
+ .play = xs_play_file, /* Play given file */
+ .stop = xs_stop, /* Stop playing */
+ .pause = xs_pause, /* Pause playing */
+ .probe_for_tuple = xs_probe_for_tuple,
+
+ .extensions = xs_sid_fmts, /* File ext assist */
+ .have_subtune = TRUE,
+
+ /* medium priority (slow to initialize) */
+ .priority = 5,
+)

audacious-plugins-3.3.4.tar.bz2/src/sid/xmms-sid.h -> audacious-plugins-3.4.2.tar.bz2/src/sid/xmms-sid.h Changed

@@ -23,43 +23,18 @@
 #ifndef XMMS_SID_H
 #define XMMS_SID_H
 
-#include <config.h>
-#include "xs_support.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#include <libaudcore/core.h>
+
 /*
 * Some constants and defines
 */
-/* #define to enable spurious debugging messages for development
- * purposes. Output through g_logv().
- */
-#undef DEBUG
-
-/* Define to enable non-portable thread and mutex debugging code.
- * You need to #define DEBUG also to make this useful.
- * (Works probably with GNU/Linux pthreads implementation only)
- */
-#undef XS_MUTEX_DEBUG
-
-/* HardSID-support is not working and is untested, thus we disable it here.
- */
-#undef HAVE_HARDSID_BUILDER
 
 /* Size for some small buffers (always static variables) */
-#define XS_BUF_SIZE (1024)
-
-/* If defined, some dynamically allocated temp. buffers are used.
- * Static (#undef) might give slight performance gain,
- * but fails on systems with limited stack space. */
-#define XS_BUF_DYNAMIC
-
-/* Configuration section identifier
- */
-#define XS_PACKAGE_STRING "Audacious-SID"
-#define XS_CONFIG_IDENT "sid"
+#define XS_BUF_SIZE (2048)
 
 /* Default audio rendering frequency in Hz
 */
@@ -70,45 +45,6 @@
 * Largest SID files I've seen are ~70kB. */
 #define XS_SIDBUF_SIZE (128*1024)
 
-/* libSIDPlay1/2 constants (copied from internal headers/source)
- * For some stupid reason these are not available in public
- * headers, so we have to duplicate them here...
- */
-#define XS_SIDPLAY1_FS (400.0f)
-#define XS_SIDPLAY1_FM (60.0f)
-#define XS_SIDPLAY1_FT (0.05f)
-
-#define XS_SIDPLAY2_NFPOINTS (0x800)
-#define XS_SIDPLAY2_FMAX (24000)
-
-/* Limits for oversampling
- */
-#define XS_MIN_OVERSAMPLE (2)
-#define XS_MAX_OVERSAMPLE (8)
-
-
-/* Macros for mutexes and threads. These exist to be able to
- * easily change from pthreads to glib threads, etc, if necessary.
- */
-#define XS_THREAD_T GThread *
-#define XS_THREAD_EXIT(M) g_thread_exit(M)
-#define XS_THREAD_JOIN(M) g_thread_join(M)
-#define XS_MPP(M) M ## _mutex
-#define XS_MUTEX(M) GStaticMutex XS_MPP(M) = G_STATIC_MUTEX_INIT
-#define XS_MUTEX_H(M) extern GStaticMutex XS_MPP(M)
-#ifdef XS_MUTEX_DEBUG
-# define XS_MUTEX_LOCK(M) { \
- gboolean tmpRes; \
- XSDEBUG("XS_MUTEX_TRYLOCK(" #M ")\n"); \
- tmpRes = g_static_mutex_trylock(&XS_MPP(M)); \
- XSDEBUG("[" #M "] = %s\n", tmpRes ? "TRUE" : "FALSE"); \
- }
-# define XS_MUTEX_UNLOCK(M) { XSDEBUG("XS_MUTEX_UNLOCK(" #M ")\n"); g_static_mutex_unlock(&XS_MPP(M)); }
-#else
-# define XS_MUTEX_LOCK(M) g_static_mutex_lock(&XS_MPP(M))
-# define XS_MUTEX_UNLOCK(M) g_static_mutex_unlock(&XS_MPP(M))
-#endif
-
 /* Character sets used in STIL database and PlaySID file metadata
 */
 #define XS_STIL_CHARSET	 "ISO-8859-1"
@@ -117,77 +53,21 @@
 /* Plugin-wide typedefs
 */
 typedef struct {
- gint tuneSpeed,
- tuneLength;
- gboolean tunePlayed;
+ int tuneSpeed, tuneLength;
+ bool_t tunePlayed;
 } xs_subtuneinfo_t;
 
-
 typedef struct {
- gchar *sidFilename,
- *sidName,
- *sidComposer,
- *sidCopyright,
- *sidFormat;
- gint loadAddr,
- initAddr,
- playAddr,
- dataFileLen,
- sidModel;
- gint nsubTunes, startTune;
- xs_subtuneinfo_t *subTunes;
+ char *sidFilename, *sidName, *sidComposer, *sidCopyright, *sidFormat;
+ int loadAddr, initAddr, playAddr, dataFileLen, sidModel;
+ int nsubTunes, startTune;
+ xs_subtuneinfo_t *subTunes;
 } xs_tuneinfo_t;
 
-
-/* Global variables
- */
-extern InputPlugin xs_plugin_ip;
-
-
 /* Plugin function prototypes
 */
-gboolean xs_init(void);
-void xs_reinit(void);
-void xs_close(void);
-gboolean xs_play_file(InputPlayback *, const gchar *, VFSFile *, gint, gint, gboolean);
-void xs_stop(InputPlayback *);
-void xs_pause (InputPlayback * p, gboolean pause);
-gint xs_get_time(InputPlayback *);
-Tuple * xs_probe_for_tuple(const gchar *, xs_file_t *);
-void xs_about(void);
-
-void xs_verror(const gchar *, va_list);
-void xs_error(const gchar *, ...);
-
-
-/* Debugging
- */
-void XSDEBUG(const gchar *, ...);
-
-
-/* And even some Gtk+ macro crap here, yay.
- */
-#define XS_DEF_WINDOW_DELETE(ME, MV) \
-gboolean xs_ ## ME ## _delete(GtkWidget *w, GdkEvent *e, gpointer d) { \
- (void) w; (void) e; (void) d; \
- if (xs_ ## MV ) { \
- gtk_widget_destroy(xs_ ## MV ); \
- xs_ ## MV = NULL; \
- } \
- return FALSE; \
-}
-
-#define XS_DEF_WINDOW_CLOSE(ME, MV) \
-void xs_ ## ME (GtkButton *b, gpointer d) { \
- (void) b; (void) d; \
- gtk_widget_destroy(xs_ ## MV ); \
- xs_ ## MV = NULL; \
-}
-
-#define XS_SIGNAL_CONNECT(SOBJ, SNAME, SFUNC, SDATA) \
- g_signal_connect(G_OBJECT(SOBJ), SNAME, G_CALLBACK(SFUNC), SDATA)
-
-#define XS_WINDOW_PRESENT(XX) gtk_window_present(GTK_WINDOW( XX ))
+#define xs_verror(fmt, args) vfprintf(stderr, fmt, args)
+#define xs_error(...) fprintf(stderr, __VA_ARGS__)
 
 #ifdef __cplusplus
 }

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_config.c -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_config.c Changed

@@ -23,10 +23,15 @@
 
 #include "xs_config.h"
 
+#include <string.h>
+
+#include "xmms-sid.h"
+#include "xs_support.h"
+
 /*
 * Configuration specific stuff
 */
-XS_MUTEX(xs_cfg);
+pthread_mutex_t xs_cfg_mutex = PTHREAD_MUTEX_INITIALIZER;
 struct xs_cfg_t xs_cfg;
 
 /* Reset/initialize the configuration
@@ -34,14 +39,12 @@
 void xs_init_configuration(void)
 {
 /* Lock configuration mutex */
- XSDEBUG("initializing configuration ...\n");
- XS_MUTEX_LOCK(xs_cfg);
+ pthread_mutex_lock(&xs_cfg_mutex);
 
 memset(&xs_cfg, 0, sizeof(xs_cfg));
 
 /* Initialize values with sensible defaults */
- xs_cfg.audioBitsPerSample = XS_RES_16BIT;
- xs_cfg.audioChannels = XS_CHN_MONO;
+ xs_cfg.audioChannels = XS_CHN_STEREO;
 xs_cfg.audioFrequency = XS_AUDIO_FREQ;
 
 xs_cfg.mos8580 = FALSE;
@@ -49,43 +52,10 @@
 
 /* Filter values */
 xs_cfg.emulateFilters = TRUE;
- xs_cfg.sid1Filter.fs = XS_SIDPLAY1_FS;
- xs_cfg.sid1Filter.fm = XS_SIDPLAY1_FM;
- xs_cfg.sid1Filter.ft = XS_SIDPLAY1_FT;
-
-#ifdef HAVE_SIDPLAY2
- xs_cfg.playerEngine = XS_ENG_SIDPLAY2;
- xs_cfg.memoryMode = XS_MPU_REAL;
-#else
-#ifdef HAVE_SIDPLAY1
- xs_cfg.playerEngine = XS_ENG_SIDPLAY1;
- xs_cfg.memoryMode = XS_MPU_BANK_SWITCHING;
-#else
-#error This should not happen! No emulator engines configured in!
-#endif
-#endif
 
 xs_cfg.clockSpeed = XS_CLOCK_PAL;
 xs_cfg.forceSpeed = FALSE;
 
- xs_cfg.sid2OptLevel = 0;
- xs_cfg.sid2NFilterPresets = 0;
-
-#ifdef HAVE_RESID_BUILDER
- xs_cfg.sid2Builder = XS_BLD_RESID;
-#else
-#ifdef HAVE_HARDSID_BUILDER
- xs_cfg.sid2Builder = XS_BLD_HARDSID;
-#else
-#ifdef HAVE_SIDPLAY2
-#error This should not happen! No supported SIDPlay2 builders configured in!
-#endif
-#endif
-#endif
-
- xs_cfg.oversampleEnable = FALSE;
- xs_cfg.oversampleFactor = XS_MIN_OVERSAMPLE;
-
 xs_cfg.playMaxTimeEnable = FALSE;
 xs_cfg.playMaxTimeUnknown = FALSE;
 xs_cfg.playMaxTime = 150;
@@ -100,28 +70,10 @@
 xs_pstrcpy(&xs_cfg.stilDBPath, "~/C64Music/DOCUMENTS/STIL.txt");
 xs_pstrcpy(&xs_cfg.hvscPath, "~/C64Music");
 
-#if defined(HAVE_SONG_POSITION) && !defined(AUDACIOUS_PLUGIN)
- xs_cfg.subsongControl = XS_SSC_PATCH;
-#else
- xs_cfg.subsongControl = XS_SSC_POPUP;
-#endif
- xs_cfg.detectMagic = FALSE;
-
-#ifndef HAVE_XMMSEXTRA
- xs_cfg.titleOverride = TRUE;
-#endif
-
-#ifdef AUDACIOUS_PLUGIN
- xs_pstrcpy(&xs_cfg.titleFormat, "${artist} - ${title} (${copyright}) <${subsong-id}/${subsong-num}> [${sid-model}/${sid-speed}]");
-#else
- xs_pstrcpy(&xs_cfg.titleFormat, "%p - %t (%c) <%n/%N> [%m/%C]");
-#endif
-
 xs_cfg.subAutoEnable = TRUE;
 xs_cfg.subAutoMinOnly = TRUE;
 xs_cfg.subAutoMinTime = 15;
 
-
 /* Unlock the configuration */
- XS_MUTEX_UNLOCK(xs_cfg);
+ pthread_mutex_unlock(&xs_cfg_mutex);
 }

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_config.h -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_config.h Changed

@@ -1,7 +1,8 @@
 #ifndef XS_CONFIG_H
 #define XS_CONFIG_H
 
-#include "xmms-sid.h"
+#include <pthread.h>
+#include <libaudcore/core.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,26 +11,9 @@
 
 /* Configuration structure
 */
-enum XS_EMUENGINE {
- XS_ENG_SIDPLAY1 = 1,
- XS_ENG_SIDPLAY2
-};
-
-
-enum XS_BUILDER {
- XS_BLD_RESID = 1,
- XS_BLD_HARDSID
-};
-
-enum XS_RESOLUTION {
- XS_RES_8BIT = 8,
- XS_RES_16BIT = 16
-};
-
 enum XS_CHANNELS {
 XS_CHN_MONO = 1,
- XS_CHN_STEREO = 2,
- XS_CHN_AUTOPAN = 3
+ XS_CHN_STEREO = 2
 };
 
 
@@ -42,22 +26,6 @@
 };
 
 
-enum XS_MPU {
- XS_MPU_BANK_SWITCHING = 1,
- XS_MPU_TRANSPARENT_ROM,
- XS_MPU_PLAYSID_ENVIRONMENT,
- XS_MPU_REAL
-};
-
-
-enum XS_SSC {
- XS_SSC_NONE = 1,
- XS_SSC_POPUP,
- XS_SSC_PATCH,
- XS_SSC_SEEK
-};
-
-
 enum XS_SIDMODEL {
 XS_SIDMODEL_UNKNOWN = 0,
 XS_SIDMODEL_6581,
@@ -66,132 +34,46 @@
 };
 
 
-typedef struct {
- gint x, y;
-} xs_int_point_t;
-
-
-typedef struct {
- gchar *name;
- gint type;
-
- /* Filter type 0 for SIDPlay 1 */
- gfloat fs, fm, ft;
-
- /* Filter type 1-2 points */
- xs_int_point_t points[XS_SIDPLAY2_NFPOINTS];
- gint npoints;
-
- /* Distortion patch tunables */
- gfloat rate, point, voice_nonlinearity,
- cf_treshold;
-
- /* Filter Type 3 tunables */
- gfloat baseresistance, offset, steepness,
- minimumfetresistance;
-
- /* Filter Type 4 tunables */
- gfloat k, b;
-} xs_sid_filter_t;
-
-
 extern struct xs_cfg_t {
 /* General audio settings */
- gint audioBitsPerSample;
- gint audioChannels;
- gint audioFrequency;
-
- gboolean oversampleEnable;
- gint oversampleFactor; /* Factor of oversampling */
+ int audioChannels;
+ int audioFrequency;
 
 /* Emulation settings */
- gboolean mos8580; /* TRUE = 8580, FALSE = 6581 */
- gboolean forceModel;
- gint memoryMode; /* See XS_MPU-constants */
- gint clockSpeed; /* PAL (50Hz) or NTSC (60Hz) */
- gboolean forceSpeed; /* TRUE = force to given clockspeed */
-
- gint playerEngine; /* Selected player engine */
-
- gboolean emulateFilters;
- xs_sid_filter_t sid1Filter; /* Current SIDPlay1 filter */
-
- gint sid2OptLevel; /* SIDPlay2 emulation optimization */
- gint sid2Builder; /* SIDPlay2 "builder" aka SID-emu */
- xs_sid_filter_t sid2Filter; /* Current SIDPlay2 filter */
- xs_sid_filter_t **sid2FilterPresets;
- gint sid2NFilterPresets;
+ bool_t mos8580; /* TRUE = 8580, FALSE = 6581 */
+ bool_t forceModel;
+ int clockSpeed; /* PAL (50Hz) or NTSC (60Hz) */
+ bool_t forceSpeed; /* TRUE = force to given clockspeed */
 
+ bool_t emulateFilters;
 
 /* Playing settings */
- gboolean playMaxTimeEnable,
- playMaxTimeUnknown; /* Use max-time only when song-length is unknown */
- gint playMaxTime; /* MAX playtime in seconds */
-
- gboolean playMinTimeEnable;
- gint playMinTime; /* MIN playtime in seconds */
+ bool_t playMaxTimeEnable,
+ playMaxTimeUnknown; /* Use max-time only when song-length is unknown */
+ int playMaxTime; /* MAX playtime in seconds */
 
- gboolean songlenDBEnable;
- gchar *songlenDBPath; /* Path to Songlengths.txt */
+ bool_t playMinTimeEnable;
+ int playMinTime; /* MIN playtime in seconds */
 
+ bool_t songlenDBEnable;
+ char *songlenDBPath; /* Path to Songlengths.txt */
 
 /* Miscellaneous settings */
- gboolean stilDBEnable;
- gchar *stilDBPath; /* Path to STIL.txt */
- gchar *hvscPath; /* Path-prefix for HVSC */
-
- gint subsongControl;
- gboolean detectMagic;
+ bool_t stilDBEnable;
+ char *stilDBPath; /* Path to STIL.txt */
+ char *hvscPath; /* Path-prefix for HVSC */
 
- gboolean titleOverride; /* TRUE if XMMS titles are overriden */
- gchar *titleFormat;
-
- gboolean subAutoEnable,
- subAutoMinOnly;
- gint subAutoMinTime;
+ bool_t subAutoEnable,
+ subAutoMinOnly;
+ int subAutoMinTime;
 } xs_cfg;
 
-XS_MUTEX_H(xs_cfg);
-
-
-/* Configuration-file
- */
-enum {
- CTYPE_INT = 1,
- CTYPE_FLOAT,
- CTYPE_STR,
- CTYPE_BOOL
-};
-
-enum {
- WTYPE_BGROUP = 1,
- WTYPE_SPIN,
- WTYPE_SCALE,
- WTYPE_BUTTON,
- WTYPE_TEXT,
- WTYPE_COMBO
-};
-
-
-typedef struct {
- gint itemType; /* Type of item (CTYPE_*) */
- void *itemData; /* Pointer to variable */
- gchar *itemName; /* Name of configuration item */
-} xs_cfg_item_t;
-
-
-typedef struct {
- gint widType;
- gint itemType;
- gchar *widName;
- void *itemData;
- gint itemSet;
-} xs_wid_item_t;
+extern pthread_mutex_t xs_cfg_mutex;
 
 
 /* Functions
 */
-void xs_init_configuration(void);
+void xs_init_configuration(void);
 
 #ifdef __cplusplus
 }

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_length.c -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_length.c Changed

@@ -21,12 +21,15 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include "xs_length.h"
-#include "xs_support.h"
+
+#include <assert.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 #include <string.h>
 
+#include "xmms-sid.h"
+#include "xs_support.h"
 
 /* Free memory allocated for given SLDB node
 */
@@ -34,8 +37,8 @@
 {
 if (node) {
 /* Nothing much to do here ... */
- g_free(node->lengths);
- g_free(node);
+ free(node->lengths);
+ free(node);
 }
 }
 
@@ -62,9 +65,9 @@
 
 /* Parse a time-entry in SLDB format
 */
-static gint xs_sldb_gettime(gchar *str, size_t *pos)
+static int xs_sldb_gettime(char *str, size_t *pos)
 {
- gint result, tmp;
+ int result, tmp;
 
 /* Check if it starts with a digit */
 if (isdigit(str[*pos])) {
@@ -100,24 +103,25 @@
 
 /* Parse one SLDB definition line, return SLDB node
 */
-sldb_node_t * xs_sldb_read_entry(gchar *inLine)
+sldb_node_t * xs_sldb_read_entry(char *inLine)
 {
 size_t linePos;
- gint i;
- gboolean isOK;
+ int i;
+ bool_t isOK;
 sldb_node_t *tmnode;
 
 /* Allocate new node */
- tmnode = (sldb_node_t *) g_malloc0(sizeof(sldb_node_t));
+ tmnode = (sldb_node_t *) malloc(sizeof(sldb_node_t));
 if (!tmnode) {
 xs_error("Error allocating new node. Fatal error.\n");
 return NULL;
 }
+ memset(tmnode, 0, sizeof(sldb_node_t));
 
 /* Get hash value */
 linePos = 0;
 for (i = 0; i < XS_MD5HASH_LENGTH; i++, linePos += 2) {
- guint tmpu;
+ unsigned tmpu;
 sscanf(&inLine[linePos], "%2x", &tmpu);
 tmnode->md5Hash[i] = tmpu;
 }
@@ -125,7 +129,7 @@
 /* Get playtimes */
 if (inLine[linePos] != 0) {
 if (inLine[linePos] != '=') {
- xs_error("'=' expected on column #%d.\n", linePos);
+ xs_error("'=' expected on column #%d.\n", (int)linePos);
 xs_sldb_node_free(tmnode);
 return NULL;
 } else {
@@ -148,12 +152,13 @@
 
 /* Allocate memory for lengths */
 if (tmnode->nlengths > 0) {
- tmnode->lengths = (gint *) g_malloc0(tmnode->nlengths * sizeof(gint));
+ tmnode->lengths = (int *) malloc(tmnode->nlengths * sizeof(int));
 if (!tmnode->lengths) {
 xs_error("Could not allocate memory for node.\n");
 xs_sldb_node_free(tmnode);
 return NULL;
 }
+ memset(tmnode->lengths, 0, tmnode->nlengths * sizeof(int));
 } else {
 xs_sldb_node_free(tmnode);
 return NULL;
@@ -164,7 +169,7 @@
 linePos = savePos;
 isOK = TRUE;
 while ((linePos < tmpLen) && (i < tmnode->nlengths) && isOK) {
- gint l;
+ int l;
 
 xs_findnext(inLine, &linePos);
 
@@ -185,22 +190,23 @@
 }
 }
 
+ xs_sldb_node_free(tmnode);
 return NULL;
 }
 
 
 /* Read database to memory
 */
-gint xs_sldb_read(xs_sldb_t *db, const gchar *dbFilename)
+int xs_sldb_read(xs_sldb_t *db, const char *dbFilename)
 {
 FILE *inFile;
- gchar inLine[XS_BUF_SIZE];
+ char inLine[XS_BUF_SIZE];
 size_t lineNum;
 sldb_node_t *tmnode;
 assert(db);
 
 /* Try to open the file */
- if ((inFile = fopen(dbFilename, "ra")) == NULL) {
+ if ((inFile = fopen(dbFilename, "r")) == NULL) {
 xs_error("Could not open SongLengthDB '%s'\n", dbFilename);
 return -1;
 }
@@ -217,24 +223,24 @@
 /* Check if it is datafield */
 if (isxdigit(inLine[linePos])) {
 /* Check the length of the hash */
- gint hashLen;
+ int hashLen;
 for (hashLen = 0; inLine[linePos] && isxdigit(inLine[linePos]); hashLen++, linePos++);
 
 if (hashLen != XS_MD5HASH_LENGTH_CH) {
 xs_error("Invalid MD5-hash in SongLengthDB file '%s' line #%d!\n",
- dbFilename, lineNum);
+ dbFilename, (int)lineNum);
 } else {
 /* Parse and add node to db */
 if ((tmnode = xs_sldb_read_entry(inLine)) != NULL) {
 xs_sldb_node_insert(db, tmnode);
 } else {
 xs_error("Invalid entry in SongLengthDB file '%s' line #%d!\n",
- dbFilename, lineNum);
+ dbFilename, (int)lineNum);
 }
 }
 } else if ((inLine[linePos] != ';') && (inLine[linePos] != '[') && (inLine[linePos] != 0)) {
 xs_error("Invalid line in SongLengthDB file '%s' line #%d\n",
- dbFilename, lineNum);
+ dbFilename, (int)lineNum);
 }
 
 }
@@ -251,9 +257,9 @@
 * negative if testHash1 < testHash2
 * positive if testHash1 > testHash2
 */
-static gint xs_sldb_cmphash(xs_md5hash_t testHash1, xs_md5hash_t testHash2)
+static int xs_sldb_cmphash(xs_md5hash_t testHash1, xs_md5hash_t testHash2)
 {
- gint i, d;
+ int i, d;
 
 /* Compute difference of hashes */
 for (i = 0, d = 0; (i < XS_MD5HASH_LENGTH) && !d; i++)
@@ -265,7 +271,7 @@
 
 /* Compare two nodes
 */
-static gint xs_sldb_cmp(const void *node1, const void *node2)
+static int xs_sldb_cmp(const void *node1, const void *node2)
 {
 /* We assume here that we never ever get NULL-pointers or similar */
 return xs_sldb_cmphash(
@@ -276,7 +282,7 @@
 
 /* (Re)create index
 */
-gint xs_sldb_index(xs_sldb_t * db)
+int xs_sldb_index(xs_sldb_t * db)
 {
 sldb_node_t *pCurr;
 size_t i;
@@ -284,7 +290,7 @@
 
 /* Free old index */
 if (db->pindex) {
- g_free(db->pindex);
+ free(db->pindex);
 db->pindex = NULL;
 }
 
@@ -299,7 +305,7 @@
 /* Check number of nodes */
 if (db->n > 0) {
 /* Allocate memory for index-table */
- db->pindex = (sldb_node_t **) g_malloc(sizeof(sldb_node_t *) * db->n);
+ db->pindex = (sldb_node_t **) malloc(sizeof(sldb_node_t *) * db->n);
 if (!db->pindex)
 return -1;
 
@@ -340,63 +346,63 @@
 
 /* Free memory allocated for index */
 if (db->pindex) {
- g_free(db->pindex);
+ free(db->pindex);
 db->pindex = NULL;
 }
 
 /* Free structure */
 db->n = 0;
- g_free(db);
+ free(db);
 }
 
 
 /* Compute md5hash of given SID-file
 */
 typedef struct {
- gchar magicID[4]; /* "PSID" / "RSID" magic identifier */
- guint16 version, /* Version number */
+ char magicID[4]; /* "PSID" / "RSID" magic identifier */
+ uint16_t version, /* Version number */
 dataOffset, /* Start of actual c64 data in file */
 loadAddress, /* Loading address */
 initAddress, /* Initialization address */
 playAddress, /* Play one frame */
 nSongs, /* Number of subsongs */
 startSong; /* Default starting song */
- guint32 speed; /* Speed */
- gchar sidName[32]; /* Descriptive text-fields, ASCIIZ */
- gchar sidAuthor[32];
- gchar sidCopyright[32];
+ uint32_t speed; /* Speed */
+ char sidName[32]; /* Descriptive text-fields, ASCIIZ */
+ char sidAuthor[32];
+ char sidCopyright[32];
 } psidv1_header_t;
 
 
 typedef struct {
- guint16 flags; /* Flags */
- guint8 startPage, pageLength;
- guint16 reserved;
+ uint16_t flags; /* Flags */
+ uint8_t startPage, pageLength;
+ uint16_t reserved;
 } psidv2_header_t;
 
 
-static gint xs_get_sid_hash(const gchar *filename, xs_md5hash_t hash)
+static int xs_get_sid_hash(const char *filename, xs_md5hash_t hash)
 {
- xs_file_t *inFile;
+ VFSFile *inFile;
 xs_md5state_t inState;
 psidv1_header_t psidH;
 psidv2_header_t psidH2;
- guint8 *songData;
- guint8 ib8[2], i8;
- gint index, result;
+ uint8_t *songData;
+ uint8_t ib8[2], i8;
+ int index, result;
 
 /* Try to open the file */
- if ((inFile = xs_fopen(filename, "rb")) == NULL)
+ if ((inFile = vfs_fopen(filename, "rb")) == NULL)
 return -1;
 
 /* Read PSID header in */
- if (xs_fread(psidH.magicID, 1, sizeof psidH.magicID, inFile) < sizeof psidH.magicID) {
- xs_fclose(inFile);
+ if (vfs_fread(psidH.magicID, 1, sizeof psidH.magicID, inFile) < sizeof psidH.magicID) {
+ vfs_fclose(inFile);
 return -1;
 }
 
 if (strncmp(psidH.magicID, "PSID", 4) && strncmp(psidH.magicID, "RSID", 4)) {
- xs_fclose(inFile);
+ vfs_fclose(inFile);
 xs_error("Not a PSID or RSID file '%s'\n", filename);
 return -2;
 }
@@ -410,10 +416,10 @@
 psidH.startSong = xs_fread_be16(inFile);
 psidH.speed = xs_fread_be32(inFile);
 
- if (xs_fread(psidH.sidName, 1, sizeof psidH.sidName, inFile) < sizeof psidH.sidName
- || xs_fread(psidH.sidAuthor, 1, sizeof psidH.sidAuthor, inFile) < sizeof psidH.sidAuthor
- || xs_fread(psidH.sidCopyright, 1, sizeof psidH.sidCopyright, inFile) < sizeof psidH.sidCopyright) {
- xs_fclose(inFile);
+ if (vfs_fread(psidH.sidName, 1, sizeof psidH.sidName, inFile) < sizeof psidH.sidName
+ || vfs_fread(psidH.sidAuthor, 1, sizeof psidH.sidAuthor, inFile) < sizeof psidH.sidAuthor
+ || vfs_fread(psidH.sidCopyright, 1, sizeof psidH.sidCopyright, inFile) < sizeof psidH.sidCopyright) {
+ vfs_fclose(inFile);
 xs_error("Error reading SID file header from '%s'\n", filename);
 return -4;
 }
@@ -424,22 +430,22 @@
 if (psidH.version == 2) {
 /* Yes, we need to */
 psidH2.flags = xs_fread_be16(inFile);
- psidH2.startPage = xs_fgetc(inFile);
- psidH2.pageLength = xs_fgetc(inFile);
+ psidH2.startPage = vfs_getc(inFile);
+ psidH2.pageLength = vfs_getc(inFile);
 psidH2.reserved = xs_fread_be16(inFile);
 }
 
 /* Allocate buffer */
- songData = (guint8 *) g_malloc(XS_SIDBUF_SIZE * sizeof(guint8));
+ songData = (uint8_t *) malloc(XS_SIDBUF_SIZE * sizeof(uint8_t));
 if (!songData) {
- xs_fclose(inFile);
+ vfs_fclose(inFile);
 xs_error("Error allocating temp data buffer for file '%s'\n", filename);
 return -3;
 }
 
 /* Read data to buffer */
- result = xs_fread(songData, sizeof(guint8), XS_SIDBUF_SIZE, inFile);
- xs_fclose(inFile);
+ result = vfs_fread(songData, sizeof(uint8_t), XS_SIDBUF_SIZE, inFile);
+ vfs_fclose(inFile);
 
 /* Initialize and start MD5-hash calculation */
 xs_md5_init(&inState);
@@ -453,13 +459,13 @@
 }
 
 /* Free buffer */
- g_free(songData);
+ free(songData);
 
 /* Append header data to hash */
 #define XSADDHASH(QDATAB) do { \
 ib8[0] = (QDATAB & 0xff); \
 ib8[1] = (QDATAB >> 8); \
- xs_md5_append(&inState, (guint8 *) &ib8, sizeof(ib8)); \
+ xs_md5_append(&inState, (uint8_t *) &ib8, sizeof(ib8)); \
 } while (0)
 
 XSADDHASH(psidH.initAddress);
@@ -496,7 +502,7 @@
 
 /* Get node from db index via binary search
 */
-sldb_node_t *xs_sldb_get(xs_sldb_t *db, const gchar *filename)
+sldb_node_t *xs_sldb_get(xs_sldb_t *db, const char *filename)
 {
 sldb_node_t keyItem, *key, **item;

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_length.h -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_length.h Changed

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_md5.c -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_md5.c Changed

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_player.h -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_player.h Changed

@@ -8,39 +8,14 @@
 extern "C" {
 #endif
 
-struct xs_status_t;
-
-typedef struct {
-    gint        plrIdent;
-    gboolean    (*plrProbe)(xs_file_t *);
-    gboolean    (*plrInit)(struct xs_status_t *);
-    void        (*plrClose)(struct xs_status_t *);
-    gboolean    (*plrInitSong)(struct xs_status_t *);
-    guint       (*plrFillBuffer)(struct xs_status_t *, gchar *, guint);
-    gboolean    (*plrLoadSID)(struct xs_status_t *, const gchar *);
-    void        (*plrDeleteSID)(struct xs_status_t *);
-    xs_tuneinfo_t*    (*plrGetSIDInfo)(const gchar *);
-    gboolean    (*plrUpdateSIDInfo)(struct xs_status_t *);
-    void        (*plrFlush)(struct xs_status_t *);
-} xs_engine_t;
-
-
 typedef struct xs_status_t {
-    gint        audioFrequency,     /* Audio settings */
-                audioChannels,
-                audioBitsPerSample,
-                oversampleFactor;   /* Factor of oversampling */
-    gint     audioFormat;
-    gboolean    oversampleEnable;   /* TRUE after sidEngine initialization,
-                                    if xs_cfg.oversampleEnable == TRUE and
-                                    emulation backend supports oversampling.
-                                    */
+    int        audioFrequency,     /* Audio settings */
+                audioChannels;
     void        *sidEngine;         /* SID-emulation internal engine data */
-    xs_engine_t *sidPlayer;         /* Selected player engine */
-    gboolean    isPaused,
+    bool_t    isPaused,
                 isInitialized;
-    gboolean stop_flag;
-    gint        currSong,           /* Current sub-tune */
+    bool_t stop_flag;
+    int        currSong,           /* Current sub-tune */
                 lastTime;
 
     xs_tuneinfo_t *tuneInfo;
@@ -49,12 +24,8 @@
 
 /* Global variables
  */
-extern InputPlugin    xs_plugin_ip;
-
 extern xs_status_t    xs_status;
-XS_MUTEX_H(xs_status);
-
-gboolean xs_init_emu_engine(int *configured, xs_status_t *status);
+extern pthread_mutex_t xs_status_mutex;
 
 #ifdef __cplusplus
 }

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_sidplay2.cc -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_sidplay2.cc Changed

@@ -6,6 +6,9 @@
 Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
 (C) Copyright 1999-2009 Tecnic Software productions (TNSP)
 
+ Ported to sidplayfp:
+ (C) Copyright 2013 Cristian Morales Vega and Hans de Goede
+
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation; either version 2 of the License, or
@@ -20,54 +23,36 @@
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#include "xmms-sid.h"
-
-#ifdef HAVE_SIDPLAY2
 
-#include <stdio.h>
 #include "xs_sidplay2.h"
-#include "xs_config.h"
 
+#include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 
-#include <sidplay/sidplay2.h>
-#ifdef HAVE_SIDPLAY2_COMI
-# include <sidplay/sidlazyiptr.h>
-#endif
+#include <sidplayfp/sidplayfp.h>
+#include <sidplayfp/SidDatabase.h>
+#include <sidplayfp/SidInfo.h>
+#include <sidplayfp/SidTune.h>
+#include <sidplayfp/SidTuneInfo.h>
+#include <sidplayfp/builders/residfp.h>
 
-
-class xs_sidplay2_t {
+class xs_sidplayfp_t {
 public:
-#ifdef HAVE_SIDPLAY2_COMI
- SidIPtr<ISidplay2> currEng;
- SidLazyIPtr<ISidUnknown> currBuilder;
-#else
- sidplay2 *currEng;
+ sidplayfp *currEng;
 sidbuilder *currBuilder;
-#endif
- sid2_config_t currConfig;
+ SidConfig currConfig;
 SidTune *currTune;
- guint8 *buf;
- size_t bufSize;
+ void *buf;
+ int64_t bufSize;
 
- xs_sidplay2_t(void);
- virtual ~xs_sidplay2_t(void) { ; }
+ xs_sidplayfp_t(void);
+ virtual ~xs_sidplayfp_t(void) { ; }
 };
 
 
-#ifdef HAVE_RESID_BUILDER
-# include <sidplay/builders/resid.h>
-#endif
-#ifdef HAVE_HARDSID_BUILDER
-# include <sidplay/builders/hardsid.h>
-#endif
-
-
-xs_sidplay2_t::xs_sidplay2_t(void)
-#ifdef HAVE_SIDPLAY2_COMI
-:currEng(sidplay2::create())
-#else
+xs_sidplayfp_t::xs_sidplayfp_t(void)
 :currEng(NULL)
-#endif
 {
 buf = NULL;
 bufSize = 0;
@@ -79,26 +64,15 @@
 /* We need to 'export' all this pseudo-C++ crap */
 extern "C" {
 
-
-/* Return song information
- */
-#define TFUNCTION xs_sidplay2_getinfo
-#define TFUNCTION2 xs_sidplay2_updateinfo
-#define TTUNEINFO SidTuneInfo
-#define TTUNE SidTune
-#define TENGINE xs_sidplay2_t
-#include "xs_sidplay.h"
-
-
 /* Check if we can play the given file
 */
-gboolean xs_sidplay2_probe(xs_file_t *f)
+bool_t xs_sidplayfp_probe(VFSFile *f)
 {
- gchar tmpBuf[5];
+ char tmpBuf[5];
 
 if (f == NULL) return FALSE;
 
- if (xs_fread(tmpBuf, sizeof(gchar), 4, f) != 4)
+ if (vfs_fread(tmpBuf, sizeof(char), 4, f) != 4)
 return FALSE;
 
 if (!strncmp(tmpBuf, "PSID", 4) || !strncmp(tmpBuf, "RSID", 4))
@@ -108,27 +82,22 @@
 }
 
 
-/* Initialize SIDPlay2
+/* Initialize SIDPlayFP
 */
-gboolean xs_sidplay2_init(xs_status_t * status)
+bool_t xs_sidplayfp_init(xs_status_t * status)
 {
- gint tmpFreq, i;
- xs_sidplay2_t *engine;
- sid_filter_t tmpFilter;
- xs_sid_filter_t *f;
+ xs_sidplayfp_t *engine;
 assert(status != NULL);
 
 /* Allocate internal structures */
- engine = new xs_sidplay2_t();
+ engine = new xs_sidplayfp_t();
 status->sidEngine = engine;
 if (!engine) return FALSE;
 
 /* Initialize the engine */
-#ifndef HAVE_SIDPLAY2_COMI
- engine->currEng = new sidplay2;
-#endif
+ engine->currEng = new sidplayfp;
 if (!engine->currEng) {
- xs_error("[SIDPlay2] Could not initialize emulation engine.\n");
+ xs_error("[SIDPlayFP] Could not initialize emulation engine.\n");
 return FALSE;
 }
 
@@ -136,262 +105,73 @@
 engine->currConfig = engine->currEng->config();
 
 /* Configure channels and stuff */
- switch (status->audioChannels) {
-
- case XS_CHN_AUTOPAN:
- engine->currConfig.playback = sid2_stereo;
- break;
-
+ switch (status->audioChannels)
+ {
 case XS_CHN_STEREO:
- engine->currConfig.playback = sid2_stereo;
+ engine->currConfig.playback = SidConfig::STEREO;
 break;
 
 case XS_CHN_MONO:
- default:
- engine->currConfig.playback = sid2_mono;
- status->audioChannels = XS_CHN_MONO;
- break;
- }
-
-
- /* Memory mode settings */
- switch (xs_cfg.memoryMode) {
- case XS_MPU_BANK_SWITCHING:
- engine->currConfig.environment = sid2_envBS;
- break;
-
- case XS_MPU_TRANSPARENT_ROM:
- engine->currConfig.environment = sid2_envTP;
- break;
-
- case XS_MPU_PLAYSID_ENVIRONMENT:
- engine->currConfig.environment = sid2_envPS;
- break;
-
- case XS_MPU_REAL:
- default:
- engine->currConfig.environment = sid2_envR;
- xs_cfg.memoryMode = XS_MPU_REAL;
+ engine->currConfig.playback = SidConfig::MONO;
 break;
 }
 
-
 /* Audio parameters sanity checking and setup */
- engine->currConfig.precision = status->audioBitsPerSample;
- tmpFreq = status->audioFrequency;
-
- if (status->oversampleEnable)
- tmpFreq = (tmpFreq * status->oversampleFactor);
-
- engine->currConfig.frequency = tmpFreq;
-
- switch (status->audioBitsPerSample) {
- case XS_RES_8BIT:
- status->audioFormat = FMT_U8;
- engine->currConfig.sampleFormat = SID2_LITTLE_UNSIGNED;
- break;
-
- case XS_RES_16BIT:
- default:
- switch (status->audioFormat) {
- case FMT_U16_LE:
- engine->currConfig.sampleFormat = SID2_LITTLE_UNSIGNED;
- break;
-
- case FMT_U16_BE:
- engine->currConfig.sampleFormat = SID2_BIG_UNSIGNED;
- break;
-
- case FMT_S16_LE:
- engine->currConfig.sampleFormat = SID2_LITTLE_SIGNED;
- break;
-
- case FMT_S16_BE:
- engine->currConfig.sampleFormat = SID2_BIG_SIGNED;
- break;
-
- default:
-#if G_BYTE_ORDER == G_LITTLE_ENDIAN
- status->audioFormat = FMT_S16_LE;
- engine->currConfig.sampleFormat = SID2_LITTLE_SIGNED;
-#else
- status->audioFormat = FMT_S16_BE;
- engine->currConfig.sampleFormat = SID2_BIG_SIGNED;
-#endif
- break;
- }
- break;
- }
-
-#ifdef HAVE_SIDPLAY2_DISTORTION
- XSDEBUG("filter setting NOT supported for distortion patched libSIDPlay2.\n");
-#else
- /* Convert filter */
- f = &(xs_cfg.sid2Filter);
- XSDEBUG("using filter '%s', %d points\n", f->name, f->npoints);
- if (f->npoints > XS_SIDPLAY2_NFPOINTS) {
- xs_error("[SIDPlay2] Invalid number of filter curve points (%d > %d)\n",
- f->npoints, XS_SIDPLAY2_NFPOINTS);
- f->npoints = XS_SIDPLAY2_NFPOINTS;
- }
-
- tmpFilter.points = f->npoints;
- for (i = 0; i < f->npoints; i++) {
- tmpFilter.cutoff[i][0] = f->points[i].x;
- tmpFilter.cutoff[i][1] = f->points[i].y;
- }
-#endif
+ engine->currConfig.frequency = status->audioFrequency;
 
 /* Initialize builder object */
- XSDEBUG("init builder #%i, maxsids=%i\n", xs_cfg.sid2Builder, (engine->currEng->info()).maxsids);
-#ifdef HAVE_RESID_BUILDER
- if (xs_cfg.sid2Builder == XS_BLD_RESID) {
-#ifdef HAVE_SIDPLAY2_COMI
- engine->currBuilder = ReSIDBuilderCreate("");
- SidLazyIPtr<IReSIDBuilder> rs(engine->currBuilder);
- if (rs) {
- engine->currConfig.sidEmulation = rs->iaggregate();
-#else
- ReSIDBuilder *rs = new ReSIDBuilder("ReSID builder");
- engine->currBuilder = (sidbuilder *) rs;
- if (rs) {
-#endif
- /* Builder object created, initialize it */
- rs->create((engine->currEng->info()).maxsids);
- if (!*rs) {
- xs_error("reSID->create() failed.\n");
- return FALSE;
- }
+ ReSIDfpBuilder *rs = new ReSIDfpBuilder("ReSIDfp builder");
+ engine->currBuilder = (sidbuilder *) rs;
 
- rs->filter(xs_cfg.emulateFilters);
- if (!*rs) {
- xs_error("reSID->filter(%d) failed.\n", xs_cfg.emulateFilters);
- return FALSE;
- }
-
-#ifndef HAVE_SIDPLAY2_DISTORTION
- // FIXME FIX ME: support other configurable parameters ...
- // ... WHEN/IF resid-builder+libsidplay2 gets fixed
- rs->sampling(tmpFreq);
- if (!*rs) {
- xs_error("reSID->sampling(%d) failed.\n", tmpFreq);
- return FALSE;
- }
- if (tmpFilter.points > 0)
- rs->filter((sid_filter_t *) &tmpFilter);
- else
-#endif
- rs->filter((sid_filter_t *) NULL);
-
- if (!*rs) {
- xs_error("reSID->filter(NULL) failed.\n");
- return FALSE;
- }
- }
- }
-#endif
-#ifdef HAVE_HARDSID_BUILDER
- if (xs_cfg.sid2Builder == XS_BLD_HARDSID) {
-#ifdef HAVE_SIDPLAY2_COMI
- engine->currBuilder = HardSIDBuilderCreate("");
- SidLazyIPtr<IHardSIDBuilder> hs(engine->currBuilder);
- if (hs) {
- engine->currConfig.sidEmulation = hs->iaggregate();
-#else
- HardSIDBuilder *hs = new HardSIDBuilder("HardSID builder");
- engine->currBuilder = (sidbuilder *) hs;
- if (hs) {
-#endif
- /* Builder object created, initialize it */
- hs->create((engine->currEng->info()).maxsids);
- if (!*hs) {
- xs_error("hardSID->create() failed.\n");
- return FALSE;
- }
-
- hs->filter(xs_cfg.emulateFilters);
- if (!*hs) {
- xs_error("hardSID->filter(%d) failed.\n", xs_cfg.emulateFilters);
- return FALSE;
- }
- }
+ /* Builder object created, initialize it */
+ engine->currBuilder->create(engine->currEng->info().maxsids());
+ if (!engine->currBuilder->getStatus()) {
+ xs_error("reSID->create() failed.\n");
+ return FALSE;
 }
-#endif
 
- if (!engine->currBuilder) {
- xs_error("[SIDPlay2] Could not initialize SIDBuilder object.\n");
+ engine->currBuilder->filter(xs_cfg.emulateFilters);
+ if (!engine->currBuilder->getStatus()) {
+ xs_error("reSID->filter(%d) failed.\n", xs_cfg.emulateFilters);
 return FALSE;
 }
 
-#ifndef HAVE_SIDPLAY2_COMI
 engine->currConfig.sidEmulation = engine->currBuilder;
- XSDEBUG("%s\n", engine->currBuilder->credits());
-#endif
 
 /* Clockspeed settings */
 switch (xs_cfg.clockSpeed) {
 case XS_CLOCK_NTSC:
- engine->currConfig.clockDefault = SID2_CLOCK_NTSC;
+ engine->currConfig.defaultC64Model = SidConfig::NTSC;
 break;
 
 default:
- xs_error("[SIDPlay2] Invalid clockSpeed=%d, falling back to PAL.\n",
+ xs_error("[SIDPlayFP] Invalid clockSpeed=%d, falling back to PAL.\n",
 xs_cfg.clockSpeed);
 
 case XS_CLOCK_PAL:
- engine->currConfig.clockDefault = SID2_CLOCK_PAL;
+ engine->currConfig.defaultC64Model = SidConfig::PAL;
 xs_cfg.clockSpeed = XS_CLOCK_PAL;
 break;
 }
 
-
 /* Configure rest of the emulation */
- if (xs_cfg.forceSpeed) {
- engine->currConfig.clockForced = true;
- engine->currConfig.clockSpeed = engine->currConfig.clockDefault;
- } else {
- engine->currConfig.clockForced = false;
- engine->currConfig.clockSpeed = SID2_CLOCK_CORRECT;
- }
-
-
-#ifndef HAVE_SIDPLAY2_DISTORTION
- if (xs_cfg.sid2OptLevel >= 0 && xs_cfg.sid2OptLevel <= SID2_MAX_OPTIMISATION) {
- engine->currConfig.optimisation = xs_cfg.sid2OptLevel;
- } else {
- xs_error("Invalid sid2OptLevel=%d, falling back to %d.\n",
- xs_cfg.sid2OptLevel, SID2_DEFAULT_OPTIMISATION);
-
- xs_cfg.sid2OptLevel =
- engine->currConfig.optimisation = SID2_DEFAULT_OPTIMISATION;
- }
-#endif
-
 if (xs_cfg.mos8580)
- engine->currConfig.sidDefault = SID2_MOS8580;
+ engine->currConfig.defaultSidModel = SidConfig::MOS8580;
 else
- engine->currConfig.sidDefault = SID2_MOS6581;
-
- if (xs_cfg.forceModel)
- engine->currConfig.sidModel = engine->currConfig.sidDefault;
- else
- engine->currConfig.sidModel = SID2_MODEL_CORRECT;
-
-
- /* XXX: Should this be configurable? libSIDPlay1 does not support it, though */
- engine->currConfig.sidSamples = TRUE;
+ engine->currConfig.defaultSidModel = SidConfig::MOS6581;
 
+ engine->currConfig.forceSidModel = xs_cfg.forceModel;
 
 /* Now set the emulator configuration */
- if (engine->currEng->config(engine->currConfig) < 0) {
- xs_error("[SIDPlay2] Emulator engine configuration failed!\n");
+ if (!engine->currEng->config(engine->currConfig)) {
+ xs_error("[SIDPlayFP] Emulator engine configuration failed!\n");
 return FALSE;
 }
 
 /* Create the sidtune */
 engine->currTune = new SidTune(0);
 if (!engine->currTune) {
- xs_error("[SIDPlay2] Could not initialize SIDTune object.\n");
+ xs_error("[SIDPlayFP] Could not initialize SIDTune object.\n");
 return FALSE;
 }
 
@@ -399,36 +179,32 @@
 }
 
 
-/* Close SIDPlay2 engine
+/* Close SIDPlayFP engine
 */
-void xs_sidplay2_close(xs_status_t * status)
+void xs_sidplayfp_close(xs_status_t * status)
 {
- xs_sidplay2_t *engine;
+ xs_sidplayfp_t *engine;
 assert(status != NULL);
 
- engine = (xs_sidplay2_t *) status->sidEngine;
+ engine = (xs_sidplayfp_t *) status->sidEngine;
 
 /* Free internals */
 if (engine->currBuilder) {
-#ifndef HAVE_SIDPLAY2_COMI
 delete engine->currBuilder;
-#endif
 engine->currBuilder = NULL;
 }
 
-#ifndef HAVE_SIDPLAY2_COMI
 if (engine->currEng) {
 delete engine->currEng;
 engine->currEng = NULL;
 }
-#endif
 
 if (engine->currTune) {
 delete engine->currTune;
 engine->currTune = NULL;
 }
 
- xs_sidplay2_delete(status);
+ xs_sidplayfp_delete(status);
 
 delete engine;
 status->sidEngine = NULL;
@@ -437,21 +213,21 @@
 
 /* Initialize current song and sub-tune
 */
-gboolean xs_sidplay2_initsong(xs_status_t * status)
+bool_t xs_sidplayfp_initsong(xs_status_t * status)
 {
- xs_sidplay2_t *engine;
+ xs_sidplayfp_t *engine;
 assert(status != NULL);
 
- engine = (xs_sidplay2_t *) status->sidEngine;
+ engine = (xs_sidplayfp_t *) status->sidEngine;
 if (engine == NULL) return FALSE;
 
 if (!engine->currTune->selectSong(status->currSong)) {
- xs_error("[SIDPlay2] currTune->selectSong() failed\n");
+ xs_error("[SIDPlayFP] currTune->selectSong() failed\n");
 return FALSE;
 }
 
- if (engine->currEng->load(engine->currTune) < 0) {
- xs_error("[SIDPlay2] currEng->load() failed\n");
+ if (!engine->currEng->load(engine->currTune)) {
+ xs_error("[SIDPlayFP] currEng->load() failed\n");
 return FALSE;
 }
 
@@ -463,76 +239,207 @@
 
 /* Emulate and render audio data to given buffer
 */
-guint xs_sidplay2_fillbuffer(xs_status_t * status, gchar * audioBuffer, guint audioBufSize)
+unsigned xs_sidplayfp_fillbuffer(xs_status_t * status, char * audioBuffer, unsigned audioBufSize)
 {
- xs_sidplay2_t *engine;
+ xs_sidplayfp_t *engine;
 assert(status != NULL);
 
- engine = (xs_sidplay2_t *) status->sidEngine;
+ engine = (xs_sidplayfp_t *) status->sidEngine;
 if (!engine) return 0;
 
- return engine->currEng->play(audioBuffer, audioBufSize);
+ return engine->currEng->play((short *)audioBuffer, audioBufSize / 2) * 2;
 }
 
 
 /* Load a given SID-tune file
 */
-gboolean xs_sidplay2_load(xs_status_t * status, const gchar * pcFilename)
+bool_t xs_sidplayfp_load(xs_status_t * status, const char * pcFilename)
 {
- xs_sidplay2_t *engine;
+ /* This is safe, since xmms-sid.c always calls us with xs_status locked */
+ static int loaded_roms = 0;
+
+ xs_sidplayfp_t *engine;
 assert(status != NULL);
 status->isInitialized = FALSE;
 
- engine = (xs_sidplay2_t *) status->sidEngine;
+ engine = (xs_sidplayfp_t *) status->sidEngine;
 if (!engine) return FALSE;
 
- /* Try to get the tune */
- if (!pcFilename) return FALSE;
+ /* In xs_sidplayfp_init aud-vfs is not initialized yet, so try to load
+ the optional rom files on the first xs_sidplayfp_load call. */
+ if (!loaded_roms) {
+ int64_t size = 0;
+ void *kernal = NULL, *basic = NULL, *chargen = NULL;
 
- if (xs_fload_buffer(pcFilename, &(engine->buf), &(engine->bufSize)) != 0)
- return FALSE;
+ vfs_file_get_contents("file://" SIDDATADIR "sidplayfp/kernal", &kernal, &size);
+ if (size != 8192) {
+ free(kernal);
+ kernal = NULL;
+ }
 
- if (!engine->currTune->read(engine->buf, engine->bufSize))
+ vfs_file_get_contents("file://" SIDDATADIR "sidplayfp/basic", &basic, &size);
+ if(size != 8192) {
+ free(basic);
+ basic = NULL;
+ }
+
+ vfs_file_get_contents("file://" SIDDATADIR "sidplayfp/chargen", &chargen, &size);
+ if(size != 4096) {
+ free(chargen);
+ chargen = NULL;
+ }
+
+ engine->currEng->setRoms((uint8_t*)kernal, (uint8_t*)basic, (uint8_t*)chargen);
+ free(kernal);
+ free(basic);
+ free(chargen);
+ loaded_roms = 1;
+ }
+
+ /* Try to get the tune */
+ vfs_file_get_contents(pcFilename, &engine->buf, &engine->bufSize);
+ if(!engine->bufSize) {
+ free(engine->buf);
+ engine->buf = NULL;
 return FALSE;
+ }
 
- return TRUE;
+ engine->currTune->read((uint8_t*)engine->buf, engine->bufSize);
+
+ return engine->currTune->getStatus();
 }
 
 
 /* Delete INTERNAL information
 */
-void xs_sidplay2_delete(xs_status_t * status)
+void xs_sidplayfp_delete(xs_status_t * status)
 {
- xs_sidplay2_t *engine;
+ xs_sidplayfp_t *engine;
 assert(status != NULL);
 
- engine = (xs_sidplay2_t *) status->sidEngine;
+ engine = (xs_sidplayfp_t *) status->sidEngine;
 if (engine == NULL) return;
 
- g_free(engine->buf);
+ free(engine->buf);
 engine->buf = NULL;
 engine->bufSize = 0;
 }
 
 
-/* Hardware backend flushing
- */
-void xs_sidplay2_flush(xs_status_t * status)
+xs_tuneinfo_t* xs_sidplayfp_getinfo(const char *sidFilename)
 {
- assert(status != NULL);
+ /* This is safe, since xmms-sid.c always calls us with xs_status locked */
+ static int got_db = -1;
+ static SidDatabase database;
+
+ xs_tuneinfo_t *result;
+ const SidTuneInfo *myInfo;
+ SidTune *myTune;
+ void *buf = NULL;
+ int64_t bufSize = 0;
+
+ /* Load file */
+ vfs_file_get_contents(sidFilename, &buf, &bufSize);
+
+ /* Check if the tune exists and is readable */
+ if (!bufSize || !(myTune = new SidTune((uint8_t*)buf, bufSize))) {
+ free(buf);
+ return NULL;
+ }
+ free(buf);
+
+ if (!myTune->getStatus()) {
+ delete myTune;
+ return NULL;
+ }
 
-#ifdef HAVE_HARDSID_BUILDER
-#ifdef HSID_SID2_COM
- IfPtr<HardSIDBuilder> hs(status->currBuilder);
- if (hs)
- hs->flush();
-#else
- if (xs_cfg.sid2Builder == XS_BLD_HARDSID)
- ((HardSIDBuilder *) status->currBuilder)->flush();
-#endif
-#endif
+ /* Get general tune information */
+ myInfo = myTune->getInfo();
+
+ /* Allocate tuneinfo structure and set information */
+ result = xs_tuneinfo_new(sidFilename,
+ myInfo->songs(), myInfo->startSong(),
+ myInfo->infoString(0), myInfo->infoString(1), myInfo->infoString(2),
+ myInfo->loadAddr(), myInfo->initAddr(), myInfo->playAddr(),
+ myInfo->dataFileLen(), myInfo->formatString(), myInfo->sidModel1());
+
+ for (int i = 0; i < result->nsubTunes; i++) {
+ if (result->subTunes[i].tuneLength >= 0)
+ continue;
+
+ if (got_db == -1)
+ got_db = database.open(SIDDATADIR "sidplayfp/Songlengths.txt");
+
+ if (got_db) {
+ myTune->selectSong(i + 1);
+ result->subTunes[i].tuneLength = database.length(*myTune);
+ }
+ }
+
+ delete myTune;
+
+ return result;
 }
 
+bool_t xs_sidplayfp_updateinfo(xs_status_t *myStatus)
+{
+ const SidTuneInfo *myInfo;
+ SidTune *myTune;
+ xs_sidplayfp_t *myEngine;
+ xs_tuneinfo_t *i;
+
+ /* Check if we have required structures initialized */
+ if (!myStatus || !myStatus->tuneInfo || !myStatus->sidEngine)
+ return FALSE;
+
+ myEngine = (xs_sidplayfp_t *) myStatus->sidEngine;
+ myTune = myEngine->currTune;
+ if (!myTune)
+ return FALSE;
+
+ /* Get currently playing tune information */
+ myInfo = myTune->getInfo();
+
+ /* NOTICE! Here we assume that libSIDPlay[12] headers define
+ * SIDTUNE_SIDMODEL_* similarly to our enums in xs_config.h ...
+ */
+ i = myStatus->tuneInfo;
+ i->sidModel = myInfo->sidModel1();
+
+ if ((myStatus->currSong > 0) && (myStatus->currSong <= i->nsubTunes)) {
+ int tmpSpeed = -1;
+
+ switch (myInfo->clockSpeed()) {
+ case SidTuneInfo::CLOCK_PAL:
+ tmpSpeed = XS_CLOCK_PAL;
+ break;
+ case SidTuneInfo::CLOCK_NTSC:
+ tmpSpeed = XS_CLOCK_NTSC;
+ break;
+ case SidTuneInfo::CLOCK_ANY:
+ tmpSpeed = XS_CLOCK_ANY;
+ break;
+ case SidTuneInfo::CLOCK_UNKNOWN:
+ switch (myInfo->songSpeed()) {
+ case SidTuneInfo::SPEED_VBI:
+ tmpSpeed = XS_CLOCK_VBI;
+ break;
+ case SidTuneInfo::SPEED_CIA_1A:
+ tmpSpeed = XS_CLOCK_CIA;
+ break;
+ default:
+ tmpSpeed = myInfo->songSpeed();
+ break;
+ }
+ default:
+ tmpSpeed = myInfo->clockSpeed();
+ break;
+ }
+
+ i->subTunes[myStatus->currSong - 1].tuneSpeed = tmpSpeed;
+ }
+
+ return TRUE;
+}
 
 } /* extern "C" */
-#endif /* HAVE_SIDPLAY2 */

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_sidplay2.h -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_sidplay2.h Changed

@@ -1,5 +1,5 @@
-#ifndef XS_SIDPLAY2_H
-#define XS_SIDPLAY2_H
+#ifndef XS_SIDPLAYFP_H
+#define XS_SIDPLAYFP_H
 
 #include "xs_player.h"
 #include "xs_support.h"
@@ -9,18 +9,17 @@
 extern "C" {
 #endif
 
-gboolean    xs_sidplay2_probe(xs_file_t *);
-void        xs_sidplay2_close(xs_status_t *);
-gboolean    xs_sidplay2_init(xs_status_t *);
-gboolean    xs_sidplay2_initsong(xs_status_t *);
-guint        xs_sidplay2_fillbuffer(xs_status_t *, gchar *, guint);
-gboolean    xs_sidplay2_load(xs_status_t *, const gchar *);
-void        xs_sidplay2_delete(xs_status_t *);
-xs_tuneinfo_t*    xs_sidplay2_getinfo(const gchar *);
-gboolean    xs_sidplay2_updateinfo(xs_status_t *);
-void        xs_sidplay2_flush(xs_status_t *);
+bool_t    xs_sidplayfp_probe(VFSFile *);
+void        xs_sidplayfp_close(xs_status_t *);
+bool_t    xs_sidplayfp_init(xs_status_t *);
+bool_t    xs_sidplayfp_initsong(xs_status_t *);
+unsigned        xs_sidplayfp_fillbuffer(xs_status_t *, char *, unsigned);
+bool_t    xs_sidplayfp_load(xs_status_t *, const char *);
+void        xs_sidplayfp_delete(xs_status_t *);
+xs_tuneinfo_t*    xs_sidplayfp_getinfo(const char *);
+bool_t    xs_sidplayfp_updateinfo(xs_status_t *);
 
 #ifdef __cplusplus
 }
 #endif
-#endif /* XS_SIDPLAY2_H */
+#endif /* XS_SIDPLAYFP_H */

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_slsup.c -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_slsup.c Changed

@@ -20,29 +20,35 @@
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
+
 #include "xs_slsup.h"
+
+#include <glib.h>
+#include <stdio.h>
+#include <string.h>
+
 #include "xs_config.h"
 
 
 static xs_sldb_t *xs_sldb_db = NULL;
-XS_MUTEX(xs_sldb_db);
+pthread_mutex_t xs_sldb_db_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 static xs_stildb_t *xs_stildb_db = NULL;
-XS_MUTEX(xs_stildb_db);
+pthread_mutex_t xs_stildb_db_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 
 /* STIL-database handling
 */
-gint xs_stil_init(void)
+int xs_stil_init(void)
 {
- XS_MUTEX_LOCK(xs_cfg);
+ pthread_mutex_lock(&xs_cfg_mutex);
 
 if (!xs_cfg.stilDBPath) {
- XS_MUTEX_UNLOCK(xs_cfg);
+ pthread_mutex_unlock(&xs_cfg_mutex);
 return -1;
 }
 
- XS_MUTEX_LOCK(xs_stildb_db);
+ pthread_mutex_lock(&xs_stildb_db_mutex);
 
 /* Check if already initialized */
 if (xs_stildb_db)
@@ -51,8 +57,8 @@
 /* Allocate database */
 xs_stildb_db = (xs_stildb_t *) g_malloc0(sizeof(xs_stildb_t));
 if (!xs_stildb_db) {
- XS_MUTEX_UNLOCK(xs_cfg);
- XS_MUTEX_UNLOCK(xs_stildb_db);
+ pthread_mutex_unlock(&xs_cfg_mutex);
+ pthread_mutex_unlock(&xs_stildb_db_mutex);
 return -2;
 }
 
@@ -60,8 +66,8 @@
 if (xs_stildb_read(xs_stildb_db, xs_cfg.stilDBPath) != 0) {
 xs_stildb_free(xs_stildb_db);
 xs_stildb_db = NULL;
- XS_MUTEX_UNLOCK(xs_cfg);
- XS_MUTEX_UNLOCK(xs_stildb_db);
+ pthread_mutex_unlock(&xs_cfg_mutex);
+ pthread_mutex_unlock(&xs_stildb_db_mutex);
 return -3;
 }
 
@@ -69,38 +75,38 @@
 if (xs_stildb_index(xs_stildb_db) != 0) {
 xs_stildb_free(xs_stildb_db);
 xs_stildb_db = NULL;
- XS_MUTEX_UNLOCK(xs_cfg);
- XS_MUTEX_UNLOCK(xs_stildb_db);
+ pthread_mutex_unlock(&xs_cfg_mutex);
+ pthread_mutex_unlock(&xs_stildb_db_mutex);
 return -4;
 }
 
- XS_MUTEX_UNLOCK(xs_cfg);
- XS_MUTEX_UNLOCK(xs_stildb_db);
+ pthread_mutex_unlock(&xs_cfg_mutex);
+ pthread_mutex_unlock(&xs_stildb_db_mutex);
 return 0;
 }
 
 
 void xs_stil_close(void)
 {
- XS_MUTEX_LOCK(xs_stildb_db);
+ pthread_mutex_lock(&xs_stildb_db_mutex);
 xs_stildb_free(xs_stildb_db);
 xs_stildb_db = NULL;
- XS_MUTEX_UNLOCK(xs_stildb_db);
+ pthread_mutex_unlock(&xs_stildb_db_mutex);
 }
 
 
-stil_node_t *xs_stil_get(gchar *filename)
+stil_node_t *xs_stil_get(char *filename)
 {
 stil_node_t *result;
- gchar *tmpFilename;
+ char *tmpFilename;
 
- XS_MUTEX_LOCK(xs_stildb_db);
- XS_MUTEX_LOCK(xs_cfg);
+ pthread_mutex_lock(&xs_stildb_db_mutex);
+ pthread_mutex_lock(&xs_cfg_mutex);
 
 if (xs_cfg.stilDBEnable && xs_stildb_db) {
 if (xs_cfg.hvscPath) {
 /* Remove postfixed directory separator from HVSC-path */
- tmpFilename = xs_strrchr(xs_cfg.hvscPath, '/');
+ tmpFilename = strrchr(xs_cfg.hvscPath, '/');
 if (tmpFilename && (tmpFilename[1] == 0))
 tmpFilename[0] = 0;
 
@@ -117,8 +123,8 @@
 } else
 result = NULL;
 
- XS_MUTEX_UNLOCK(xs_stildb_db);
- XS_MUTEX_UNLOCK(xs_cfg);
+ pthread_mutex_unlock(&xs_stildb_db_mutex);
+ pthread_mutex_unlock(&xs_cfg_mutex);
 
 return result;
 }
@@ -126,16 +132,16 @@
 
 /* Song length database handling glue
 */
-gint xs_songlen_init(void)
+int xs_songlen_init(void)
 {
- XS_MUTEX_LOCK(xs_cfg);
+ pthread_mutex_lock(&xs_cfg_mutex);
 
 if (!xs_cfg.songlenDBPath) {
- XS_MUTEX_UNLOCK(xs_cfg);
+ pthread_mutex_unlock(&xs_cfg_mutex);
 return -1;
 }
 
- XS_MUTEX_LOCK(xs_sldb_db);
+ pthread_mutex_lock(&xs_sldb_db_mutex);
 
 /* Check if already initialized */
 if (xs_sldb_db)
@@ -144,8 +150,8 @@
 /* Allocate database */
 xs_sldb_db = (xs_sldb_t *) g_malloc0(sizeof(xs_sldb_t));
 if (!xs_sldb_db) {
- XS_MUTEX_UNLOCK(xs_cfg);
- XS_MUTEX_UNLOCK(xs_sldb_db);
+ pthread_mutex_unlock(&xs_cfg_mutex);
+ pthread_mutex_unlock(&xs_sldb_db_mutex);
 return -2;
 }
 
@@ -153,8 +159,8 @@
 if (xs_sldb_read(xs_sldb_db, xs_cfg.songlenDBPath) != 0) {
 xs_sldb_free(xs_sldb_db);
 xs_sldb_db = NULL;
- XS_MUTEX_UNLOCK(xs_cfg);
- XS_MUTEX_UNLOCK(xs_sldb_db);
+ pthread_mutex_unlock(&xs_cfg_mutex);
+ pthread_mutex_unlock(&xs_sldb_db_mutex);
 return -3;
 }
 
@@ -162,38 +168,38 @@
 if (xs_sldb_index(xs_sldb_db) != 0) {
 xs_sldb_free(xs_sldb_db);
 xs_sldb_db = NULL;
- XS_MUTEX_UNLOCK(xs_cfg);
- XS_MUTEX_UNLOCK(xs_sldb_db);
+ pthread_mutex_unlock(&xs_cfg_mutex);
+ pthread_mutex_unlock(&xs_sldb_db_mutex);
 return -4;
 }
 
- XS_MUTEX_UNLOCK(xs_cfg);
- XS_MUTEX_UNLOCK(xs_sldb_db);
+ pthread_mutex_unlock(&xs_cfg_mutex);
+ pthread_mutex_unlock(&xs_sldb_db_mutex);
 return 0;
 }
 
 
 void xs_songlen_close(void)
 {
- XS_MUTEX_LOCK(xs_sldb_db);
+ pthread_mutex_lock(&xs_sldb_db_mutex);
 xs_sldb_free(xs_sldb_db);
 xs_sldb_db = NULL;
- XS_MUTEX_UNLOCK(xs_sldb_db);
+ pthread_mutex_unlock(&xs_sldb_db_mutex);
 }
 
 
-sldb_node_t *xs_songlen_get(const gchar * filename)
+sldb_node_t *xs_songlen_get(const char * filename)
 {
 sldb_node_t *result;
 
- XS_MUTEX_LOCK(xs_sldb_db);
+ pthread_mutex_lock(&xs_sldb_db_mutex);
 
 if (xs_cfg.songlenDBEnable && xs_sldb_db)
 result = xs_sldb_get(xs_sldb_db, filename);
 else
 result = NULL;
 
- XS_MUTEX_UNLOCK(xs_sldb_db);
+ pthread_mutex_unlock(&xs_sldb_db_mutex);
 
 return result;
 }
@@ -201,15 +207,15 @@
 
 /* Allocate a new tune information structure
 */
-xs_tuneinfo_t *xs_tuneinfo_new(const gchar * filename,
- gint nsubTunes, gint startTune, const gchar * sidName,
- const gchar * sidComposer, const gchar * sidCopyright,
- gint loadAddr, gint initAddr, gint playAddr,
- gint dataFileLen, const gchar *sidFormat, gint sidModel)
+xs_tuneinfo_t *xs_tuneinfo_new(const char * filename,
+ int nsubTunes, int startTune, const char * sidName,
+ const char * sidComposer, const char * sidCopyright,
+ int loadAddr, int initAddr, int playAddr,
+ int dataFileLen, const char *sidFormat, int sidModel)
 {
 xs_tuneinfo_t *result;
 sldb_node_t *tmpLength;
- gint i;
+ int i;
 
 /* Allocate structure */
 result = (xs_tuneinfo_t *) g_malloc0(sizeof(xs_tuneinfo_t));
@@ -251,22 +257,22 @@
 result->playAddr = playAddr;
 result->dataFileLen = dataFileLen;
 result->sidFormat = g_convert(sidFormat, -1, "UTF-8", XS_SID_CHARSET, NULL, NULL, NULL);
- 
+
 result->sidModel = sidModel;
 
 /* Get length information (NOTE: Do not free this!) */
 tmpLength = xs_songlen_get(filename);
- 
+
 /* Fill in sub-tune information */
 for (i = 0; i < result->nsubTunes; i++) {
 if (tmpLength && (i < tmpLength->nlengths))
 result->subTunes[i].tuneLength = tmpLength->lengths[i];
 else
 result->subTunes[i].tuneLength = -1;
- 
+
 result->subTunes[i].tuneSpeed = -1;
 }
- 
+
 return result;
 }

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_slsup.h -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_slsup.h Changed

@@ -9,21 +9,19 @@
 extern "C" {
 #endif
 
-gint        xs_stil_init(void);
-void        xs_stil_close(void);
-stil_node_t *xs_stil_get(gchar *filename);
+int xs_stil_init(void);
+void xs_stil_close(void);
+stil_node_t *xs_stil_get(char *filename);
 
-gint        xs_songlen_init(void);
-void        xs_songlen_close(void);
-sldb_node_t *xs_songlen_get(const gchar *);
-
-xs_tuneinfo_t *xs_tuneinfo_new(const gchar * pcFilename,
-            gint nsubTunes, gint startTune, const gchar * sidName,
-            const gchar * sidComposer, const gchar * sidCopyright,
-            gint loadAddr, gint initAddr, gint playAddr,
-            gint dataFileLen, const gchar *sidFormat, gint sidModel);
-void        xs_tuneinfo_free(xs_tuneinfo_t *);
+int xs_songlen_init(void);
+void xs_songlen_close(void);
+sldb_node_t *xs_songlen_get(const char *filename);
 
+xs_tuneinfo_t *xs_tuneinfo_new(const char *pcFilename, int nsubTunes,
+ int startTune, const char *sidName, const char *sidComposer,
+ const char *sidCopyright, int loadAddr, int initAddr, int playAddr,
+ int dataFileLen, const char *sidFormat, int sidModel);
+void xs_tuneinfo_free(xs_tuneinfo_t *tune);
 
 #ifdef __cplusplus
 }

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_stil.c -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_stil.c Changed

@@ -1,8 +1,8 @@
-/* 
+/*
 XMMS-SID - SIDPlay input plugin for X MultiMedia System (XMMS)
 
 STIL-database handling functions
- 
+
 Programmed and designed by Matti 'ccr' Hamalainen <ccr@tnsp.org>
 (C) Copyright 1999-2009 Tecnic Software productions (TNSP)
 
@@ -21,32 +21,36 @@
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 #include "xs_stil.h"
-#include "xs_support.h"
+
+#include <assert.h>
+#include <ctype.h>
+#include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
-#include <stdarg.h>
+#include <string.h>
 
+#include "xmms-sid.h"
+#include "xs_support.h"
 
 /* Database handling functions
 */
-static gboolean xs_stildb_node_realloc(stil_node_t *node, gint nsubTunes)
+static bool_t xs_stildb_node_realloc(stil_node_t *node, int nsubTunes)
 {
 if (node == NULL) return FALSE;
 
 /* Re-allocate subTune structure if needed */
 if (nsubTunes > node->nsubTunes) {
- gint clearIndex, clearLength;
- 
+ int clearIndex, clearLength;
+
 node->subTunes =
- (stil_subnode_t **) g_realloc(node->subTunes,
+ (stil_subnode_t **) realloc(node->subTunes,
 (nsubTunes + 1) * sizeof(stil_subnode_t **));
 
 if (!node->subTunes) {
 xs_error("SubTune pointer structure realloc failed.\n");
 return FALSE;
 }
- 
+
 /* Clear the newly allocated memory */
 if (node->nsubTunes == 0) {
 clearIndex = 0;
@@ -56,18 +60,19 @@
 clearLength = (nsubTunes - clearIndex + 1);
 }
 memset(&(node->subTunes[clearIndex]), 0, clearLength * sizeof(stil_subnode_t **));
- 
+
 node->nsubTunes = nsubTunes;
 }
 
 /* Allocate memory for subTune */
 if (!node->subTunes[nsubTunes]) {
- node->subTunes[nsubTunes] = g_new0(stil_subnode_t, 1);
- 
+ node->subTunes[nsubTunes] = malloc(sizeof(stil_subnode_t));
+
 if (node->subTunes[nsubTunes] == NULL) {
 xs_error("SubTune structure malloc failed!\n");
 return FALSE;
 }
+ memset(node->subTunes[nsubTunes], 0, sizeof(stil_subnode_t));
 }
 
 return TRUE;
@@ -76,7 +81,7 @@
 
 static void xs_stildb_node_free(stil_node_t *node)
 {
- gint i;
+ int i;
 stil_subnode_t *subnode;
 
 if (node == NULL) return;
@@ -85,36 +90,37 @@
 for (i = 0; i <= node->nsubTunes; i++) {
 subnode = node->subTunes[i];
 if (subnode) {
- g_free(subnode->name);
- g_free(subnode->author);
- g_free(subnode->info);
- g_free(subnode->title);
- g_free(subnode);
+ free(subnode->name);
+ free(subnode->author);
+ free(subnode->info);
+ free(subnode->title);
+ free(subnode);
 }
 }
- g_free(node->subTunes);
- g_free(node->filename);
- g_free(node);
+ free(node->subTunes);
+ free(node->filename);
+ free(node);
 }
 
 
-static stil_node_t *xs_stildb_node_new(gchar *filename)
+static stil_node_t *xs_stildb_node_new(char *filename)
 {
 stil_node_t *result;
 
 //fprintf(stderr, "LL: %s\n", filename);
 
 /* Allocate memory for new node */
- if ((result = g_new0(stil_node_t, 1)) == NULL)
+ if ((result = malloc(sizeof(stil_node_t))) == NULL)
 return NULL;
+ memset(result, 0, sizeof(stil_node_t));
 
 /* Allocate filename and initial space for one subtune */
- result->filename = g_strdup(filename);
+ result->filename = strdup(filename);
 if (result->filename == NULL || !xs_stildb_node_realloc(result, 1)) {
 xs_stildb_node_free(result);
 return NULL;
 }
- 
+
 return result;
 }
 
@@ -147,29 +153,29 @@
 xs_pstrcat(&(node->subTunes[subEntry]->info), "\n"); \
 }
 
-static void XS_STILDB_ERR(gint linenum, gchar *line, const gchar *fmt, ...)
+static void XS_STILDB_ERR(int linenum, char *line, const char *fmt, ...)
 {
 va_list ap;
- 
+
 va_start(ap, fmt);
 xs_verror(fmt, ap);
 va_end(ap);
- 
+
 xs_error("#%d: '%s'\n", linenum, line);
 }
 
-gint xs_stildb_read(xs_stildb_t *db, gchar *filename)
+int xs_stildb_read(xs_stildb_t *db, char *filename)
 {
 FILE *f;
- gchar line[XS_BUF_SIZE + 16]; /* Since we add some chars here and there */
+ char line[XS_BUF_SIZE + 16]; /* Since we add some chars here and there */
 stil_node_t *node;
- gboolean error, multi;
- gint lineNum, subEntry;
- gchar *tmpLine = line;
+ bool_t error, multi;
+ int lineNum, subEntry;
+ char *tmpLine = line;
 assert(db != NULL);
 
 /* Try to open the file */
- if ((f = fopen(filename, "ra")) == NULL) {
+ if ((f = fopen(filename, "r")) == NULL) {
 xs_error("Could not open STILDB '%s'\n", filename);
 return -1;
 }
@@ -182,12 +188,12 @@
 subEntry = 0;
 
 while (!error && fgets(line, XS_BUF_SIZE, f) != NULL) {
- gsize linePos = 0, eolPos = 0;
+ size_t linePos = 0, eolPos = 0;
 line[XS_BUF_SIZE] = 0;
 xs_findeol(line, &eolPos);
 line[eolPos] = 0;
 lineNum++;
- 
+
 tmpLine = g_convert(line, -1, "UTF-8", XS_STIL_CHARSET, NULL, NULL, NULL);
 
 switch (tmpLine[0]) {
@@ -218,14 +224,14 @@
 if (tmpLine[linePos] == '#') {
 linePos++;
 if (isdigit(tmpLine[linePos])) {
- gsize savePos = linePos;
+ size_t savePos = linePos;
 xs_findnum(tmpLine, &linePos);
 tmpLine[linePos] = 0;
 subEntry = atol(&tmpLine[savePos]);
 
 /* Sanity check */
 if (subEntry < 1) {
- gchar *tmp = node != NULL ? node->filename : NULL;
+ char *tmp = node != NULL ? node->filename : NULL;
 XS_STILDB_ERR(lineNum, tmpLine,
 "Number of subEntry (%d) for '%s' is invalid\n",
 subEntry, tmp);
@@ -259,7 +265,7 @@
 default:
 /* Check if we are parsing an entry */
 xs_findnext(tmpLine, &linePos);
- 
+
 if (node == NULL) {
 XS_STILDB_ERR(lineNum, tmpLine,
 "Entry data encountered outside of entry or syntax error!\n");
@@ -272,22 +278,22 @@
 error = TRUE;
 break;
 }
- 
+
 /* Some other type */
 if (strncmp(tmpLine, " NAME:", 8) == 0) {
 XS_STILDB_MULTI;
- g_free(node->subTunes[subEntry]->name);
- node->subTunes[subEntry]->name = g_strdup(&tmpLine[9]);
+ free(node->subTunes[subEntry]->name);
+ node->subTunes[subEntry]->name = strdup(&tmpLine[9]);
 } else if (strncmp(tmpLine, " TITLE:", 8) == 0) {
 XS_STILDB_MULTI;
 multi = TRUE;
 if (!node->subTunes[subEntry]->title)
- node->subTunes[subEntry]->title = g_strdup(&tmpLine[9]);
+ node->subTunes[subEntry]->title = strdup(&tmpLine[9]);
 xs_pstrcat(&(node->subTunes[subEntry]->info), &tmpLine[2]);
 } else if (strncmp(tmpLine, " AUTHOR:", 8) == 0) {
 XS_STILDB_MULTI;
- g_free(node->subTunes[subEntry]->author);
- node->subTunes[subEntry]->author = g_strdup(&tmpLine[9]);
+ free(node->subTunes[subEntry]->author);
+ node->subTunes[subEntry]->author = strdup(&tmpLine[9]);
 } else if (strncmp(tmpLine, " ARTIST:", 8) == 0) {
 XS_STILDB_MULTI;
 multi = TRUE;
@@ -307,7 +313,7 @@
 }
 break;
 }
- g_free(tmpLine);
+ free(tmpLine);
 } /* while */
 
 /* Check if there is one remaining node */
@@ -323,7 +329,7 @@
 
 /* Compare two nodes
 */
-static gint xs_stildb_cmp(const void *node1, const void *node2)
+static int xs_stildb_cmp(const void *node1, const void *node2)
 {
 /* We assume here that we never ever get NULL-pointers or similar */
 return strcmp(
@@ -334,14 +340,14 @@
 
 /* (Re)create index
 */
-gint xs_stildb_index(xs_stildb_t *db)
+int xs_stildb_index(xs_stildb_t *db)
 {
 stil_node_t *curr;
 size_t i;
 
 /* Free old index */
 if (db->pindex) {
- g_free(db->pindex);
+ free(db->pindex);
 db->pindex = NULL;
 }
 
@@ -356,7 +362,7 @@
 /* Check number of nodes */
 if (db->n > 0) {
 /* Allocate memory for index-table */
- db->pindex = (stil_node_t **) g_malloc(sizeof(stil_node_t *) * db->n);
+ db->pindex = (stil_node_t **) malloc(sizeof(stil_node_t *) * db->n);
 if (!db->pindex)
 return -1;
 
@@ -397,19 +403,19 @@
 
 /* Free memory allocated for index */
 if (db->pindex) {
- g_free(db->pindex);
+ free(db->pindex);
 db->pindex = NULL;
 }
 
 /* Free structure */
 db->n = 0;
- g_free(db);
+ free(db);
 }
 
 
 /* Get STIL information node from database
 */
-stil_node_t *xs_stildb_get_node(xs_stildb_t *db, gchar *filename)
+stil_node_t *xs_stildb_get_node(xs_stildb_t *db, char *filename)
 {
 stil_node_t keyItem, *key, **item;

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_stil.h -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_stil.h Changed

@@ -1,7 +1,7 @@
 #ifndef XS_STIL_H
 #define XS_STIL_H
 
-#include "xmms-sid.h"
+#include <sys/types.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -10,34 +10,30 @@
 /* Types
 */
 typedef struct {
- gchar *name,
- *author,
- *title,
- *info;
+ char *name, *author, *title, *info;
 } stil_subnode_t;
 
 
 typedef struct _stil_node_t {
- gchar *filename;
- gint nsubTunes;
- stil_subnode_t **subTunes;
+ char *filename;
+ int nsubTunes;
+ stil_subnode_t **subTunes;
 struct _stil_node_t *prev, *next;
 } stil_node_t;
 
 
 typedef struct {
- stil_node_t *nodes,
- **pindex;
- size_t n;
+ stil_node_t *nodes, **pindex;
+ size_t n;
 } xs_stildb_t;
 
 
 /* Functions
 */
-gint xs_stildb_read(xs_stildb_t *, gchar *);
-gint xs_stildb_index(xs_stildb_t *);
-void xs_stildb_free(xs_stildb_t *);
-stil_node_t * xs_stildb_get_node(xs_stildb_t *, gchar *);
+int xs_stildb_read(xs_stildb_t *, char *);
+int xs_stildb_index(xs_stildb_t *);
+void xs_stildb_free(xs_stildb_t *);
+stil_node_t *xs_stildb_get_node(xs_stildb_t *, char *);
 
 #ifdef __cplusplus
 }

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_support.c -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_support.c Changed

@@ -20,119 +20,30 @@
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
+
 #include "xs_support.h"
+
 #include <ctype.h>
+#include <stdlib.h>
 #include <string.h>
 
-#define __AUDACIOUS_NEWVFS__
-
-guint16 xs_fread_be16(xs_file_t *f)
+uint16_t xs_fread_be16(VFSFile *f)
 {
- return (((guint16) xs_fgetc(f)) << 8) | ((guint16) xs_fgetc(f));
+ uint16_t val;
+ return vfs_fget_be16(&val, f) ? val : 0;
 }
 
 
-guint32 xs_fread_be32(xs_file_t *f)
+uint32_t xs_fread_be32(VFSFile *f)
 {
- return (((guint32) xs_fgetc(f)) << 24) |
- (((guint32) xs_fgetc(f)) << 16) |
- (((guint32) xs_fgetc(f)) << 8) |
- ((guint32) xs_fgetc(f));
-}
-
-
-/* Load a file to a buffer, return 0 on success, negative value on error
- */
-gint xs_fload_buffer(const gchar *filename, guint8 **buf, size_t *bufSize)
-{
- xs_file_t *f;
- glong seekPos;
-
- /* Open file, get file size */
- if ((f = xs_fopen(filename, "rb")) == NULL)
- return -1;
-
-#ifdef __AUDACIOUS_NEWVFS__
- seekPos = vfs_fsize(f);
-#else
- xs_fseek(f, 0L, SEEK_END);
- seekPos = xs_ftell(f);
-#endif
-
- if (seekPos > 0) {
- size_t readSize = seekPos;
- if (readSize >= *bufSize || *buf == NULL) {
- /* Only re-allocate if the required size > current */
- if (*buf != NULL) {
- g_free(*buf);
- *buf = NULL;
- }
-
- *bufSize = seekPos;
-
- *buf = (guint8 *) g_malloc(*bufSize * sizeof(guint8));
- if (*buf == NULL) {
- xs_fclose(f);
- return -2;
- }
- }
-
- /* Read data */
- if (xs_fseek(f, 0, SEEK_SET))
- readSize = 0;
- else
- readSize = xs_fread(*buf, 1, *bufSize, f);
-
- xs_fclose(f);
-
- if (readSize != *bufSize)
- return -3;
- else
- return 0;
- } else {
- xs_fclose(f);
- return -4;
- }
-}
-
-
-/* Copy a string
- */
-gchar *xs_strncpy(gchar *dest, const gchar *src, size_t n)
-{
- const gchar *s;
- gchar *d;
- size_t i;
-
- /* Check the string pointers */
- if (!src || !dest)
- return dest;
-
- /* Copy to the destination */
- i = n;
- s = src;
- d = dest;
- while (*s && (i > 0)) {
- *(d++) = *(s++);
- i--;
- }
-
- /* Fill rest of space with zeros */
- while (i > 0) {
- *(d++) = 0;
- i--;
- }
-
- /* Ensure that last is always zero */
- dest[n - 1] = 0;
-
- return dest;
+ uint32_t val;
+ return vfs_fget_be32(&val, f) ? val : 0;
 }
 
 
 /* Copy a given string over in *result.
 */
-gint xs_pstrcpy(gchar **result, const gchar *str)
+int xs_pstrcpy(char **result, const char *str)
 {
 /* Check the string pointers */
 if (!result || !str)
@@ -140,8 +51,8 @@
 
 /* Allocate memory for destination */
 if (*result)
- g_free(*result);
- *result = (gchar *) g_malloc(strlen(str) + 1);
+ free(*result);
+ *result = (char *) malloc(strlen(str) + 1);
 if (!*result)
 return -2;
 
@@ -154,19 +65,19 @@
 
 /* Concatenates a given string into string pointed by *result.
 */
-gint xs_pstrcat(gchar **result, const gchar *str)
+int xs_pstrcat(char **result, const char *str)
 {
 /* Check the string pointers */
 if (!result || !str)
 return -1;
 
 if (*result != NULL) {
- *result = (gchar *) g_realloc(*result, strlen(*result) + strlen(str) + 1);
+ *result = (char *) realloc(*result, strlen(*result) + strlen(str) + 1);
 if (*result == NULL)
 return -1;
 strcat(*result, str);
 } else {
- *result = (gchar *) g_malloc(strlen(str) + 1);
+ *result = (char *) malloc(strlen(str) + 1);
 if (*result == NULL)
 return -1;
 strcpy(*result, str);
@@ -176,77 +87,21 @@
 }
 
 
-/* Concatenate a given string up to given dest size or \n.
- * If size max is reached, change the end to "..."
- */
-void xs_pnstrcat(gchar *dest, size_t iSize, const gchar *str)
-{
- size_t i, n;
- const gchar *s;
- gchar *d;
-
- d = dest;
- i = 0;
- while (*d && (i < iSize)) {
- i++;
- d++;
- }
-
- s = str;
- while (*s && (*s != '\n') && (i < iSize)) {
- *d = *s;
- d++;
- s++;
- i++;
- }
-
- *d = 0;
-
- if (i >= iSize) {
- i--;
- d--;
- n = 3;
- while ((i > 0) && (n > 0)) {
- *d = '.';
- d--;
- i--;
- n--;
- }
- }
-}
-
-
-/* Locate character in string
- */
-gchar *xs_strrchr(gchar *str, const gchar ch)
-{
- gchar *lastPos = NULL;
-
- while (*str) {
- if (*str == ch)
- lastPos = str;
- str++;
- }
-
- return lastPos;
-}
-
-
-void xs_findnext(const gchar *str, size_t *pos)
+void xs_findnext(const char *str, size_t *pos)
 {
 while (str[*pos] && isspace(str[*pos]))
 (*pos)++;
 }
 
 
-void xs_findeol(const gchar *str, size_t *pos)
+void xs_findeol(const char *str, size_t *pos)
 {
 while (str[*pos] && (str[*pos] != '\n') && (str[*pos] != '\r'))
 (*pos)++;
 }
 
 
-void xs_findnum(const gchar *str, size_t *pos)
+void xs_findnum(const char *str, size_t *pos)
 {
 while (str[*pos] && isdigit(str[*pos]))
 (*pos)++;

audacious-plugins-3.3.4.tar.bz2/src/sid/xs_support.h -> audacious-plugins-3.4.2.tar.bz2/src/sid/xs_support.h Changed

@@ -5,101 +5,22 @@
 extern "C" {
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-#include <stdio.h>
-
-#ifdef AUDACIOUS_PLUGIN
-#include <audacious/plugin.h>
-#else
-#include <xmms/plugin.h>
-#include <xmms/util.h>
-#include <xmms/titlestring.h>
-#endif
-
-#ifdef HAVE_ASSERT_H
-#include <assert.h>
-#else
-#define assert(x) /* stub */
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-
-
-/* Standard gettext macros
- */
-#ifdef ENABLE_NLS
-# include <libintl.h>
-# undef _
-# define _(String) dgettext (PACKAGE, String)
-# ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-# else
-# define N_(String) (String)
-# endif
-#else
-# define _LIBINTL_H
-# define textdomain(String) (String)
-# define gettext(String) (String)
-# define dgettext(Domain,Message) (Message)
-# define dcgettext(Domain,Message,Type) (Message)
-# define bindtextdomain(Domain,Directory) (Domain)
-# define _(String) (String)
-# define N_(String) (String)
-#endif
-
+#include <sys/types.h>
+#include <libaudcore/vfs.h>
 
 /* VFS replacement functions
 */
-#ifdef AUDACIOUS_PLUGIN
-#define xs_file_t VFSFile
-#define xs_fopen(a,b) vfs_fopen(a,b)
-#define xs_fclose(a) vfs_fclose(a)
-#define xs_fgetc(a) vfs_getc(a)
-#define xs_fread(a,b,c,d) vfs_fread(a,b,c,d)
-#define xs_feof(a) vfs_feof(a)
-#define xs_ferror(a) (0)
-#define xs_ftell(a) vfs_ftell(a)
-#define xs_fseek(a,b,c) vfs_fseek(a,b,c)
-#else
-#define xs_file_t FILE
-#define xs_fopen(a,b) fopen(a,b)
-#define xs_fclose(a) fclose(a)
-#define xs_fgetc(a) fgetc(a)
-#define xs_fread(a,b,c,d) fread(a,b,c,d)
-#define xs_feof(a) feof(a)
-#define xs_ferror(a) ferror(a)
-#define xs_ftell(a) ftell(a)
-#define xs_fseek(a,b,c) fseek(a,b,c)
-#endif
-guint16 xs_fread_be16(xs_file_t *);
-guint32 xs_fread_be32(xs_file_t *);
-gint xs_fload_buffer(const gchar *, guint8 **, size_t *);
+uint16_t xs_fread_be16(VFSFile *);
+uint32_t xs_fread_be32(VFSFile *);
 
 
 /* Misc functions
 */
-gchar *xs_strncpy(gchar *, const gchar *, size_t);
-gint xs_pstrcpy(gchar **, const gchar *);
-gint xs_pstrcat(gchar **, const gchar *);
-void xs_pnstrcat(gchar *, size_t, const gchar *);
-gchar *xs_strrchr(gchar *, const gchar);
-void xs_findnext(const gchar *, size_t *);
-void xs_findeol(const gchar *, size_t *);
-void xs_findnum(const gchar *, size_t *);
+int xs_pstrcpy(char **, const char *);
+int xs_pstrcat(char **, const char *);
+void xs_findnext(const char *, size_t *);
+void xs_findeol(const char *, size_t *);
+void xs_findnum(const char *, size_t *);
 
 #ifdef __cplusplus
 }

audacious-plugins-3.3.4.tar.bz2/src/skins/draw-compat.h -> audacious-plugins-3.4.2.tar.bz2/src/skins/draw-compat.h Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/plugin.c Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/skins_cfg.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/skins_cfg.c Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/skins_cfg.h -> audacious-plugins-3.4.2.tar.bz2/src/skins/skins_cfg.h Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/surface.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/surface.c Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_equalizer.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_equalizer.c Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_main.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_main.c Changed

@@ -40,7 +40,6 @@
 
 #include "actions-mainwin.h"
 #include "actions-playlist.h"
-#include "config.h"
 #include "dnd.h"
 #include "plugin.h"
 #include "skins_cfg.h"
@@ -107,9 +106,6 @@
 static gboolean mainwin_info_text_locked = FALSE;
 static guint mainwin_volume_release_timeout = 0;
 
-static int ab_position_a = -1;
-static int ab_position_b = -1;
-
 static void change_timer_mode(void);
 static void mainwin_position_motion_cb (void);
 static void mainwin_position_release_cb (void);
@@ -264,6 +260,17 @@
 }
 }
 
+static void mainwin_set_info_text (const gchar * text)
+{
+ if (mainwin_info_text_locked)
+ {
+ g_free (mainwin_tb_old_text);
+ mainwin_tb_old_text = g_strdup (text);
+ }
+ else
+ textbox_set_text (mainwin_info, text);
+}
+
 static gboolean status_message_enabled;
 
 void mainwin_enable_status_message (gboolean enable)
@@ -308,105 +315,72 @@
 gtk_window_set_title(GTK_WINDOW(mainwin), mainwin_title_text);
 g_free(mainwin_title_text);
 
- mainwin_release_info_text ();
- textbox_set_text (mainwin_info, title != NULL ? title : "");
+ mainwin_set_info_text (title ? title : "");
 }
 
-static void show_hide_widget (GtkWidget * widget, char show)
+static void setup_widget (GtkWidget * widget, gint x, gint y, gboolean show)
 {
- if (show)
- gtk_widget_show (widget);
- else
- gtk_widget_hide (widget);
-}
+ GtkRequisition size;
+ gtk_widget_get_preferred_size (widget, & size, NULL);
 
-static void
-mainwin_refresh_visible(void)
-{
- show_hide_widget (mainwin_info,
- active_skin->properties.mainwin_text_visible);
- show_hide_widget (mainwin_vis,
- active_skin->properties.mainwin_vis_visible);
- show_hide_widget (mainwin_menurow,
- active_skin->properties.mainwin_menurow_visible);
- show_hide_widget (mainwin_rate_text,
- active_skin->properties.mainwin_streaminfo_visible);
- show_hide_widget (mainwin_freq_text,
- active_skin->properties.mainwin_streaminfo_visible);
- show_hide_widget (mainwin_monostereo,
- active_skin->properties.mainwin_streaminfo_visible);
- show_hide_widget (mainwin_othertext,
- active_skin->properties.mainwin_othertext_visible);
-}
+ /* leave no-show-all widgets alone (they are shown/hidden elsewhere) */
+ if (! gtk_widget_get_no_show_all (widget))
+ {
+ /* hide widgets that are outside the window boundary */
+ if (x < 0 || x + size.width > active_skin->properties.mainwin_width ||
+ y < 0 || y + size.height > active_skin->properties.mainwin_height)
+ show = FALSE;
 
-void
-mainwin_refresh_hints(void)
-{
- SkinProperties * p = & active_skin->properties;
-
- if (p->mainwin_vis_x && p->mainwin_vis_y)
- window_move_widget (mainwin, FALSE, mainwin_vis, p->mainwin_vis_x, p->mainwin_vis_y);
- if (p->mainwin_text_x && p->mainwin_text_y)
- window_move_widget (mainwin, FALSE, mainwin_info, p->mainwin_text_x, p->mainwin_text_y);
- if (p->mainwin_text_width)
- textbox_set_width (mainwin_info, p->mainwin_text_width);
- if (p->mainwin_infobar_x && p->mainwin_infobar_y)
- window_move_widget (mainwin, FALSE, mainwin_othertext, p->mainwin_infobar_x, p->mainwin_infobar_y);
- if (p->mainwin_number_0_x && p->mainwin_number_0_y)
- window_move_widget (mainwin, FALSE, mainwin_minus_num, p->mainwin_number_0_x, p->mainwin_number_0_y);
- if (p->mainwin_number_1_x && p->mainwin_number_1_y)
- window_move_widget (mainwin, FALSE, mainwin_10min_num, p->mainwin_number_1_x, p->mainwin_number_1_y);
- if (p->mainwin_number_2_x && p->mainwin_number_2_y)
- window_move_widget (mainwin, FALSE, mainwin_min_num, p->mainwin_number_2_x, p->mainwin_number_2_y);
- if (p->mainwin_number_3_x && p->mainwin_number_3_y)
- window_move_widget (mainwin, FALSE, mainwin_10sec_num, p->mainwin_number_3_x, p->mainwin_number_3_y);
- if (p->mainwin_number_4_x && p->mainwin_number_4_y)
- window_move_widget (mainwin, FALSE, mainwin_sec_num, p->mainwin_number_4_x, p->mainwin_number_4_y);
- if (p->mainwin_playstatus_x && p->mainwin_playstatus_y)
- window_move_widget (mainwin, FALSE, mainwin_playstatus, p->mainwin_playstatus_x, p->mainwin_playstatus_y);
- if (p->mainwin_volume_x && p->mainwin_volume_y)
- window_move_widget (mainwin, FALSE, mainwin_volume, p->mainwin_volume_x, p->mainwin_volume_y);
- if (p->mainwin_balance_x && p->mainwin_balance_y)
- window_move_widget (mainwin, FALSE, mainwin_balance, p->mainwin_balance_x, p->mainwin_balance_y);
- if (p->mainwin_position_x && p->mainwin_position_y)
- window_move_widget (mainwin, FALSE, mainwin_position, p->mainwin_position_x, p->mainwin_position_y);
- if (p->mainwin_previous_x && p->mainwin_previous_y)
- window_move_widget (mainwin, FALSE, mainwin_rew, p->mainwin_previous_x, p->mainwin_previous_y);
- if (p->mainwin_play_x && p->mainwin_play_y)
- window_move_widget (mainwin, FALSE, mainwin_play, p->mainwin_play_x, p->mainwin_play_y);
- if (p->mainwin_pause_x && p->mainwin_pause_y)
- window_move_widget (mainwin, FALSE, mainwin_pause, p->mainwin_pause_x, p->mainwin_pause_y);
- if (p->mainwin_stop_x && p->mainwin_stop_y)
- window_move_widget (mainwin, FALSE, mainwin_stop, p->mainwin_stop_x, p->mainwin_stop_y);
- if (p->mainwin_next_x && p->mainwin_next_y)
- window_move_widget (mainwin, FALSE, mainwin_fwd, p->mainwin_next_x, p->mainwin_next_y);
- if (p->mainwin_eject_x && p->mainwin_eject_y)
- window_move_widget (mainwin, FALSE, mainwin_eject, p->mainwin_eject_x, p->mainwin_eject_y);
- if (p->mainwin_eqbutton_x && p->mainwin_eqbutton_y)
- window_move_widget (mainwin, FALSE, mainwin_eq, p->mainwin_eqbutton_x, p->mainwin_eqbutton_y);
- if (p->mainwin_plbutton_x && p->mainwin_plbutton_y)
- window_move_widget (mainwin, FALSE, mainwin_pl, p->mainwin_plbutton_x, p->mainwin_plbutton_y);
- if (p->mainwin_shuffle_x && p->mainwin_shuffle_y)
- window_move_widget (mainwin, FALSE, mainwin_shuffle, p->mainwin_shuffle_x, p->mainwin_shuffle_y);
- if (p->mainwin_repeat_x && p->mainwin_repeat_y)
- window_move_widget (mainwin, FALSE, mainwin_repeat, p->mainwin_repeat_x, p->mainwin_repeat_y);
- if (p->mainwin_about_x && p->mainwin_about_y)
- window_move_widget (mainwin, FALSE, mainwin_about, p->mainwin_about_x, p->mainwin_about_y);
- if (p->mainwin_minimize_x && p->mainwin_minimize_y)
- window_move_widget (mainwin, FALSE, mainwin_minimize, p->mainwin_minimize_x, p->mainwin_minimize_y);
- if (p->mainwin_shade_x && p->mainwin_shade_y)
- window_move_widget (mainwin, FALSE, mainwin_shade, p->mainwin_shade_x, p->mainwin_shade_y);
- if (p->mainwin_close_x && p->mainwin_close_y)
- window_move_widget (mainwin, FALSE, mainwin_close, p->mainwin_close_x, p->mainwin_close_y);
-
- mainwin_refresh_visible();
+ gtk_widget_set_visible (widget, show);
+ }
+
+ window_move_widget (mainwin, FALSE, widget, x, y);
+}
+
+void mainwin_refresh_hints (void)
+{
+ const SkinProperties * p = & active_skin->properties;
+
+ gtk_widget_set_visible (mainwin_menurow, p->mainwin_menurow_visible);
+ gtk_widget_set_visible (mainwin_rate_text, p->mainwin_streaminfo_visible);
+ gtk_widget_set_visible (mainwin_freq_text, p->mainwin_streaminfo_visible);
+ gtk_widget_set_visible (mainwin_monostereo, p->mainwin_streaminfo_visible);
+
+ textbox_set_width (mainwin_info, p->mainwin_text_width);
+
+ setup_widget (mainwin_vis, p->mainwin_vis_x, p->mainwin_vis_y, p->mainwin_vis_visible);
+ setup_widget (mainwin_info, p->mainwin_text_x, p->mainwin_text_y, p->mainwin_text_visible);
+ setup_widget (mainwin_othertext, p->mainwin_infobar_x, p->mainwin_infobar_y, p->mainwin_othertext_visible);
+
+ setup_widget (mainwin_minus_num, p->mainwin_number_0_x, p->mainwin_number_0_y, TRUE);
+ setup_widget (mainwin_10min_num, p->mainwin_number_1_x, p->mainwin_number_1_y, TRUE);
+ setup_widget (mainwin_min_num, p->mainwin_number_2_x, p->mainwin_number_2_y, TRUE);
+ setup_widget (mainwin_10sec_num, p->mainwin_number_3_x, p->mainwin_number_3_y, TRUE);
+ setup_widget (mainwin_sec_num, p->mainwin_number_4_x, p->mainwin_number_4_y, TRUE);
+ setup_widget (mainwin_position, p->mainwin_position_x, p->mainwin_position_y, TRUE);
+
+ setup_widget (mainwin_playstatus, p->mainwin_playstatus_x, p->mainwin_playstatus_y, TRUE);
+ setup_widget (mainwin_volume, p->mainwin_volume_x, p->mainwin_volume_y, TRUE);
+ setup_widget (mainwin_balance, p->mainwin_balance_x, p->mainwin_balance_y, TRUE);
+ setup_widget (mainwin_rew, p->mainwin_previous_x, p->mainwin_previous_y, TRUE);
+ setup_widget (mainwin_play, p->mainwin_play_x, p->mainwin_play_y, TRUE);
+ setup_widget (mainwin_pause, p->mainwin_pause_x, p->mainwin_pause_y, TRUE);
+ setup_widget (mainwin_stop, p->mainwin_stop_x, p->mainwin_stop_y, TRUE);
+ setup_widget (mainwin_fwd, p->mainwin_next_x, p->mainwin_next_y, TRUE);
+ setup_widget (mainwin_eject, p->mainwin_eject_x, p->mainwin_eject_y, TRUE);
+ setup_widget (mainwin_eq, p->mainwin_eqbutton_x, p->mainwin_eqbutton_y, TRUE);
+ setup_widget (mainwin_pl, p->mainwin_plbutton_x, p->mainwin_plbutton_y, TRUE);
+ setup_widget (mainwin_shuffle, p->mainwin_shuffle_x, p->mainwin_shuffle_y, TRUE);
+ setup_widget (mainwin_repeat, p->mainwin_repeat_x, p->mainwin_repeat_y, TRUE);
+ setup_widget (mainwin_about, p->mainwin_about_x, p->mainwin_about_y, TRUE);
+ setup_widget (mainwin_minimize, p->mainwin_minimize_x, p->mainwin_minimize_y, TRUE);
+ setup_widget (mainwin_shade, p->mainwin_shade_x, p->mainwin_shade_y, TRUE);
+ setup_widget (mainwin_close, p->mainwin_close_x, p->mainwin_close_y, TRUE);
 
 if (config.player_shaded)
 window_set_size (mainwin, MAINWIN_SHADED_WIDTH, MAINWIN_SHADED_HEIGHT);
- else if (p->mainwin_height && p->mainwin_width)
- window_set_size (mainwin, p->mainwin_width, p->mainwin_height);
 else
- window_set_size (mainwin, MAINWIN_WIDTH, MAINWIN_HEIGHT);
+ window_set_size (mainwin, p->mainwin_width, p->mainwin_height);
 }
 
 void mainwin_set_song_info (gint bitrate, gint samplerate, gint channels)
@@ -740,15 +714,6 @@
 static void mainwin_fwd_release (GtkWidget * button, GdkEventButton * event)
 {seek_release (button, event, FALSE); }
 
-void
-mainwin_play_pushed(void)
-{
- if (ab_position_a != -1)
- aud_drct_seek(ab_position_a / 1000);
-
- aud_drct_play ();
-}
-
 static void mainwin_shuffle_cb (GtkWidget * button, GdkEventButton * event)
 {check_set (toggleaction_group_others, "playback shuffle", button_get_active (button)); }
 static void mainwin_repeat_cb (GtkWidget * button, GdkEventButton * event)
@@ -947,8 +912,6 @@
 
 static void mainwin_real_show (gboolean show)
 {
- start_stop_visual (FALSE);
-
 if (show)
 gtk_window_present ((GtkWindow *) mainwin);
 else
@@ -965,11 +928,11 @@
 gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (a), show);
 else
 {
- config.player_visible = show;
- playlistwin_show (config.playlist_visible);
- equalizerwin_show (config.equalizer_visible);
 mainwin_real_show (show);
- }
+ equalizerwin_show (config.equalizer_visible);
+ playlistwin_show (config.playlist_visible);
+ start_stop_visual (FALSE);
+ }
 }
 
 void mainwin_mr_change (MenuRowItem i)
@@ -1262,7 +1225,7 @@
 
 mainwin_play = button_new (23, 18, 23, 0, 23, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
 window_put_widget (mainwin, FALSE, mainwin_play, 39, 88);
- button_on_release (mainwin_play, (ButtonCB) mainwin_play_pushed);
+ button_on_release (mainwin_play, (ButtonCB) aud_drct_play);
 button_on_rpress (mainwin_play, mainwin_playback_rpress);
 
 mainwin_pause = button_new (23, 18, 46, 0, 46, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
@@ -1386,7 +1349,7 @@
 
 mainwin_splay = button_new_small (10, 7);
 window_put_widget (mainwin, TRUE, mainwin_splay, 177, 4);
- button_on_release (mainwin_splay, (ButtonCB) mainwin_play_pushed);
+ button_on_release (mainwin_splay, (ButtonCB) aud_drct_play);
 
 mainwin_spause = button_new_small (10, 7);
 window_put_widget (mainwin, TRUE, mainwin_spause, 187, 4);
@@ -1435,14 +1398,6 @@
 gtk_widget_set_no_show_all (mainwin_position, TRUE);
 gtk_widget_set_no_show_all (mainwin_sposition, TRUE);
 
- gtk_widget_set_no_show_all (mainwin_info, TRUE);
- gtk_widget_set_no_show_all (mainwin_vis, TRUE);
- gtk_widget_set_no_show_all (mainwin_menurow, TRUE);
- gtk_widget_set_no_show_all (mainwin_rate_text, TRUE);
- gtk_widget_set_no_show_all (mainwin_freq_text, TRUE);
- gtk_widget_set_no_show_all (mainwin_monostereo, TRUE);
- gtk_widget_set_no_show_all (mainwin_othertext, TRUE);
-
 window_set_shaded (mainwin, config.player_shaded);
 window_show_all (mainwin);
 }
@@ -1574,8 +1529,8 @@
 
 static void mainwin_update_time_slider (gint time, gint length)
 {
- show_hide_widget (mainwin_position, length > 0);
- show_hide_widget (mainwin_sposition, length > 0);
+ gtk_widget_set_visible (mainwin_position, length > 0);
+ gtk_widget_set_visible (mainwin_sposition, length > 0);
 
 if (length > 0 && seek_source == 0)
 {
@@ -1610,13 +1565,6 @@
 
 mainwin_update_time_display (time, length);
 mainwin_update_time_slider (time, length);
-
- /* Ugh, this does NOT belong here. -jlindgren */
- if (ab_position_a > -1 && ab_position_b > -1 && time >= ab_position_b)
- {
- aud_drct_seek (ab_position_a);
- return;
- }
 }
 
 /* toggleactionentries actions */
@@ -1794,33 +1742,27 @@
 {
 if (aud_drct_get_length () > 0)
 {
- if (ab_position_a == -1)
- {
- ab_position_a = aud_drct_get_time();
- ab_position_b = -1;
- mainwin_lock_info_text("LOOP-POINT A POSITION SET.");
- }
- else if (ab_position_b == -1)
+ int a, b;
+ aud_drct_get_ab_repeat (& a, & b);
+
+ if (a < 0 || b >= 0)
 {
- int time = aud_drct_get_time();
- if (time > ab_position_a)
- ab_position_b = time;
- mainwin_release_info_text();
+ a = aud_drct_get_time ();
+ b = -1;
+ mainwin_show_status_message (_("Repeat point A set."));
 }
 else
 {
- ab_position_a = aud_drct_get_time();
- ab_position_b = -1;
- mainwin_lock_info_text("LOOP-POINT A POSITION RESET.");
+ b = aud_drct_get_time ();
+ mainwin_show_status_message (_("Repeat point B set."));
 }
+
+ aud_drct_set_ab_repeat (a, b);
 }
 }
 
 void action_ab_clear (void)
 {
- if (aud_drct_get_length () > 0)
- {
- ab_position_a = ab_position_b = -1;
- mainwin_release_info_text();
- }
+ mainwin_show_status_message (_("Repeat points cleared."));
+ aud_drct_set_ab_repeat (-1, -1);
 }

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_main.h -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_main.h Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_main_evlisteners.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_main_evlisteners.c Changed

@@ -203,8 +203,8 @@
 if (bands != last_bands)
 {
 xscale = g_realloc (xscale, sizeof (gfloat) * (bands + 1));
- for (gint i = 0; i <= bands; i ++)
- xscale[i] = powf (257, (gfloat) i / bands) - 1;
+ for (int i = 0; i <= bands; i ++)
+ xscale[i] = powf (256, (float) i / bands) - 0.5f;
 
 last_bands = bands;
 }
@@ -231,13 +231,13 @@
 
 /* fudge factor to make the graph have the same overall height as a
 12-band one no matter how many bands there are */
- sum = sum * bands / 12;
+ sum *= (gfloat) bands / 12;
 
 /* convert to dB */
 gfloat val = 20 * log10f (sum);
 
 /* scale (-db_range, 0.0) to (0.0, int_range) */
- val = (1.0 + val / db_range) * int_range;
+ val = (1 + val / db_range) * int_range;
 
 graph[i] = CLAMP (val, 0, int_range);
 }
@@ -319,7 +319,7 @@
 {
 static char started = 0;
 
- if (config.player_visible && config.vis_type != VIS_OFF && ! exiting)
+ if (config.vis_type != VIS_OFF && ! exiting && gtk_widget_get_visible (mainwin))
 {
 if (! started)
 {

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_manager.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_manager.c Changed

@@ -26,7 +26,6 @@
 #include "actions-equalizer.h"
 #include "actions-mainwin.h"
 #include "actions-playlist.h"
-#include "config.h"
 #include "skins_cfg.h"
 #include "ui_main.h"
 #include "ui_manager.h"
@@ -222,22 +221,22 @@
 { "playlist delete", GTK_STOCK_DELETE , N_("Delete Playlist"), "<Shift>D",
 N_("Delete Playlist"), G_CALLBACK(action_playlist_delete) },
 
- {"playlist load", GTK_STOCK_OPEN, N_("Import Playlist"), "O",
- N_("Loads a playlist file into the selected playlist."),
- (GCallback) audgui_import_playlist },
+ { "playlist load", GTK_STOCK_OPEN, N_("Import Playlist"), "O",
+ N_("Loads a playlist file into the selected playlist."),
+ (GCallback) audgui_import_playlist },
 
- {"playlist save", GTK_STOCK_SAVE, N_("Export Playlist"), "<Shift>S",
- N_("Saves the selected playlist."), (GCallback) audgui_export_playlist },
+ { "playlist save", GTK_STOCK_SAVE, N_("Export Playlist"), "<Shift>S",
+ N_("Saves the selected playlist."), (GCallback) audgui_export_playlist },
 
 { "playlist refresh", GTK_STOCK_REFRESH, N_("Refresh List"), "F5",
- N_("Refreshes metadata associated with a playlist entry."),
- G_CALLBACK(action_playlist_refresh_list) },
+ N_("Refreshes metadata associated with a playlist entry."),
+ G_CALLBACK(action_playlist_refresh_list) },
 
- {"playlist manager", AUD_STOCK_PLAYLIST, N_("Playlist Manager"), "P", NULL,
- (GCallback) audgui_playlist_manager },
+ { "playlist manager", AUD_STOCK_PLAYLIST, N_("Playlist Manager"), "P", NULL,
+ (GCallback) audgui_playlist_manager },
 
- {"queue manager", AUD_STOCK_QUEUETOGGLE, N_("Queue Manager"), "<Ctrl>U", NULL,
- (GCallback) audgui_queue_manager_show}
+ { "queue manager", AUD_STOCK_QUEUETOGGLE, N_("Queue Manager"), "<Ctrl>U", NULL,
+ (GCallback) audgui_queue_manager_show }
 };
 
 static GtkActionEntry action_entries_view[] = {
@@ -312,7 +311,7 @@
 };
 
 static GtkActionEntry action_entries_playlist_sort[] = {
- { "playlist randomize list", AUD_STOCK_RANDOMIZEPL , N_("Randomize List"), "<Ctrl><Shift>R",
+ { "playlist randomize list", NULL, N_("Randomize List"), "<Ctrl><Shift>R",
 N_("Randomizes the playlist."),
 G_CALLBACK(action_playlist_randomize_list) },
 
@@ -499,183 +498,183 @@
 static GtkActionGroup *
 ui_manager_new_action_group( const gchar * group_name )
 {
- GtkActionGroup *group = gtk_action_group_new( group_name );
- gtk_action_group_set_translation_domain (group, PACKAGE);
- return group;
+ GtkActionGroup *group = gtk_action_group_new( group_name );
+ gtk_action_group_set_translation_domain (group, PACKAGE);
+ return group;
 }
 
 void
 ui_manager_init ( void )
 {
- /* toggle actions */
- toggleaction_group_others = ui_manager_new_action_group("toggleaction_others");
- gtk_action_group_add_toggle_actions(
- toggleaction_group_others , toggleaction_entries_others ,
- G_N_ELEMENTS(toggleaction_entries_others) , NULL );
-
- /* radio actions */
- radioaction_group_anamode = ui_manager_new_action_group("radioaction_anamode");
- gtk_action_group_add_radio_actions(
- radioaction_group_anamode , radioaction_entries_anamode ,
- G_N_ELEMENTS(radioaction_entries_anamode) , 0 , G_CALLBACK(action_anamode) , NULL );
-
- radioaction_group_anatype = ui_manager_new_action_group("radioaction_anatype");
- gtk_action_group_add_radio_actions(
- radioaction_group_anatype , radioaction_entries_anatype ,
- G_N_ELEMENTS(radioaction_entries_anatype) , 0 , G_CALLBACK(action_anatype) , NULL );
-
- radioaction_group_scomode = ui_manager_new_action_group("radioaction_scomode");
- gtk_action_group_add_radio_actions(
- radioaction_group_scomode , radioaction_entries_scomode ,
- G_N_ELEMENTS(radioaction_entries_scomode) , 0 , G_CALLBACK(action_scomode) , NULL );
-
- radioaction_group_vprmode = ui_manager_new_action_group("radioaction_vprmode");
- gtk_action_group_add_radio_actions(
- radioaction_group_vprmode , radioaction_entries_vprmode ,
- G_N_ELEMENTS(radioaction_entries_vprmode) , 0 , G_CALLBACK(action_vprmode) , NULL );
-
- radioaction_group_wshmode = ui_manager_new_action_group("radioaction_wshmode");
- gtk_action_group_add_radio_actions(
- radioaction_group_wshmode , radioaction_entries_wshmode ,
- G_N_ELEMENTS(radioaction_entries_wshmode) , 0 , G_CALLBACK(action_wshmode) , NULL );
-
- radioaction_group_anafoff = ui_manager_new_action_group("radioaction_anafoff");
- gtk_action_group_add_radio_actions(
- radioaction_group_anafoff , radioaction_entries_anafoff ,
- G_N_ELEMENTS(radioaction_entries_anafoff) , 0 , G_CALLBACK(action_anafoff) , NULL );
-
- radioaction_group_peafoff = ui_manager_new_action_group("radioaction_peafoff");
- gtk_action_group_add_radio_actions(
- radioaction_group_peafoff , radioaction_entries_peafoff ,
- G_N_ELEMENTS(radioaction_entries_peafoff) , 0 , G_CALLBACK(action_peafoff) , NULL );
-
- radioaction_group_vismode = ui_manager_new_action_group("radioaction_vismode");
- gtk_action_group_add_radio_actions(
- radioaction_group_vismode , radioaction_entries_vismode ,
- G_N_ELEMENTS(radioaction_entries_vismode) , 0 , G_CALLBACK(action_vismode) , NULL );
-
- radioaction_group_viewtime = ui_manager_new_action_group("radioaction_viewtime");
- gtk_action_group_add_radio_actions(
- radioaction_group_viewtime , radioaction_entries_viewtime ,
- G_N_ELEMENTS(radioaction_entries_viewtime) , 0 , G_CALLBACK(action_viewtime) , NULL );
-
- /* normal actions */
- action_group_playback = ui_manager_new_action_group("action_playback");
+ /* toggle actions */
+ toggleaction_group_others = ui_manager_new_action_group("toggleaction_others");
+ gtk_action_group_add_toggle_actions(
+ toggleaction_group_others , toggleaction_entries_others ,
+ G_N_ELEMENTS(toggleaction_entries_others) , NULL );
+
+ /* radio actions */
+ radioaction_group_anamode = ui_manager_new_action_group("radioaction_anamode");
+ gtk_action_group_add_radio_actions(
+ radioaction_group_anamode , radioaction_entries_anamode ,
+ G_N_ELEMENTS(radioaction_entries_anamode) , 0 , G_CALLBACK(action_anamode) , NULL );
+
+ radioaction_group_anatype = ui_manager_new_action_group("radioaction_anatype");
+ gtk_action_group_add_radio_actions(
+ radioaction_group_anatype , radioaction_entries_anatype ,
+ G_N_ELEMENTS(radioaction_entries_anatype) , 0 , G_CALLBACK(action_anatype) , NULL );
+
+ radioaction_group_scomode = ui_manager_new_action_group("radioaction_scomode");
+ gtk_action_group_add_radio_actions(
+ radioaction_group_scomode , radioaction_entries_scomode ,
+ G_N_ELEMENTS(radioaction_entries_scomode) , 0 , G_CALLBACK(action_scomode) , NULL );
+
+ radioaction_group_vprmode = ui_manager_new_action_group("radioaction_vprmode");
+ gtk_action_group_add_radio_actions(
+ radioaction_group_vprmode , radioaction_entries_vprmode ,
+ G_N_ELEMENTS(radioaction_entries_vprmode) , 0 , G_CALLBACK(action_vprmode) , NULL );
+
+ radioaction_group_wshmode = ui_manager_new_action_group("radioaction_wshmode");
+ gtk_action_group_add_radio_actions(
+ radioaction_group_wshmode , radioaction_entries_wshmode ,
+ G_N_ELEMENTS(radioaction_entries_wshmode) , 0 , G_CALLBACK(action_wshmode) , NULL );
+
+ radioaction_group_anafoff = ui_manager_new_action_group("radioaction_anafoff");
+ gtk_action_group_add_radio_actions(
+ radioaction_group_anafoff , radioaction_entries_anafoff ,
+ G_N_ELEMENTS(radioaction_entries_anafoff) , 0 , G_CALLBACK(action_anafoff) , NULL );
+
+ radioaction_group_peafoff = ui_manager_new_action_group("radioaction_peafoff");
+ gtk_action_group_add_radio_actions(
+ radioaction_group_peafoff , radioaction_entries_peafoff ,
+ G_N_ELEMENTS(radioaction_entries_peafoff) , 0 , G_CALLBACK(action_peafoff) , NULL );
+
+ radioaction_group_vismode = ui_manager_new_action_group("radioaction_vismode");
+ gtk_action_group_add_radio_actions(
+ radioaction_group_vismode , radioaction_entries_vismode ,
+ G_N_ELEMENTS(radioaction_entries_vismode) , 0 , G_CALLBACK(action_vismode) , NULL );
+
+ radioaction_group_viewtime = ui_manager_new_action_group("radioaction_viewtime");
+ gtk_action_group_add_radio_actions(
+ radioaction_group_viewtime , radioaction_entries_viewtime ,
+ G_N_ELEMENTS(radioaction_entries_viewtime) , 0 , G_CALLBACK(action_viewtime) , NULL );
+
+ /* normal actions */
+ action_group_playback = ui_manager_new_action_group("action_playback");
 gtk_action_group_add_actions(
- action_group_playback , action_entries_playback ,
- G_N_ELEMENTS(action_entries_playback) , NULL );
+ action_group_playback , action_entries_playback ,
+ G_N_ELEMENTS(action_entries_playback) , NULL );
 
- action_group_playlist = ui_manager_new_action_group("action_playlist");
+ action_group_playlist = ui_manager_new_action_group("action_playlist");
 gtk_action_group_add_actions(
- action_group_playlist , action_entries_playlist ,
- G_N_ELEMENTS(action_entries_playlist) , NULL );
+ action_group_playlist , action_entries_playlist ,
+ G_N_ELEMENTS(action_entries_playlist) , NULL );
 
- action_group_visualization = ui_manager_new_action_group("action_visualization");
+ action_group_visualization = ui_manager_new_action_group("action_visualization");
 gtk_action_group_add_actions(
- action_group_visualization , action_entries_visualization ,
- G_N_ELEMENTS(action_entries_visualization) , NULL );
+ action_group_visualization , action_entries_visualization ,
+ G_N_ELEMENTS(action_entries_visualization) , NULL );
 
- action_group_view = ui_manager_new_action_group("action_view");
+ action_group_view = ui_manager_new_action_group("action_view");
 gtk_action_group_add_actions(
- action_group_view , action_entries_view ,
- G_N_ELEMENTS(action_entries_view) , NULL );
+ action_group_view , action_entries_view ,
+ G_N_ELEMENTS(action_entries_view) , NULL );
 
- action_group_others = ui_manager_new_action_group("action_others");
+ action_group_others = ui_manager_new_action_group("action_others");
 gtk_action_group_add_actions(
- action_group_others , action_entries_others ,
- G_N_ELEMENTS(action_entries_others) , NULL );
-
- action_group_playlist_add = ui_manager_new_action_group("action_playlist_add");
- gtk_action_group_add_actions(
- action_group_playlist_add, action_entries_playlist_add,
- G_N_ELEMENTS(action_entries_playlist_add), NULL );
-
- action_group_playlist_select = ui_manager_new_action_group("action_playlist_select");
- gtk_action_group_add_actions(
- action_group_playlist_select, action_entries_playlist_select,
- G_N_ELEMENTS(action_entries_playlist_select), NULL );
-
- action_group_playlist_delete = ui_manager_new_action_group("action_playlist_delete");
- gtk_action_group_add_actions(
- action_group_playlist_delete, action_entries_playlist_delete,
- G_N_ELEMENTS(action_entries_playlist_delete), NULL );
-
- action_group_playlist_sort = ui_manager_new_action_group("action_playlist_sort");
- gtk_action_group_add_actions(
- action_group_playlist_sort, action_entries_playlist_sort,
- G_N_ELEMENTS(action_entries_playlist_sort), NULL );
-
- action_group_equalizer = ui_manager_new_action_group("action_equalizer");
- gtk_action_group_add_actions(
- action_group_equalizer, action_entries_equalizer,
- G_N_ELEMENTS(action_entries_equalizer), NULL);
-
- /* ui */
- ui_manager = gtk_ui_manager_new();
- gtk_ui_manager_insert_action_group( ui_manager , toggleaction_group_others , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_anamode , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_anatype , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_scomode , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_vprmode , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_wshmode , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_anafoff , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_peafoff , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_vismode , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_viewtime , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , action_group_playback , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , action_group_visualization , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , action_group_view , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , action_group_others , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist_add , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist_select , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist_delete , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist_sort , 0 );
- gtk_ui_manager_insert_action_group( ui_manager , action_group_equalizer , 0 );
-
- return;
+ action_group_others , action_entries_others ,
+ G_N_ELEMENTS(action_entries_others) , NULL );
+
+ action_group_playlist_add = ui_manager_new_action_group("action_playlist_add");
+ gtk_action_group_add_actions(
+ action_group_playlist_add, action_entries_playlist_add,
+ G_N_ELEMENTS(action_entries_playlist_add), NULL );
+
+ action_group_playlist_select = ui_manager_new_action_group("action_playlist_select");
+ gtk_action_group_add_actions(
+ action_group_playlist_select, action_entries_playlist_select,
+ G_N_ELEMENTS(action_entries_playlist_select), NULL );
+
+ action_group_playlist_delete = ui_manager_new_action_group("action_playlist_delete");
+ gtk_action_group_add_actions(
+ action_group_playlist_delete, action_entries_playlist_delete,
+ G_N_ELEMENTS(action_entries_playlist_delete), NULL );
+
+ action_group_playlist_sort = ui_manager_new_action_group("action_playlist_sort");
+ gtk_action_group_add_actions(
+ action_group_playlist_sort, action_entries_playlist_sort,
+ G_N_ELEMENTS(action_entries_playlist_sort), NULL );
+
+ action_group_equalizer = ui_manager_new_action_group("action_equalizer");
+ gtk_action_group_add_actions(
+ action_group_equalizer, action_entries_equalizer,
+ G_N_ELEMENTS(action_entries_equalizer), NULL);
+
+ /* ui */
+ ui_manager = gtk_ui_manager_new();
+ gtk_ui_manager_insert_action_group( ui_manager , toggleaction_group_others , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_anamode , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_anatype , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_scomode , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_vprmode , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_wshmode , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_anafoff , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_peafoff , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_vismode , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , radioaction_group_viewtime , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , action_group_playback , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , action_group_visualization , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , action_group_view , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , action_group_others , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist_add , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist_select , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist_delete , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , action_group_playlist_sort , 0 );
+ gtk_ui_manager_insert_action_group( ui_manager , action_group_equalizer , 0 );
+
+ return;
 }
 
 void
 ui_manager_create_menus ( void )
 {
- const gchar * data = aud_get_path (AUD_PATH_DATA_DIR);
- gchar * path;
- GError *gerr = NULL;
-
- /* attach xml menu definitions */
- path = g_strdup_printf ("%s/ui/mainwin.ui", data);
- gtk_ui_manager_add_ui_from_file (ui_manager, path, & gerr);
- g_free (path);
-
- if ( gerr != NULL )
- {
- g_critical( "Error creating UI<ui/mainwin.ui>: %s" , gerr->message );
- g_error_free( gerr );
- return;
- }
+ const gchar * data = aud_get_path (AUD_PATH_DATA_DIR);
+ gchar * path;
+ GError *gerr = NULL;
 
- path = g_strdup_printf ("%s/ui/playlist.ui", data);
- gtk_ui_manager_add_ui_from_file (ui_manager, path, & gerr);
- g_free (path);
+ /* attach xml menu definitions */
+ path = g_strdup_printf ("%s/ui/mainwin.ui", data);
+ gtk_ui_manager_add_ui_from_file (ui_manager, path, & gerr);
+ g_free (path);
 
- if ( gerr != NULL )
- {
- g_critical( "Error creating UI<ui/playlist.ui>: %s" , gerr->message );
- g_error_free( gerr );
- return;
- }
+ if ( gerr != NULL )
+ {
+ g_critical( "Error creating UI<ui/mainwin.ui>: %s" , gerr->message );
+ g_error_free( gerr );
+ return;
+ }
 
- path = g_strdup_printf ("%s/ui/equalizer.ui", data);
- gtk_ui_manager_add_ui_from_file (ui_manager, path, & gerr);
- g_free (path);
+ path = g_strdup_printf ("%s/ui/playlist.ui", data);
+ gtk_ui_manager_add_ui_from_file (ui_manager, path, & gerr);
+ g_free (path);
 
- if ( gerr != NULL )
- {
- g_critical( "Error creating UI<ui/equalizer.ui>: %s" , gerr->message );
- g_error_free( gerr );
- return;
- }
+ if ( gerr != NULL )
+ {
+ g_critical( "Error creating UI<ui/playlist.ui>: %s" , gerr->message );
+ g_error_free( gerr );
+ return;
+ }
+
+ path = g_strdup_printf ("%s/ui/equalizer.ui", data);
+ gtk_ui_manager_add_ui_from_file (ui_manager, path, & gerr);
+ g_free (path);
+
+ if ( gerr != NULL )
+ {
+ g_critical( "Error creating UI<ui/equalizer.ui>: %s" , gerr->message );
+ g_error_free( gerr );
+ return;
+ }
 }
 
 static GtkWidget * menus[UI_MENUS] = {NULL, NULL, NULL, NULL, NULL, NULL,
@@ -753,18 +752,18 @@
 GtkAccelGroup *
 ui_manager_get_accel_group ( void )
 {
- return gtk_ui_manager_get_accel_group( ui_manager );
+ return gtk_ui_manager_get_accel_group( ui_manager );
 }
 
 static GtkWidget * ui_manager_get_popup_menu (GtkUIManager * self, const gchar *
 path)
 {
- GtkWidget *menu_item = gtk_ui_manager_get_widget( self , path );
+ GtkWidget *menu_item = gtk_ui_manager_get_widget( self , path );
 
- if (GTK_IS_MENU_ITEM(menu_item))
- return gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu_item));
- else
- return NULL;
+ if (GTK_IS_MENU_ITEM(menu_item))
+ return gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu_item));
+ else
+ return NULL;
 }
 
 static void get_monitor_geometry (GdkScreen * screen, gint x, gint y,

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_playlist.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_playlist.c Changed

@@ -38,7 +38,6 @@
 #include <libaudgui/libaudgui.h>
 
 #include "actions-mainwin.h"
-#include "config.h"
 #include "dnd.h"
 #include "drag-handle.h"
 #include "plugin.h"
@@ -58,9 +57,9 @@
 #define PLAYLISTWIN_HEIGHT_SNAP 29
 #define PLAYLISTWIN_SHADED_HEIGHT MAINWIN_SHADED_HEIGHT
 
-gint active_playlist;
-gchar * active_title;
-glong active_length;
+gint active_playlist = -1, active_length = 0;
+gchar * active_title = NULL;
+
 GtkWidget * playlistwin, * playlistwin_list, * playlistwin_sinfo;
 
 static GtkWidget *playlistwin_shade, *playlistwin_close;
@@ -174,9 +173,9 @@
 
 static void playlistwin_scroll (gboolean up)
 {
- gint rows, first, focused;
+ gint rows, first;
 
- ui_skinned_playlist_row_info (playlistwin_list, & rows, & first, & focused);
+ ui_skinned_playlist_row_info (playlistwin_list, & rows, & first);
 ui_skinned_playlist_scroll_to (playlistwin_list, first + (up ? -1 : 1) *
 rows / 3);
 }
@@ -467,10 +466,7 @@
 static void
 playlistwin_fileinfo(void)
 {
- gint rows, first, focused;
-
- ui_skinned_playlist_row_info (playlistwin_list, & rows, & first, & focused);
- audgui_infowin_show (active_playlist, focused);
+ audgui_infowin_show (active_playlist, aud_playlist_get_focus (active_playlist));
 }
 
 static void
@@ -666,7 +662,7 @@
 
 playlistwin_splay = button_new_small (10, 7);
 window_put_widget (playlistwin, FALSE, playlistwin_splay, w - 138, h - 16);
- button_on_release (playlistwin_splay, (ButtonCB) mainwin_play_pushed);
+ button_on_release (playlistwin_splay, (ButtonCB) aud_drct_play);
 
 playlistwin_spause = button_new_small (10, 7);
 window_put_widget (playlistwin, FALSE, playlistwin_spause, w - 128, h - 16);
@@ -877,7 +873,7 @@
 {
 config.playlist_visible = show;
 button_set_active (mainwin_pl, show);
- playlistwin_real_show (config.player_visible && show);
+ playlistwin_real_show (show && gtk_widget_get_visible (mainwin));
 }
 }
 
@@ -888,11 +884,11 @@
 
 void action_queue_toggle (void)
 {
- gint rows, first, focused, at;
+ gint focus = aud_playlist_get_focus (active_playlist);
+ if (focus == -1)
+ return;
 
- ui_skinned_playlist_row_info (playlistwin_list, & rows, & first, & focused);
- at = (focused == -1) ? -1 : aud_playlist_queue_find_entry (active_playlist,
- focused);
+ gint at = aud_playlist_queue_find_entry (active_playlist, focus);
 
 if (at == -1)
 aud_playlist_queue_insert_selected (active_playlist, -1);
@@ -1049,13 +1045,12 @@
 {
 GtkClipboard * clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
 gchar * list = gtk_clipboard_wait_for_text (clip);
- gint rows, first, focused;
 
 if (list == NULL)
 return;
 
- ui_skinned_playlist_row_info (playlistwin_list, & rows, & first, & focused);
- audgui_urilist_insert (active_playlist, focused, list);
+ audgui_urilist_insert (active_playlist,
+ aud_playlist_get_focus (active_playlist), list);
 g_free (list);
 }

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_playlist.h -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_playlist.h Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_skin.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_skin.c Changed

@@ -103,30 +103,30 @@
 static guint skin_pixmap_id_map_size = G_N_ELEMENTS(skin_pixmap_id_map);
 
 static const guint32 default_vis_colors[24] = {
- COLOR (9, 34, 53),
- COLOR (10, 18, 26),
- COLOR (0, 54, 108),
- COLOR (0, 58, 116),
- COLOR (0, 62, 124),
- COLOR (0, 66, 132),
- COLOR (0, 70, 140),
- COLOR (0, 74, 148),
- COLOR (0, 78, 156),
- COLOR (0, 82, 164),
- COLOR (0, 86, 172),
- COLOR (0, 92, 184),
- COLOR (0, 98, 196),
- COLOR (0, 104, 208),
- COLOR (0, 110, 220),
- COLOR (0, 116, 232),
- COLOR (0, 122, 244),
- COLOR (0, 128, 255),
- COLOR (0, 128, 255),
- COLOR (0, 104, 208),
- COLOR (0, 80, 160),
- COLOR (0, 56, 112),
- COLOR (0, 32, 64),
- COLOR (200, 200, 200)
+    COLOR (9, 34, 53),
+    COLOR (10, 18, 26),
+    COLOR (0, 54, 108),
+    COLOR (0, 58, 116),
+    COLOR (0, 62, 124),
+    COLOR (0, 66, 132),
+    COLOR (0, 70, 140),
+    COLOR (0, 74, 148),
+    COLOR (0, 78, 156),
+    COLOR (0, 82, 164),
+    COLOR (0, 86, 172),
+    COLOR (0, 92, 184),
+    COLOR (0, 98, 196),
+    COLOR (0, 104, 208),
+    COLOR (0, 110, 220),
+    COLOR (0, 116, 232),
+    COLOR (0, 122, 244),
+    COLOR (0, 128, 255),
+    COLOR (0, 128, 255),
+    COLOR (0, 104, 208),
+    COLOR (0, 80, 160),
+    COLOR (0, 56, 112),
+    COLOR (0, 32, 64),
+    COLOR (200, 200, 200)
 };
 
 static cairo_region_t * skin_create_transparent_mask (const gchar * path, const

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_skinned_equalizer_slider.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_skinned_equalizer_slider.c Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_skinned_playlist.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_skinned_playlist.c Changed

@@ -47,8 +47,8 @@
 typedef struct {
 GtkWidget * slider;
 PangoFontDescription * font;
- gint width, height, row_height, offset, rows, first, focused, scroll,
- scroll_source, hover, drag;
+ gint width, height, row_height, offset, rows, first, scroll, scroll_source,
+ hover, drag;
 gint popup_pos, popup_source;
 gboolean popup_shown;
 } PlaylistData;
@@ -101,10 +101,11 @@
 
 if (relative)
 {
- if (data->focused == -1)
+ gint focus = aud_playlist_get_focus (active_playlist);
+ if (focus == -1)
 return 0;
 
- position += data->focused;
+ position += focus;
 }
 
 if (position < 0)
@@ -300,14 +301,13 @@
 
 /* focus rectangle */
 
- if (data->focused >= data->first && data->focused <= data->first +
- data->rows - 1)
+ gint focus = aud_playlist_get_focus (active_playlist);
+ if (focus >= data->first && focus <= data->first + data->rows - 1)
 {
 cairo_new_path (cr);
 cairo_set_line_width (cr, 1);
- cairo_rectangle (cr, 0.5, data->offset + data->row_height *
- (data->focused - data->first) + 0.5, data->width - 1, data->row_height
- - 1);
+ cairo_rectangle (cr, 0.5, data->offset + data->row_height * (focus -
+ data->first) + 0.5, data->width - 1, data->row_height - 1);
 set_cairo_color (cr, active_skin->colors[SKIN_PLEDIT_NORMAL]);
 cairo_stroke (cr);
 }
@@ -358,7 +358,6 @@
 PlaylistData * data = g_malloc0 (sizeof (PlaylistData));
 data->width = width;
 data->height = height;
- data->focused = -1;
 data->hover = -1;
 data->popup_pos = -1;
 g_object_set_data ((GObject *) list, "playlistdata", data);
@@ -426,9 +425,6 @@
 
 calc_layout (data);
 
- if (data->focused != -1)
- data->focused = adjust_position (data, TRUE, 0);
-
 gtk_widget_queue_draw (list);
 
 if (data->slider != NULL)
@@ -450,15 +446,9 @@
 if (position == -1)
 return;
 
- if (data->focused != -1)
- aud_playlist_entry_set_selected (active_playlist, data->focused, FALSE);
-
- if (aud_playlist_selected_count (active_playlist) > 0)
- aud_playlist_select_all (active_playlist, FALSE);
-
+ aud_playlist_select_all (active_playlist, FALSE);
 aud_playlist_entry_set_selected (active_playlist, position, TRUE);
-
- data->focused = position;
+ aud_playlist_set_focus (active_playlist, position);
 scroll_to (data, position);
 }
 
@@ -466,7 +456,7 @@
 {
 position = adjust_position (data, relative, position);
 
- if (position == -1 || position == data->focused)
+ if (position == -1)
 return;
 
 gint count = adjust_position (data, TRUE, 0);
@@ -477,8 +467,7 @@
 ! aud_playlist_entry_get_selected (active_playlist, count + sign));
 
 aud_playlist_entry_set_selected (active_playlist, position, TRUE);
-
- data->focused = position;
+ aud_playlist_set_focus (active_playlist, position);
 scroll_to (data, position);
 }
 
@@ -489,7 +478,7 @@
 if (position == -1)
 return;
 
- data->focused = position;
+ aud_playlist_set_focus (active_playlist, position);
 scroll_to (data, position);
 }
 
@@ -502,40 +491,34 @@
 
 aud_playlist_entry_set_selected (active_playlist, position,
 ! aud_playlist_entry_get_selected (active_playlist, position));
-
- data->focused = position;
+ aud_playlist_set_focus (active_playlist, position);
 scroll_to (data, position);
 }
 
 static void select_move (PlaylistData * data, gboolean relative, gint position)
 {
+ gint focus = aud_playlist_get_focus (active_playlist);
 position = adjust_position (data, relative, position);
 
- if (data->focused == -1 || position == -1 || position == data->focused)
+ if (focus == -1 || position == -1 || position == focus)
 return;
 
- data->focused += aud_playlist_shift (active_playlist, data->focused,
- position - data->focused);
-
- scroll_to (data, data->focused);
+ focus += aud_playlist_shift (active_playlist, focus, position - focus);
+ scroll_to (data, focus);
 }
 
 static void delete_selected (PlaylistData * data)
 {
- gint shift = 0, count;
-
- for (count = 0; count < data->focused; count ++)
- {
- if (aud_playlist_entry_get_selected (active_playlist, count))
- shift --;
- }
-
 aud_playlist_delete_selected (active_playlist);
+
 active_length = aud_playlist_entry_count (active_playlist);
- calc_layout (data);
+ gint focus = aud_playlist_get_focus (active_playlist);
 
- data->focused = adjust_position (data, TRUE, shift);
- select_single (data, TRUE, 0);
+ if (focus != -1)
+ {
+ aud_playlist_entry_set_selected (active_playlist, focus, TRUE);
+ scroll_to (data, focus);
+ }
 }
 
 gboolean ui_skinned_playlist_key (GtkWidget * list, GdkEventKey * event)
@@ -570,9 +553,9 @@
 break;
 case GDK_KEY_Return:
 select_single (data, TRUE, 0);
- aud_playlist_set_position (active_playlist, data->focused);
- aud_playlist_set_playing (active_playlist);
- aud_drct_play ();
+ aud_playlist_set_position (active_playlist,
+ aud_playlist_get_focus (active_playlist));
+ aud_drct_play_playlist (active_playlist);
 break;
 case GDK_KEY_Escape:
 select_single (data, FALSE, aud_playlist_get_position
@@ -671,15 +654,13 @@
 return TRUE;
 }
 
-void ui_skinned_playlist_row_info (GtkWidget * list, gint * rows, gint * first,
- gint * focused)
+void ui_skinned_playlist_row_info (GtkWidget * list, gint * rows, gint * first)
 {
 PlaylistData * data = g_object_get_data ((GObject *) list, "playlistdata");
 g_return_if_fail (data);
 
 * rows = data->rows;
 * first = data->first;
- * focused = data->focused;
 }
 
 void ui_skinned_playlist_scroll_to (GtkWidget * list, gint row)
@@ -703,7 +684,7 @@
 g_return_if_fail (data);
 
 cancel_all (list, data);
- data->focused = row;
+ aud_playlist_set_focus (active_playlist, row);
 scroll_to (data, row);
 
 gtk_widget_queue_draw (list);
@@ -814,15 +795,10 @@
 if (event->button != 1 || state || position == active_length)
 return TRUE;
 
- if (position == -1)
- aud_drct_play_playlist (active_playlist);
- else
- {
+ if (position != -1)
 aud_playlist_set_position (active_playlist, position);
- aud_playlist_set_playing (active_playlist);
- aud_drct_play ();
- }
 
+ aud_drct_play_playlist (active_playlist);
 break;
 default:
 return TRUE;

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_skinned_playlist.h -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_skinned_playlist.h Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_skinned_playlist_slider.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_skinned_playlist_slider.c Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_skinned_window.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_skinned_window.c Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_skinselector.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_skinselector.c Changed

@@ -23,12 +23,12 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 #include <audacious/i18n.h>
 #include <audacious/misc.h>
 #include <libaudgui/libaudgui-gtk.h>
 
-#include "config.h"
 #include "plugin.h"
 #include "ui_skin.h"
 #include "ui_skinselector.h"
@@ -159,12 +159,12 @@
 
 if (file_is_archive(filename)) {
 node->name = archive_basename(basename);
-	node->desc = _("Archived Winamp 2.x skin");
+ node->desc = _("Archived Winamp 2.x skin");
 g_free(basename);
 }
 else {
 node->name = basename;
-	node->desc = _("Unarchived Winamp 2.x skin");
+ node->desc = _("Unarchived Winamp 2.x skin");
 }
 
 skinlist = g_list_prepend(skinlist, node);
@@ -311,7 +311,7 @@
 gtk_tree_selection_select_iter(selection, &iter_current_skin);
 
 path = gtk_tree_model_get_path(GTK_TREE_MODEL(store),
-		 &iter_current_skin);
+ &iter_current_skin);
 gtk_tree_view_scroll_to_cell(treeview, path, NULL, TRUE, 0.5, 0.5);
 gtk_tree_path_free(path);
 }

audacious-plugins-3.3.4.tar.bz2/src/skins/ui_svis.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/ui_svis.c Changed

audacious-plugins-3.3.4.tar.bz2/src/skins/util.c -> audacious-plugins-3.4.2.tar.bz2/src/skins/util.c Changed

audacious-plugins-3.3.4.tar.bz2/src/sndfile/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/sndfile/plugin.c Changed

audacious-plugins-3.3.4.tar.bz2/src/sndio/sndio.c -> audacious-plugins-3.4.2.tar.bz2/src/sndio/sndio.c Changed

@@ -30,15 +30,15 @@
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
-#include "config.h"
-
 /*
 * minimum output buffer size in milliseconds
 */
 #define BUFFER_SIZE_MIN	250
 
+static int get_volume(void) { return aud_get_int("sndio", "volume"); }
+static void set_volume(int vol) { aud_set_int("sndio", "volume", vol); }
+
 bool_t	sndio_init(void);
-void	sndio_cleanup(void);
 void	sndio_about(void);
 void	sndio_configure(void);
 void	sndio_get_volume(int *, int *);
@@ -51,7 +51,6 @@
 void	sndio_pause(bool_t);
 void	sndio_flush(int);
 int	sndio_output_time(void);
-void	sndio_drain(void);
 
 void	onmove_cb(void *, int);
 void	onvol_cb(void *, unsigned);
@@ -62,20 +61,18 @@
 static struct sio_hdl *hdl;
 static long long rdpos;
 static long long wrpos;
-static int paused, restarted, volume;
+static int paused, restarted;
 static int pause_pending, flush_pending, volume_pending;
 static int bytes_per_sec;
-static pthread_mutex_t mtx;
+static pthread_mutex_t mtx = PTHREAD_MUTEX_INITIALIZER;
 
 static GtkWidget *configure_win;
 static GtkWidget *adevice_entry;
-static gchar *audiodev;
 
 AUD_OUTPUT_PLUGIN
 (
 	.name = "sndio",
 	.init = sndio_init,
-	.cleanup = sndio_cleanup,
 	.about = sndio_about,
 	.configure = sndio_configure,
 	.probe_priority = 2,
@@ -88,8 +85,7 @@
 	.period_wait = sndio_period_wait,
 	.flush = sndio_flush,
 	.pause = sndio_pause,
-	.output_time = sndio_output_time,
-	.drain = sndio_drain
+	.output_time = sndio_output_time
 )
 
 static struct fmt_to_par {
@@ -106,7 +102,6 @@
 
 static const gchar * const sndio_defaults[] = {
 	"volume", "100",
-	"audiodev", "",
 	NULL,
 };
 
@@ -128,7 +123,7 @@
 	struct pollfd pfds[16];
 
 	if (volume_pending) {
-		sio_setvol(hdl, volume * SIO_MAXVOL / 100);
+		sio_setvol(hdl, get_volume() * SIO_MAXVOL / 100);
 		volume_pending = 0;
 	}
 	if (flush_pending) {
@@ -163,24 +158,12 @@
 bool_t
 sndio_init(void)
 {
-	pthread_mutex_init(&mtx, NULL);
-
 	aud_config_set_defaults("sndio", sndio_defaults);
-	volume = aud_get_int("sndio", "volume");
-	audiodev = aud_get_string("sndio", "audiodev");
 
 	return (1);
 }
 
 void
-sndio_cleanup(void)
-{
-	aud_set_int("sndio", "volume", volume);
-	aud_set_string("sndio", "audiodev", audiodev);
-	pthread_mutex_destroy(&mtx);
-}
-
-void
 sndio_about(void)
 {
 	static GtkWidget *about = NULL;
@@ -194,9 +177,7 @@
 void
 sndio_get_volume(int *l, int *r)
 {
-	pthread_mutex_lock(&mtx);
-	*l = *r = volume;
-	pthread_mutex_unlock(&mtx);
+	*l = *r = get_volume();
 }
 
 void
@@ -204,7 +185,7 @@
 {
 	/* Ignore balance control, so use unattenuated channel. */
 	pthread_mutex_lock(&mtx);
-	volume = l > r ? l : r;
+	set_volume(MAX(l, r));
 	volume_pending = 1;
 	pthread_mutex_unlock(&mtx);
 }
@@ -217,11 +198,17 @@
 	GtkWidget *dialog = NULL;
 	unsigned buffer_size;
 
+	char *audiodev = aud_get_string("sndio", "audiodev");
+
 	hdl = sio_open(strlen(audiodev) > 0 ? audiodev : NULL, SIO_PLAY, 1);
 	if (!hdl) {
 		g_warning("failed to open audio device %s", audiodev);
+		free(audiodev);
 		return (0);
 	}
+
+	free(audiodev);
+
 	sio_initpar(&askpar);
 	for (i = 0; ; i++) {
 		if (i == sizeof(fmt_to_par) / sizeof(struct fmt_to_par)) {
@@ -269,7 +256,7 @@
 	wrpos = 0;
 	sio_onmove(hdl, onmove_cb, NULL);
 	sio_onvol(hdl, onvol_cb, NULL);
-	sio_setvol(hdl, volume * SIO_MAXVOL / 100);
+	sio_setvol(hdl, get_volume() * SIO_MAXVOL / 100);
 	if (!sio_start(hdl)) {
 		g_warning("failed to start audio device");
 		sndio_close();
@@ -346,12 +333,6 @@
 	pthread_mutex_unlock(&mtx);
 }
 
-void
-sndio_drain(void)
-{
-	/* sndio always drains */
-}
-
 int
 sndio_output_time(void)
 {
@@ -373,16 +354,14 @@
 onvol_cb(void *addr, unsigned ctl)
 {
 	/* Update volume only if it actually changed */
-	if (ctl != volume * SIO_MAXVOL / 100)
-		volume = ctl * 100 / SIO_MAXVOL;
+	if (ctl != get_volume() * SIO_MAXVOL / 100)
+		set_volume(ctl * 100 / SIO_MAXVOL);
 }
 
 void
 configure_win_ok_cb(GtkWidget *w, gpointer data)
 {
-	strlcpy(audiodev, gtk_entry_get_text(GTK_ENTRY(adevice_entry)),
-	 PATH_MAX);
-	aud_set_string("sndio", "audiodev", audiodev);
+	aud_set_string("sndio", "audiodev", gtk_entry_get_text(GTK_ENTRY(adevice_entry)));
 	gtk_widget_destroy(configure_win);
 }
 
@@ -421,10 +400,14 @@
 	adevice_text = gtk_label_new(_("(empty means default)"));
 	gtk_box_pack_start(GTK_BOX(adevice_vbox), adevice_text, TRUE, TRUE, 0);
 
+	char *audiodev = aud_get_string("sndio", "audiodev");
+
 	adevice_entry = gtk_entry_new();
 	gtk_entry_set_text(GTK_ENTRY(adevice_entry), audiodev);
 	gtk_box_pack_start(GTK_BOX(adevice_vbox), adevice_entry, TRUE, TRUE, 0);
 
+	free(audiodev);
+
 	bbox = gtk_hbutton_box_new();
 	gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
 	gtk_box_set_spacing(GTK_BOX(bbox), 5);

audacious-plugins-3.3.4.tar.bz2/src/song_change/song_change.c -> audacious-plugins-3.4.2.tar.bz2/src/song_change/song_change.c Changed

audacious-plugins-3.4.2.tar.bz2/src/sox-resampler Added

audacious-plugins-3.4.2.tar.bz2/src/sox-resampler/Makefile Added

audacious-plugins-3.4.2.tar.bz2/src/sox-resampler/sox-resampler.c Added

@@ -0,0 +1,173 @@
+/*
+ * SoX Resampler Plugin for Audacious
+ * Copyright 2013 Michał Lipski
+ *
+ * Based on Sample Rate Converter Plugin:
+ * Copyright 2010-2012 John Lindgren
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions, and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions, and the following disclaimer in the documentation
+ * provided with the distribution.
+ *
+ * This software is provided "as is" and without any warranty, express or
+ * implied. In no event shall the authors be liable for any damages arising from
+ * the use of this software.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <soxr.h>
+
+#include <audacious/i18n.h>
+#include <audacious/misc.h>
+#include <audacious/plugin.h>
+#include <audacious/preferences.h>
+
+#define MIN_RATE 8000
+#define MAX_RATE 192000
+#define RATE_STEP 50
+
+#define RESAMPLER_ERROR(e) fprintf (stderr, "sox-resampler: %s\n", e)
+
+static const char * const sox_resampler_defaults[] = {
+ "quality", "4", /* SOXR_HQ */
+ "rate", "44100",
+ NULL};
+
+static soxr_t soxr;
+static soxr_error_t error;
+static int stored_channels;
+static double ratio;
+static float * buffer;
+static size_t buffer_samples;
+
+bool_t sox_resampler_init (void)
+{
+ aud_config_set_defaults ("soxr", sox_resampler_defaults);
+ return TRUE;
+}
+
+void sox_resampler_cleanup (void)
+{
+ soxr_delete (soxr);
+ soxr = 0;
+ free (buffer);
+ buffer = NULL;
+ buffer_samples = 0;
+}
+
+void sox_resampler_start (int * channels, int * rate)
+{
+ soxr_delete (soxr);
+ soxr = 0;
+
+ int new_rate = aud_get_int ("soxr", "rate");
+ new_rate = CLAMP (new_rate, MIN_RATE, MAX_RATE);
+
+ if (new_rate == * rate)
+ return;
+
+ soxr_quality_spec_t q = soxr_quality_spec(aud_get_int ("soxr", "quality"), 0);
+
+ soxr = soxr_create((double) * rate, (double) new_rate, * channels, & error, NULL, & q, NULL);
+
+ if (error)
+ {
+ RESAMPLER_ERROR (error);
+ return;
+ }
+
+ stored_channels = * channels;
+ ratio = (double) new_rate / * rate;
+ * rate = new_rate;
+}
+
+void do_resample (float * * data, int * samples)
+{
+ if (! soxr)
+ return;
+
+ if (buffer_samples < (int) (* samples * ratio) + 256)
+ {
+ buffer_samples = (int) (* samples * ratio) + 256;
+ buffer = realloc (buffer, sizeof (float) * buffer_samples);
+ }
+
+ size_t samples_done;
+
+ error = soxr_process(soxr, * data, * samples / stored_channels, NULL,
+ buffer, buffer_samples / stored_channels, & samples_done);
+
+ if (error)
+ {
+ RESAMPLER_ERROR (error);
+ return;
+ }
+
+ * data = buffer;
+ * samples = samples_done * stored_channels;
+}
+
+void sox_resampler_process (float * * data, int * samples)
+{
+ do_resample (data, samples);
+}
+
+void sox_resampler_flush (void)
+{
+ if (soxr && (error = soxr_process(soxr, NULL, 0, NULL, NULL, 0, NULL)))
+ RESAMPLER_ERROR (error);
+}
+
+void sox_resampler_finish (float * * data, int * samples)
+{
+ do_resample (data, samples);
+}
+
+static const char sox_resampler_about[] =
+ N_("SoX Resampler Plugin for Audacious\n"
+ "Copyright 2013 Michał Lipski\n\n"
+ "Based on Sample Rate Converter Plugin:\n"
+ "Copyright 2010-2012 John Lindgren");
+
+static const ComboBoxElements method_list[] = {
+ {"0", N_("Quick")}, /* SOXR_QQ */
+ {"1", N_("Low")}, /* SOXR_QL */
+ {"2", N_("Medium")}, /* SOXR_QM */
+ {"4", N_("High")}, /* SOXR_QH */
+ {"6", N_("Very High")}}; /* SOXR_VHQ */
+
+static const PreferencesWidget sox_resampler_widgets[] = {
+ {WIDGET_COMBO_BOX, N_("Quality:"),
+ .cfg_type = VALUE_STRING, .csect = "soxr", .cname = "quality",
+ .data = {.combo = {method_list, sizeof method_list / sizeof method_list[0]}}},
+ {WIDGET_SPIN_BTN, N_("Rate:"),
+ .cfg_type = VALUE_INT, .csect = "soxr", .cname = "rate",
+ .data = {.spin_btn = {MIN_RATE, MAX_RATE, RATE_STEP, N_("Hz")}}}
+};
+
+static const PluginPreferences sox_resampler_prefs = {
+ .widgets = sox_resampler_widgets,
+ .n_widgets = sizeof sox_resampler_widgets / sizeof sox_resampler_widgets[0]};
+
+AUD_EFFECT_PLUGIN
+(
+ .name = N_("SoX Resampler"),
+ .domain = PACKAGE,
+ .about_text = sox_resampler_about,
+ .prefs = & sox_resampler_prefs,
+ .init = sox_resampler_init,
+ .cleanup = sox_resampler_cleanup,
+ .start = sox_resampler_start,
+ .process = sox_resampler_process,
+ .flush = sox_resampler_flush,
+ .finish = sox_resampler_finish,
+ .order = 2 /* must be before crossfade */
+)

audacious-plugins-3.3.4.tar.bz2/src/speed-pitch/speed-pitch.c -> audacious-plugins-3.4.2.tar.bz2/src/speed-pitch/speed-pitch.c Changed

audacious-plugins-3.3.4.tar.bz2/src/statusicon/statusicon.c -> audacious-plugins-3.4.2.tar.bz2/src/statusicon/statusicon.c Changed

audacious-plugins-3.3.4.tar.bz2/src/statusicon/util.c -> audacious-plugins-3.4.2.tar.bz2/src/statusicon/util.c Changed

audacious-plugins-3.3.4.tar.bz2/src/stereo_plugin/stereo.c -> audacious-plugins-3.4.2.tar.bz2/src/stereo_plugin/stereo.c Changed

audacious-plugins-3.3.4.tar.bz2/src/tonegen/tonegen.c -> audacious-plugins-3.4.2.tar.bz2/src/tonegen/tonegen.c Changed

audacious-plugins-3.3.4.tar.bz2/src/unix-io/unix-io.c -> audacious-plugins-3.4.2.tar.bz2/src/unix-io/unix-io.c Changed

audacious-plugins-3.3.4.tar.bz2/src/voice_removal/voice_removal.c -> audacious-plugins-3.4.2.tar.bz2/src/voice_removal/voice_removal.c Changed

audacious-plugins-3.3.4.tar.bz2/src/vorbis/vcedit.c -> audacious-plugins-3.4.2.tar.bz2/src/vorbis/vcedit.c Changed

@@ -7,8 +7,6 @@
 * Comment editing backend, suitable for use by nice frontend interfaces.
 *
 */
-#include "config.h"
-
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -384,7 +382,7 @@
 op.granulepos = granpos;
 ogg_stream_packetin(&streamout, &op);
 }
- else { /* granulepos is set, validly. Use it, and force a flush to 
+ else { /* granulepos is set, validly. Use it, and force a flush to
 account for shortened blocks (vcut) when appropriate */
 if (granpos > op.granulepos) {
 granpos = op.granulepos;
@@ -432,7 +430,7 @@
 if (result < 0)
 state->lasterror = "Corrupt or missing data, continuing...";
 else {
- /* Don't bother going through the rest, we can just 
+ /* Don't bother going through the rest, we can just
 * write the page out now */
 if (state->write(ogout.header, 1, ogout.header_len,
 out) != (size_t) ogout.header_len)

audacious-plugins-3.3.4.tar.bz2/src/vorbis/vcupdate.c -> audacious-plugins-3.4.2.tar.bz2/src/vorbis/vcupdate.c Changed

audacious-plugins-3.3.4.tar.bz2/src/vorbis/vorbis.c -> audacious-plugins-3.4.2.tar.bz2/src/vorbis/vorbis.c Changed

audacious-plugins-3.3.4.tar.bz2/src/vtx/ay8912.c -> audacious-plugins-3.4.2.tar.bz2/src/vtx/ay8912.c Changed

audacious-plugins-3.3.4.tar.bz2/src/vtx/vtx.c -> audacious-plugins-3.4.2.tar.bz2/src/vtx/vtx.c Changed

audacious-plugins-3.3.4.tar.bz2/src/vtx/vtx.h -> audacious-plugins-3.4.2.tar.bz2/src/vtx/vtx.h Changed

audacious-plugins-3.3.4.tar.bz2/src/wavpack/wavpack.c -> audacious-plugins-3.4.2.tar.bz2/src/wavpack/wavpack.c Changed

@@ -9,8 +9,6 @@
 #include <audacious/i18n.h>
 #include <audacious/plugin.h>
 
-#include "config.h"
-
 #define BUFFER_SIZE 256 /* read buffer size, in samples / frames */
 #define SAMPLE_SIZE(a) (a == 8 ? sizeof(uint8_t) : (a == 16 ? sizeof(uint16_t) : sizeof(uint32_t)))
 #define SAMPLE_FMT(a) (a == 8 ? FMT_S8 : (a == 16 ? FMT_S16_NE : (a == 24 ? FMT_S24_NE : FMT_S32_NE)))
@@ -305,15 +303,15 @@
 if (ctx == NULL)
 return NULL;
 
-	AUDDBG("starting probe of %p\n", (void *) fd);
+ AUDDBG("starting probe of %p\n", (void *) fd);
 
-	vfs_rewind(fd);
-	tu = tuple_new_from_filename(filename);
+ vfs_rewind(fd);
+ tu = tuple_new_from_filename(filename);
 
-	vfs_rewind(fd);
-	tag_tuple_read(tu, fd);
+ vfs_rewind(fd);
+ tag_tuple_read(tu, fd);
 
-	tuple_set_int(tu, FIELD_LENGTH, NULL,
+ tuple_set_int(tu, FIELD_LENGTH, NULL,
 ((uint64_t) WavpackGetNumSamples(ctx) * 1000) / (uint64_t) WavpackGetSampleRate(ctx));
 tuple_set_str(tu, FIELD_CODEC, NULL, "WavPack");
 
@@ -323,8 +321,8 @@
 
 WavpackCloseFile(ctx);
 
-	AUDDBG("returning tuple %p for file %p\n", (void *) tu, (void *) fd);
-	return tu;
+ AUDDBG("returning tuple %p for file %p\n", (void *) tu, (void *) fd);
+ return tu;
 }
 
 static bool_t wv_write_tag (const Tuple * tuple, VFSFile * handle)

audacious-plugins-3.3.4.tar.bz2/src/xsf/Makefile -> audacious-plugins-3.4.2.tar.bz2/src/xsf/Makefile Changed

audacious-plugins-3.3.4.tar.bz2/src/xsf/ao.h -> audacious-plugins-3.4.2.tar.bz2/src/xsf/ao.h Changed

@@ -4,11 +4,11 @@
 // Fake ao.h to set up the general Audio Overload style environment
 //
 
-#include "../../config.h"
-
 #ifndef __AO_H
 #define __AO_H
 
+#include <stdint.h>
+
 #define AO_SUCCESS					1
 #define AO_FAIL						0
 #define AO_FAIL_DECOMPRESSION		-1
@@ -29,143 +29,6 @@
 	COMMAND_JUMP
 };
 
-/* Compiler defines for Xcode */
-#ifndef WORDS_BIGENDIAN
-	#define LSB_FIRST	1
-#endif
-
-typedef unsigned char ao_bool;
-
-#ifdef __GNUC__
-#include <stddef.h>	// get NULL
-#include <stdbool.h>
-
-#ifndef nil
-#define nil NULL
-#endif
-
-#ifndef TRUE
-#define TRUE (1)
-#endif
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#define xmalloc(a) malloc(a)
-
-#endif
-
-#ifdef _MSC_VER
-#include <stddef.h>	// get NULL
-#include <wchar.h> // for off_t
-
-#ifndef nil
-#define nil NULL
-#endif
-
-#ifndef TRUE
-#define TRUE (1)
-#endif
-#ifndef FALSE
-#define FALSE (0)
-#endif
-
-#define true (1)
-#define false (0)
-
-#define xmalloc(a) malloc(a)
-
-#define strcasecmp _strcmpi
-
-#endif
-
-typedef unsigned char		uint8;
-typedef unsigned char		UINT8;
-typedef signed char			int8;
-typedef signed char			INT8;
-typedef unsigned short		uint16;
-typedef unsigned short		UINT16;
-typedef signed short		int16;
-typedef signed short		INT16;
-typedef signed int			int32;
-typedef unsigned int		uint32;
-#ifdef LONG_IS_64BIT
-typedef signed long int64;
-typedef unsigned long uint64;
-#else
-typedef signed long long	int64;
-typedef unsigned long long	uint64;
-#endif
-
-#ifdef WIN32
-#ifndef _BASETSD_H
-typedef signed int			INT32;
-typedef unsigned int		UINT32;
-typedef signed long long	INT64;
-typedef unsigned long long	UINT64;
-#endif
-#else
-typedef signed int			INT32;
-typedef unsigned int		UINT32;
-#ifdef LONG_IS_64BIT
-typedef signed long INT64;
-typedef unsigned long UINT64;
-#else
-typedef signed long long	INT64;
-typedef unsigned long long	UINT64;
-#endif
-#endif
-
-#ifndef INLINE
-#if defined(_MSC_VER)
-#define INLINE __forceinline
-#elif defined(__GNUC__)
-#define INLINE __inline__
-#elif defined(_MWERKS_)
-#define INLINE inline
-#elif defined(__powerc)
-#define INLINE inline
-#else
-#define INLINE
-#endif
-#endif
-
-#if LSB_FIRST
-#define LE16(x) (x)
-#define LE32(x) (x)
-
-#ifndef __ENDIAN__ /* Mac OS X Endian header has this function in it */
-static unsigned long INLINE Endian32_Swap(unsigned long addr)
-{
-	unsigned long res = (((addr&0xff000000)>>24) |
-		 ((addr&0x00ff0000)>>8) |
-		 ((addr&0x0000ff00)<<8) |
-		 ((addr&0x000000ff)<<24));
-
-	return res;
-}
-#endif
-
-#else
-
-static unsigned short INLINE LE16(unsigned short x)
-{
-	unsigned short res = (((x & 0xFF00) >> 8) | ((x & 0xFF) << 8));
-	return res;
-}
-
-static unsigned long INLINE LE32(unsigned long addr)
-{
-	unsigned long res = (((addr&0xff000000)>>24) |
-		 ((addr&0x00ff0000)>>8) |
-		 ((addr&0x0000ff00)<<8) |
-		 ((addr&0x000000ff)<<24));
-
-	return res;
-}
-
-#endif
-
-int ao_get_lib(char *filename, uint8 **buffer, uint64 *length);
+int ao_get_lib(char *filename, uint8_t **buffer, uint64_t *length);
 
 #endif // AO_H

audacious-plugins-3.3.4.tar.bz2/src/xsf/corlett.c -> audacious-plugins-3.4.2.tar.bz2/src/xsf/corlett.c Changed

@@ -72,47 +72,50 @@
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
+#include <strings.h>
+
+#include <glib.h>
+#include <zlib.h>
 
 #include "ao.h"
 #include "corlett.h"
 
-#include <zlib.h>
-#include <stdlib.h>
+#define LE32(x) GUINT32_FROM_LE(x)
 
 #define DECOMP_MAX_SIZE		((32 * 1024 * 1024) + 12)
 
-int corlett_decode(uint8 *input, uint32 input_len, uint8 **output, uint64 *size, corlett_t **c)
+int corlett_decode(uint8_t *input, uint32_t input_len, uint8_t **output, uint64_t *size, corlett_t **c)
 {
-	uint32 *buf;
-	uint32 res_area, comp_crc, actual_crc;
-	uint8 *decomp_dat, *tag_dec;
+	uint32_t *buf;
+	uint32_t res_area, comp_crc, actual_crc;
+	uint8_t *decomp_dat, *tag_dec;
 	uLongf decomp_length, comp_length;
-	
+
 	// 32-bit pointer to data
-	buf = (uint32 *)input;
-	
+	buf = (uint32_t *)input;
+
 	// Check we have a PSF format file.
 	if ((input[0] != 'P') || (input[1] != 'S') || (input[2] != 'F'))
 	{
 		return AO_FAIL;
 	}
-	
+
 	// Get our values
 	res_area = LE32(buf[1]);
 	comp_length = LE32(buf[2]);
 	comp_crc = LE32(buf[3]);
-		
+
 	if (comp_length > 0)
 	{
 		// Check length
 		if (input_len < comp_length + 16)
 			return AO_FAIL;
-	
+
 		// Check CRC is correct
 		actual_crc = crc32(0, (unsigned char *)&buf[4+(res_area/4)], comp_length);
 		if (actual_crc != comp_crc)
 			return AO_FAIL;
-	
+
 		// Decompress data if any
 		decomp_dat = malloc(DECOMP_MAX_SIZE);
 		decomp_length = DECOMP_MAX_SIZE;
@@ -121,7 +124,7 @@
 			free(decomp_dat);
 			return AO_FAIL;
 		}
-	 	
+
 		// Resize memory buffer to what we actually need
 		decomp_dat = realloc(decomp_dat, (size_t)decomp_length + 1);
 	}
@@ -150,7 +153,7 @@
 	// set reserved section pointer
 	(*c)->res_section = &buf[4];
 	(*c)->res_size = res_area;
-	
+
 	// Return it
 	if (output != NULL && size != NULL)
 	{
@@ -164,19 +167,19 @@
 	input_len -= (comp_length + 16 + res_area);
 	if (input_len < 5)
 		return AO_SUCCESS;
-		
+
 //	printf("\n\nNew corlett: input len %d comp length %d res area %d\n", input_len, comp_length, res_area);
-	
+
 	tag_dec = input + (comp_length + res_area + 16);
 	if ((tag_dec[0] == '[') && (tag_dec[1] == 'T') && (tag_dec[2] == 'A') && (tag_dec[3] == 'G') && (tag_dec[4] == ']'))
 	{
 		int l, num_tags, data;
-		
+
 		// Tags found!
 		tag_dec += 5;
 		input_len -= 5;
 
-		data = false;
+		data = FALSE;
 		num_tags = 0;
 		l = 0;
 		while (input_len && (num_tags < MAX_UNKNOWN_TAGS))
@@ -186,7 +189,7 @@
 				if ((*tag_dec == 0xA) || (*tag_dec == 0x00))
 				{
 					(*c)->tag_data[num_tags][l] = 0;
-					data = false;
+					data = FALSE;
 					num_tags++;
 					l = 0;
 				}
@@ -201,22 +204,22 @@
 				{
 					(*c)->tag_name[num_tags][l] = 0;
 					l = 0;
-					data = true;
+					data = TRUE;
 				}
 				else
 				{
 					(*c)->tag_name[num_tags][l++] = *tag_dec;
 				}
 			}
-			
+
 			tag_dec++;
 			input_len--;
 		}
-		
-		
+
+
 		// Now, process that tag array into what we expect
 		for (num_tags = 0; num_tags < MAX_UNKNOWN_TAGS; num_tags++)
-		{			
+		{
 			// See if tag belongs in one of the special fields we have
 			if (!strcasecmp((*c)->tag_name[num_tags], "_lib"))
 			{
@@ -322,15 +325,15 @@
 			}
 		}
 	}
-	
+
 	// Bingo
 	return AO_SUCCESS;
 }
 
-uint32 psfTimeToMS(char *str)
+uint32_t psfTimeToMS(char *str)
 {
 	int x, c=0;
-	uint32 acc=0;
+	uint32_t acc=0;
 	char s[100];
 
 	strncpy(s,str,100);
@@ -345,11 +348,11 @@
 		}
 		else if (s[x]==':')
 		{
-			if(c==0) 
+			if(c==0)
 			{
 				acc+=atoi(s+x+1)*10;
 			}
-			else if(c==1) 
+			else if(c==1)
 			{
 				acc+=atoi(s+x+(x?1:0))*10*60;
 			}
@@ -360,14 +363,14 @@
 		else if (x==0)
 		{
 			if(c==0)
-			{ 
+			{
 				acc+=atoi(s+x)*10;
 			}
-			else if(c==1) 
+			else if(c==1)
 			{
 				acc+=atoi(s+x)*10*60;
 			}
-			else if(c==2) 
+			else if(c==2)
 			{
 				acc+=atoi(s+x)*10*60*60;
 			}

audacious-plugins-3.3.4.tar.bz2/src/xsf/corlett.h -> audacious-plugins-3.4.2.tar.bz2/src/xsf/corlett.h Changed

audacious-plugins-3.3.4.tar.bz2/src/xsf/desmume/SPU.c -> audacious-plugins-3.4.2.tar.bz2/src/xsf/desmume/SPU.c Changed

audacious-plugins-3.3.4.tar.bz2/src/xsf/plugin.c -> audacious-plugins-3.4.2.tar.bz2/src/xsf/plugin.c Changed

@@ -35,7 +35,6 @@
 #include <audacious/plugin.h>
 
 #include "ao.h"
-#include "config.h"
 #include "corlett.h"
 #include "vio2sf.h"
 
@@ -44,18 +43,18 @@
 static bool_t stop_flag = FALSE;
 
 /* xsf_get_lib: called to load secondary files */
-static char *path;
+static const char *dirpath;
+
 int xsf_get_lib(char *filename, void **buffer, unsigned int *length)
 {
 	void *filebuf;
 	int64_t size;
 
-	char *dirpath = dirname(path);
 	SPRINTF(path2, "%s/%s", dirpath, filename);
 	vfs_file_get_contents(path2, &filebuf, &size);
 
 	*buffer = filebuf;
-	*length = (uint64)size;
+	*length = (uint64_t)size;
 
 	return AO_SUCCESS;
 }
@@ -110,10 +109,12 @@
 		return -1;
 	}
 
+	int length = c->inf_length ? psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade) : -1;
+
 	free(c);
 	free(buf);
 
-	return c->inf_length ? psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade) : -1;
+	return length;
 }
 
 static bool_t xsf_play(InputPlayback * playback, const char * filename, VFSFile * file, int start_time, int stop_time, bool_t pause)
@@ -126,7 +127,10 @@
 	float pos;
 	bool_t error = FALSE;
 
-	path = strdup(filename);
+	char dirbuf[strlen (filename) + 1];
+	strcpy (dirbuf, filename);
+	dirpath = dirname (dirbuf);
+
 	vfs_file_get_contents (filename, & buffer, & size);
 
 	if (xsf_start(buffer, size) != AO_SUCCESS)
@@ -172,9 +176,6 @@
 			{
 				xsf_term();
 
-				free(path);
-				path = strdup(filename);
-
 				if (xsf_start(buffer, size) == AO_SUCCESS)
 				{
 					pos = 0;
@@ -212,8 +213,8 @@
 	pthread_mutex_unlock (& mutex);
 
 ERR_NO_CLOSE:
+	dirpath = NULL;
 	free(buffer);
-	free(path);
 
 	return !error;
 }

audacious-plugins-3.3.4.tar.bz2/src/xsf/vio2sf.c -> audacious-plugins-3.4.2.tar.bz2/src/xsf/vio2sf.c Changed

audacious-plugins-3.3.4.tar.bz2/src/xspf/xspf.c -> audacious-plugins-3.4.2.tar.bz2/src/xspf/xspf.c Changed

gpl-2.0.txt Added

@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

gpl-3.0.txt Added

@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+ The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users. We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors. You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+ To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.
+
+ Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+ For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+ Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so. This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software. The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable. Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products. If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+ Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary. To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ TERMS AND CONDITIONS
+
+ 0. Definitions.
+
+ "This License" refers to version 3 of the GNU General Public License.
+
+ "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+ "The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.
+
+ To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy. The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+ A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+ To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+ To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+ An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+ 1. Source Code.
+
+ The "source code" for a work means the preferred form of the work
+for making modifications to it. "Object code" means any non-source
+form of a work.
+
+ A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+ The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+ The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+ The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+ The Corresponding Source for a work in source code form is that
+same work.
+
+ 2. Basic Permissions.
+
+ All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+ You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force. You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright. Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+ Conveying under any other circumstances is permitted solely under
+the conditions stated below. Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+ No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+ When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+ 4. Conveying Verbatim Copies.
+
+ You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+ You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+ 5. Conveying Modified Source Versions.
+
+ You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+ a) The work must carry prominent notices stating that you modified
+ it, and giving a relevant date.
+
+ b) The work must carry prominent notices stating that it is
+ released under this License and any conditions added under section
+ 7. This requirement modifies the requirement in section 4 to
+ "keep intact all notices".
+
+ c) You must license the entire work, as a whole, under this
+ License to anyone who comes into possession of a copy. This
+ License will therefore apply, along with any applicable section 7
+ additional terms, to the whole of the work, and all its parts,
+ regardless of how they are packaged. This License gives no
+ permission to license the work in any other way, but it does not
+ invalidate such permission if you have separately received it.
+
+ d) If the work has interactive user interfaces, each must display
+ Appropriate Legal Notices; however, if the Program has interactive
+ interfaces that do not display Appropriate Legal Notices, your
+ work need not make them do so.
+
+ A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+ 6. Conveying Non-Source Forms.
+
+ You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+ a) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by the
+ Corresponding Source fixed on a durable physical medium
+ customarily used for software interchange.
+
+ b) Convey the object code in, or embodied in, a physical product
+ (including a physical distribution medium), accompanied by a
+ written offer, valid for at least three years and valid for as
+ long as you offer spare parts or customer support for that product
+ model, to give anyone who possesses the object code either (1) a
+ copy of the Corresponding Source for all the software in the
+ product that is covered by this License, on a durable physical
+ medium customarily used for software interchange, for a price no
+ more than your reasonable cost of physically performing this
+ conveying of source, or (2) access to copy the
+ Corresponding Source from a network server at no charge.
+
+ c) Convey individual copies of the object code with a copy of the
+ written offer to provide the Corresponding Source. This
+ alternative is allowed only occasionally and noncommercially, and
+ only if you received the object code with such an offer, in accord
+ with subsection 6b.
+
+ d) Convey the object code by offering access from a designated
+ place (gratis or for a charge), and offer equivalent access to the
+ Corresponding Source in the same way through the same place at no
+ further charge. You need not require recipients to copy the
+ Corresponding Source along with the object code. If the place to
+ copy the object code is a network server, the Corresponding Source
+ may be on a different server (operated by you or a third party)
+ that supports equivalent copying facilities, provided you maintain
+ clear directions next to the object code saying where to find the
+ Corresponding Source. Regardless of what server hosts the
+ Corresponding Source, you remain obligated to ensure that it is
+ available for as long as needed to satisfy these requirements.
+
+ e) Convey the object code using peer-to-peer transmission, provided
+ you inform other peers where the object code and Corresponding
+ Source of the work are being offered to the general public at no
+ charge under subsection 6d.
+
+ A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+ A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling. In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage. For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product. A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+ "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source. The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+ If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+ The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed. Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+ Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+ 7. Additional Terms.
+
+ "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+ When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+ Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+ a) Disclaiming warranty or limiting liability differently from the
+ terms of sections 15 and 16 of this License; or
+
+ b) Requiring preservation of specified reasonable legal notices or
+ author attributions in that material or in the Appropriate Legal
+ Notices displayed by works containing it; or
+
+ c) Prohibiting misrepresentation of the origin of that material, or
+ requiring that modified versions of such material be marked in
+ reasonable ways as different from the original version; or
+
+ d) Limiting the use for publicity purposes of names of licensors or
+ authors of the material; or
+
+ e) Declining to grant rights under trademark law for use of some
+ trade names, trademarks, or service marks; or
+
+ f) Requiring indemnification of licensors and authors of that
+ material by anyone who conveys the material (or modified versions of
+ it) with contractual assumptions of liability to the recipient, for
+ any liability that these contractual assumptions directly impose on
+ those licensors and authors.
+
+ All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+ If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+ Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+ 8. Termination.
+
+ You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+ However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+ Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+ Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+ 9. Acceptance Not Required for Having Copies.
+
+ You are not required to accept this License in order to receive or
+run a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+ 10. Automatic Licensing of Downstream Recipients.
+
+ Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.
+
+ An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+ You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+ 11. Patents.
+
+ A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".
+
+ A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+ In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+ If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+ If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+ A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License. You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+ Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+ 12. No Surrender of Others' Freedom.
+
+ If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all. For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+ 13. Use with the GNU Affero General Public License.
+
+ Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+ 14. Revised Versions of this License.
+
+ The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+ Each version is given a distinguishing version number. If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation. If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+ If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+ Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+ 15. Disclaimer of Warranty.
+
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. Limitation of Liability.
+
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+ 17. Interpretation of Sections 15 and 16.
+
+ If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+ If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+ <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+ You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+ The GNU General Public License does not permit incorporating your program
+into proprietary programs. If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License. But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

lgpl-2.1.txt Added

@@ -0,0 +1,502 @@
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+&#xc;
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+&#xc;
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+&#xc;
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+&#xc;
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+&#xc;
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+&#xc;
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+&#xc;
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+&#xc;
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+&#xc;
+ How to Apply These Terms to Your New Libraries
+
+ If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change. You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the library's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+ <signature of Ty Coon>, 1 April 1990
+ Ty Coon, President of Vice
+
+That's all there is to it!